-
unknown authored
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
525a7cb5
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