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

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

This commit is contained in:
Sven Sandberg
2010-12-19 18:15:12 +01:00
831 changed files with 7924 additions and 6322 deletions

View File

@ -125,7 +125,7 @@ DROP TABLE t3;
--echo # After the worklog, it will insert nothing and the statement will not be
--echo # binlogged if the table already exists.
--echo # After the worklog, some bugs will disappear automotically.
source include/master-slave-reset.inc;
--source include/rpl_reset.inc
--echo
--echo # Case 1: BUG#47132
@ -173,4 +173,4 @@ DROP VIEW v1;
DROP TABLE t1, t2;
source include/master-slave-end.inc;
--source include/rpl_end.inc