-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/item_func.cc: Auto merged
123bcd5e
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/item_func.cc: Auto merged