mariadb/BitKeeper/etc
unknown 44070705ea merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c
2004-11-12 11:17:53 +02:00
..
config Ensure that we use unix file format (no \r\n) for all new files 2004-03-20 12:48:14 +02:00
gone - really deleted makefile.w32 to resolve a namespace conflict on 2003-02-03 14:39:15 +01:00
logging_ok merge with 4.0 2004-11-12 11:17:53 +02:00
notify notify BitKeeper file /home/bk/mysql/BitKeeper/etc/notify 2000-08-02 01:45:37 +02:00
skipkeys BK automatic LOD removal. 2002-11-07 11:20:17 +04:00