mariadb/innobase
unknown f0438d5487 Merge
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/kill.result:
  Auto merged
mysql-test/t/kill.test:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-04-13 16:24:17 +02:00
..
btr manually merged 2005-04-06 21:19:20 +02:00
buf After merge fixes 2005-03-15 11:22:20 +02:00
data data0data.c: 2005-03-16 18:05:08 +02:00
db
dict Merge 2005-04-13 16:24:17 +02:00
dyn Remove unnecessary files 2004-02-19 11:32:07 +02:00
eval InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
fil row0mysql.c: 2005-03-13 22:46:57 +02:00
fsp Many files: 2004-12-02 19:45:07 +02:00
fut Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ha Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20041027124510|04970 2004-12-08 14:34:58 +02:00
ibuf InnoDB: Remove redundant page_no field from dict_index_t. 2005-01-14 13:54:23 +02:00
include Merge 2005-04-13 16:24:17 +02:00
lock InnoDB: Introduce the symbols REC_OFFS_NORMAL_SIZE and 2005-03-10 15:16:16 +02:00
log Merge hundin.mysql.fi:/home/heikki/mysql-4.1 2005-03-10 09:07:42 +02:00
mach merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
mem InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
mtr InnoDB: fix corruption in crash recovery of BLOB fields (Bug #7679) 2005-01-05 11:56:41 +02:00
os manually merged 2005-04-06 21:19:20 +02:00
page InnoDB: Introduce the symbols REC_OFFS_NORMAL_SIZE and 2005-03-10 15:16:16 +02:00
pars Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
que logging_ok: 2004-12-24 12:13:32 +01:00
read XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
rem InnoDB: Introduce the symbols REC_OFFS_NORMAL_SIZE and 2005-03-10 15:16:16 +02:00
row Merge 2005-04-13 16:24:17 +02:00
srv manually merged 2005-04-06 21:19:20 +02:00
sync InnoDB: Zero fill newly created pages and deleted records to 2005-03-01 13:54:48 +02:00
thr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
trx Merge hundin.mysql.fi:/home/heikki/mysql-4.1 2005-03-21 22:29:02 +02:00
usr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
ut merged 2005-03-09 14:09:06 +01:00
configure.in configure.in: 2004-12-01 18:02:34 +02:00
Makefile.am Remove unneeded module "com" 2004-03-11 12:55:28 +02:00
makefilewin
my_cnf