mariadb/innobase
unknown 61a88ff0a1 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


configure.in:
  Auto merged
mysql-test/r/drop_temp_table.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-18 12:02:46 +01:00
..
btr InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries. 2005-01-25 12:10:24 +02:00
buf 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
data InnoDB: Make CREATE TABLE return error when the minimum row length 2005-02-17 17:15:29 +02:00
db
dict InnoDB: Make CREATE TABLE return error when the minimum row length 2005-02-17 17:15:29 +02:00
dyn Remove unnecessary files 2004-02-19 11:32:07 +02:00
eval row0mysql.c, pars0pars.c, eval0eval.c, dict0load.c, dict0dict.c, dict0crea.c: 2004-10-31 15:43:29 +02:00
fil 4.1 -> 5.0 merge 2005-02-03 13:18:30 +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 serg.mylan:/usr/home/serg/Abk/mysql-5.0 2005-02-18 12:02:46 +01:00
lock InnoDB: Exclude code from InnoDB Hot Backup builds 2005-02-04 16:25:13 +02:00
log log0recv.c: 2005-01-21 23:47:44 +02:00
mach merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
mem Many files: 2004-11-26 00:12:50 +02:00
mtr InnoDB: fix corruption in crash recovery of BLOB fields (Bug #7679) 2005-01-05 11:56:41 +02:00
os 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
page InnoDB: A small cleanup: remove two duplicate rec_get_offsets() calls 2005-02-04 15:44:09 +02:00
pars Many files: 2004-12-02 19:45:07 +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 Merge with 4.1 2005-01-15 14:09:45 +02:00
row After review fixes (Bug #5682) 2005-02-17 18:40:45 +02:00
srv InnoDB: Exclude code from InnoDB Hot Backup builds 2005-02-04 16:25:13 +02:00
sync InnoDB: Exclude code from InnoDB Hot Backup builds 2005-02-04 16:25:13 +02:00
thr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
trx manually merged 2005-02-14 21:50:09 +01:00
usr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
ut InnoDB: Exclude code from InnoDB Hot Backup builds 2005-02-04 16:25:13 +02: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