mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/innobase
History
unknown f70497fb93 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/mysql-5.0


CMakeLists.txt:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Late merge of 5.0.28, no change here.
2006-11-14 12:47:53 +01:00
..
btr innodb r702 2006-08-18 14:16:11 +02:00
buf This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
data Applied innodb-5.0-ss368 snapshot 2006-03-29 23:04:32 +04:00
db
dict This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
dyn Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
eval Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
fil This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
fsp innodb r702 2006-08-18 14:16:11 +02:00
fut Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
ha Applied innodb-5.0-ss368 snapshot 2006-03-29 23:04:32 +04:00
ibuf Applied innodb snapshot ss792 and ss854. 2006-09-20 13:00:49 -06:00
include This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
lock Changes from the innodb-5.0-ss115 snapshot. 2006-01-16 14:32:43 +03:00
log innodb r702 2006-08-18 14:16:11 +02:00
mach Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
mem Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
mtr Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
os This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
page Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
pars Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
que Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
read Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
rem Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for 2005-12-12 21:06:59 +03:00
row This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
srv This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
sync This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 2006-11-09 05:02:37 +01:00
thr Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
trx Changes from the innodb-5.0-ss115 snapshot. 2006-01-16 14:32:43 +03:00
usr Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
ut innodb r702 2006-08-18 14:16:11 +02:00
CMakeLists.txt innobase/CMakeLists.txt : Change done by Ignacio Galarza (igalarza@mysql.com) 2006-10-24 12:31:18 +02:00
configure.in WL#2286 - Compile MySQL w/YASSL support 2005-06-23 21:29:44 +05:00
Makefile.am make dist changes for Cmake build 2006-09-01 10:32:12 +02:00