database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 4.1 -> 5.0

Browse Source
This commit is contained in:
pem@mysql.com
2004-05-07 18:52:06 +02:00
parent e1182c5226 df8e3eac45
commit bf45960eef
2201 changed files with 519910 additions and 8438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/rpl_error_ignored_table.test
View File

@ -40,7 +40,7 @@ insert into t3 values(connection_id());
send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
connection master1;
sleep 2;
real_sleep 2;
select (@id := id) - id from t3;
kill @id;
drop table t2,t3;