Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/r/rpl_view.result: Auto merged mysql-test/t/rpl_view.test: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/mysqldump.result: Manual merge, merge trees 5.0->5.1
Showing
This diff is collapsed.
Please register or sign in to comment