1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540

Browse Source 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


mysql-test/t/status.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  manual merge
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  manual merge
sql/log.cc:
  manual merge
This commit is contained in:
unknown 2007-06-30 03:47:03 +02:00
commit 5cabc3a00e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ connection con1;
--send --send
update t1 set n = 3; update t1 set n = 3;
connection con2; connection con2;
sleep 0.5; sleep 1;
unlock tables; unlock tables;
connection con1; connection con1;
reap; reap;