Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge sql/sql_yacc.yy: Auto merged client/mysqldump.c: Manual merge (rpl 5.0 -> rpl 5.1) mysql-test/r/mysqldump.result: Manual merge (rpl 5.0 -> rpl 5.1) mysql-test/t/mysqldump.test: Manual merge (rpl 5.0 -> rpl 5.1)
Showing
Please register or sign in to comment