-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.1-12976-merge mysql-test/r/sp-vars.result: Auto merged mysql-test/t/sp-vars.test: Auto merged sql/sp_head.cc: Auto merged
22f242cd
into weblab.(none):/home/marcsql/TREE/mysql-5.1-12976-merge mysql-test/r/sp-vars.result: Auto merged mysql-test/t/sp-vars.test: Auto merged sql/sp_head.cc: Auto merged