Merge
mysql-test/r/sp-error.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: SCCS merged
Showing
Please register or sign in to comment
mysql-test/r/sp-error.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: SCCS merged