BitKeeper/etc/collapsed · 806279650510eb48b3e1dc7f130b9cbe2a75ecd6 · nexedi / MariaDB

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b0417e9d

unknown authored Oct 09, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583


BitKeeper/etc/collapsed:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged

b0417e9d

collapsed 372 Bytes

Replace collapsed