mariadb/BitKeeper/etc
unknown 10c66c6ac7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge


BitKeeper/etc/collapsed:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
2006-09-29 10:55:03 +04:00
..
collapsed Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-09-29 10:55:03 +04:00
config Speed up "bk citool" for msvensson: 2006-09-08 11:25:08 +02:00
gone Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 2005-05-24 00:31:28 +02:00
logging_ok merge 2005-06-14 00:05:27 +02:00
notify notify BitKeeper file /home/bk/mysql/BitKeeper/etc/notify 2000-08-02 01:45:37 +02:00
RESYNC_TREE Merge mysql.com:/home/alexi/dev/mysql-4.1-0 2005-09-06 23:49:54 +04:00
skipkeys BK automatic LOD removal. 2002-11-07 11:20:17 +04:00