-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/t/ps.test: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/ps.result: SCCS merged
5028735e
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/t/ps.test: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/ps.result: SCCS merged