Commit 0c3f4e11 authored by unknown's avatar unknown

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
parents d6b1188f 679ed1c8
This diff is collapsed.
...@@ -96,3 +96,4 @@ a b ...@@ -96,3 +96,4 @@ a b
1 6 1 6
drop table t1; drop table t1;
drop view v1; drop view v1;
End of 5.0 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment