database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge with 5.3

Browse Source 
sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup
This commit is contained in:
Sergei Golubchik
2011-10-19 21:45:18 +02:00
parent 4e46d8e5bf 5dc1a2231f
commit 76f0b94bb0
1705 changed files with 166414 additions and 39720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/rpl/t/rpl_temporary_errors.test
View File

@@ -1,7 +1,9 @@
source include/have_binlog_format_row.inc;
source include/master-slave.inc;
source include/have_innodb.inc;
call mtr.add_suppression("Deadlock found");
call mtr.add_suppression("Can't find record in 't.'");
--echo **** On Master ****
connection master;
@@ -33,5 +35,13 @@ call mtr.add_suppression("Slave SQL.*Could not execute Update_rows event on tabl
--echo **** On Master ****
connection master;
DROP TABLE t1;
--sync_slave_with_master
--connection master
# We must wait for the slave to stop.
# Otherwise the warnings in the error log about deadlock may be written to
# the error log only during shutdown, and currently the suppression of
# "Deadlock found" set in this test case is not effective during server
# shutdown.
--source include/rpl_end.inc