Commit 36ceef6a authored by unknown's avatar unknown

Merge mysql.com:/usr/local/mysql/mysql-5.0-merge

into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
parents 6901d789 d9d7b44c
......@@ -10,9 +10,6 @@ reset slave;
start slave;
stop slave;
start slave;
select master_pos_wait('master-bin.001',3000)>=0;
master_pos_wait('master-bin.001',3000)>=0
1
select max(a) from t1;
max(a)
8000
......
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