-
unknown authored
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0 mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.
a1187b71
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0 mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.