database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1

Browse Source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
This commit is contained in:
tomas@whalegate.ndb.mysql.com
2007-12-10 13:32:19 +01:00
parent 53dabdd38c 4740565ebb
commit 57c890d501
6 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
View File

@@ -973,14 +973,7 @@ SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
--echo
--echo ** update from master **
connection master;
#######################################
# This test should be uncommented
# once bug30674 is patched
#######################################
#***************************
#UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
#***************************
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
--replace_column 5 CURRENT_TIMESTAMP
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;