mariadb/innobase
unknown 7013d8ef0a Merge with 3.23.54
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
  Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
heap/heapdef.h:
  Auto merged
heap/hp_open.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysys/safemalloc.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.res:
  Auto merged
Build-tools/Do-compile:
  merge
Docs/manual.texi:
  merge
configure.in:
  merge
mysql-test/r/distinct.result:
  merge
mysql-test/r/null_key.result:
  merge
sql/ha_innodb.cc:
  merge
sql/item.h:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
support-files/mysql.spec.sh:
  merge
2002-10-16 13:11:25 +03:00
..
btr Merge with 3.23.54 2002-10-16 13:11:25 +03:00
buf Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code) 2002-08-17 00:35:51 +03:00
com ut0ut.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes 2001-03-02 17:33:11 +02:00
cry Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
data Merge with 3.23.51 2002-07-25 22:46:28 +03:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict dict0dict.c: 2002-09-21 18:47:56 +03:00
dyn Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
eval Added xml patch to mysqldump. 2001-11-05 23:48:03 +02:00
fil merge with 3.23.52 2002-08-08 15:24:47 +03:00
fsp merge with 3.23.52 2002-08-08 15:24:47 +03:00
fut ut0ut.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes 2001-03-02 17:33:11 +02:00
ha Many files: 2002-08-02 23:16:19 +03:00
ibuf Merge with 3.23.51 2002-07-25 22:46:28 +03:00
include Merge with 3.23.54 2002-10-16 13:11:25 +03:00
lock Merge with 3.23.54 2002-10-16 13:11:25 +03:00
log merge with 3.23.52 2002-08-08 15:24:47 +03:00
mach Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
mem merge with 3.23.52 2002-08-08 15:24:47 +03:00
mtr merge with 3.23.52 2002-08-08 15:24:47 +03:00
odbc Added xml patch to mysqldump. 2001-11-05 23:48:03 +02:00
os Merge with 3.23.54 2002-10-16 13:11:25 +03:00
page merge with 3.23.52 2002-08-08 15:24:47 +03:00
pars Portability fix for AIX 4.3 powerpc with gcc 3.2 2002-08-24 16:32:16 +03:00
que merge 2002-04-25 01:16:42 +03:00
read Merge 2001-10-30 17:38:44 +02:00
rem Merge with 3.23.51 2002-07-25 22:46:28 +03:00
row row0ins.c, ha_innodb.cc: 2002-09-22 01:38:48 +03:00
srv srv0srv.c: 2002-09-20 05:50:25 +03:00
sync Merge with 3.23.53 2002-09-11 14:49:38 +03:00
thr Many files: 2002-08-06 22:59:13 +03:00
trx Merge with 3.23.53 2002-09-11 14:49:38 +03:00
usr Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
ut merge with 3.23.52 2002-08-12 04:04:43 +03:00
configure.in merged 2002-08-31 23:38:10 +00:00
Makefile.am Make sure ib_config.h is distributed. 2001-03-05 21:08:24 -05: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
stamp-h.in Added Innobase to source distribution 2001-02-17 14:19:19 +02:00