mariadb/innobase
unknown 945625ebaa manually merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-08-18 19:57:55 +02:00
..
btr manual merged (blame me!) 2004-07-20 00:53:24 +02:00
buf manually merged 2004-08-18 19:57:55 +02:00
data After merge fixes 2004-06-21 10:21:20 +03:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict manually merged 2004-08-18 19:57:55 +02:00
dyn Remove unnecessary files 2004-02-19 11:32:07 +02:00
eval New MYSQL_SERVER_SUFFIX usage (for easier compilation) 2004-05-25 02:28:44 +03:00
fil fil0fil.c: 2004-07-30 17:04:56 +03:00
fsp Merge with 4.0.21 2004-06-18 04:38:58 +03:00
fut Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ha Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ibuf Merge with 4.0.21 2004-06-18 04:38:58 +03:00
include manually merged 2004-08-18 19:57:55 +02:00
lock manually merged 2004-08-18 19:57:55 +02:00
log InnoDB: Make UNIV_LOG_DEBUG work 2004-08-11 16:04:37 +03:00
mach merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
mem Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
mtr Merge with 4.0.21 2004-06-18 04:38:58 +03:00
os manually merged 2004-08-18 19:57:55 +02:00
page InnoDB cleanup: 2004-05-27 15:27:43 +03:00
pars Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03: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 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
row manually merged 2004-08-18 19:57:55 +02:00
srv manually merged 2004-08-18 19:57:55 +02:00
sync manual merged (blame me!) 2004-07-20 00:53:24 +02:00
thr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
trx manual merged (blame me!) 2004-07-20 00:53:24 +02:00
usr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
ut manually merged 2004-08-18 19:57:55 +02: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