mariadb/innobase
unknown 19c2ce47db Merge with 4.1
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~1:
  Delete: Docs/Images/Makefile.am
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
configure.in:
  Merge with 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
  Merge with 4.0
mysys/default.c:
  Merge with 4.1 (to get new extension handling)
sql/log.cc:
  Merge with 4.0
tests/client_test.c:
  Merge with 4.1 (to get possibility to run any tests)
2004-11-12 19:58:24 +02:00
..
btr merge with 4.1 2004-10-29 19:26:52 +03:00
buf merge with 4.1 2004-10-29 19:26:52 +03:00
data Many files: 2004-10-01 20:01:25 +03:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict merge with 4.0 2004-11-12 11:17:53 +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 fil0fil.c: 2004-10-26 20:47:23 +03:00
fsp Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
fut Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ha btr0sea.c, buf0lru.c, buf0buf.c, ha0ha.c, hash0hash.h, ha0ha.h, buf0buf.h: 2004-10-27 15:45:10 +03:00
ibuf ibuf0ibuf.c: 2004-11-04 00:10:00 +02:00
include Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
lock merge on pull 2004-11-09 04:06:44 +02:00
log srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h: 2004-10-13 20:04:52 +03: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-10-07 20:53:20 +03:00
mtr Merge with 4.0.21 2004-06-18 04:38:58 +03:00
os row0mysql.c: 2004-10-26 20:29:11 +03:00
page InnoDB: quote identifiers according to MySQL settings (Bug #5292) 2004-10-01 11:51:59 +03:00
pars merge with 4.0 2004-11-02 08:58:45 +02:00
que Merge with 4.0.21 2004-06-18 04:38:58 +03:00
read merge with 4.0 2004-03-16 22:41:30 +02:00
rem Fixed unique prefix key bug for multibyte character sets (BUG #4521) for 2004-09-03 15:26:29 +03:00
row merge on pull 2004-11-09 04:06:44 +02:00
srv Fixed access to freed memory 2004-10-27 21:56:17 +03:00
sync Merge 2004-10-08 15:43:27 +03:00
thr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
trx trx0purge.c: 2004-11-11 21:17:44 +02:00
usr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
ut InnoDB: Treat UTF-8 strings properly in case insensitive operations 2004-10-18 16:00:57 +03:00
configure.in - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile 2004-04-29 14:48:49 +02:00
Makefile.am Remove unneeded module "com" 2004-03-11 12:55:28 +02:00
makefilewin Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
my_cnf Added Innobase to source distribution 2001-02-17 14:19:19 +02:00