-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new mysql-test/r/mysql.result: Auto merged mysql-test/t/mysql.test: Auto merged sql/sql_parse.cc: Auto merged
0e330318
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new mysql-test/r/mysql.result: Auto merged mysql-test/t/mysql.test: Auto merged sql/sql_parse.cc: Auto merged