Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge2 mysql-test/r/sp-code.result: Auto merged mysql-test/r/sp-vars.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Manual Manual merge, partial
Showing
This diff is collapsed.
Please register or sign in to comment