mariadb/BitKeeper/etc
unknown b4442bb2d6 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/r/type_enum.result:
  Use local
mysql-test/t/type_enum.test:
  Use local
2007-02-13 10:27:39 +01:00
..
collapsed Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341 2007-01-31 16:14:42 -05:00
config Speed up "bk citool" for msvensson: 2006-09-08 11:25:08 +02:00
gone Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-02-13 10:27:39 +01:00
logging_ok Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0 2005-06-23 10:58:37 +02:00
notify
RESYNC_TREE Merge mysql.com:/home/alexi/dev/mysql-4.1-0 2005-09-06 23:49:54 +04:00
skipkeys