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

Fix merge problems and re-record output for legitimate changes.

Browse Source
This commit is contained in:
cmiller@zippy.cornsilk.net
2008-05-16 11:35:15 -04:00
parent b59575830a
commit 1e5fc1089f
5 changed files with 89 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
View File

@@ -1023,11 +1023,11 @@ master-bin.000001 # Xid 1 # #
master-bin.000001 # Query 1 # use `test_rpl`; ANALYZE TABLE t1
master-bin.000001 # Query 1 # use `test_rpl`; OPTIMIZE TABLE t1
master-bin.000001 # Query 1 # use `test_rpl`; REPAIR TABLE t1
master-bin.000001 # Query 1 # use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1 ()
master-bin.000001 # Query 1 # use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
BEGIN
UPDATE t1 SET b = 'test' WHERE a = 201;
END
master-bin.000001 # Query 1 # use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE p2 ()
master-bin.000001 # Query 1 # use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`()
BEGIN
UPDATE t1 SET b = UUID() WHERE a = 202;
END