From 96e63d07dd02602b1103270df2f2acfc725388cf Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 21 Aug 2007 16:26:00 +0200 Subject: [PATCH] rpl_ndb_dd_partitions-slave.opt: Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt .del-rpl_stm_extraColmaster_ndb.result: Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result .del-rpl_extraColmaster_myisam.test: Delete: mysql-test/t/rpl_extraColmaster_myisam.test ndb_bug26793.result: Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result .del-rpl_extraColmaster_innodb-slave.opt: Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt .del-rpl_extraColmaster_innodb-master.opt: Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt .del-rpl_row_extraColmaster_ndb.test: Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test .del-rpl_row_extraColmaster_ndb.result: Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result .del-rpl_stm_extraColmaster_ndb.test: Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test .del-rpl_extraColmaster_innodb.test: Delete: mysql-test/t/rpl_extraColmaster_innodb.test ndb_bug26793.test: Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test rpl_ndb_dd_partitions-master.opt: Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt .del-rpl_colSize.test~d9690ba9ffd2b048: Delete: mysql-test/t/rpl_colSize.test BitKeeper/deleted/.del-rpl_colSize.test~d9690ba9ffd2b048: Delete: mysql-test/t/rpl_colSize.test BitKeeper/deleted/.del-rpl_extraColmaster_innodb-master.opt: Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt BitKeeper/deleted/.del-rpl_extraColmaster_innodb-slave.opt: Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt BitKeeper/deleted/.del-rpl_extraColmaster_innodb.test: Delete: mysql-test/t/rpl_extraColmaster_innodb.test BitKeeper/deleted/.del-rpl_extraColmaster_myisam.test: Delete: mysql-test/t/rpl_extraColmaster_myisam.test BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test: Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test: Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test mysql-test/suite/ndb/t/ndb_bug26793.test: Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test mysql-test/suite/ndb/r/ndb_bug26793.result: Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result: Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.result: Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt: Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt: Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt --- .../r/rpl_row_extraColmaster_ndb.result | Bin 12243 -> 0 bytes .../r/rpl_stm_extraColmaster_ndb.result | Bin 12256 -> 0 bytes .../{ => suite/ndb}/r/ndb_bug26793.result | 0 .../{ => suite/ndb}/t/ndb_bug26793.test | 0 .../t/rpl_ndb_dd_partitions-master.opt | 0 .../t/rpl_ndb_dd_partitions-slave.opt | 0 mysql-test/t/rpl_colSize.test | 216 ------------------ .../t/rpl_extraColmaster_innodb-master.opt | 1 - .../t/rpl_extraColmaster_innodb-slave.opt | 1 - mysql-test/t/rpl_extraColmaster_innodb.test | 15 -- mysql-test/t/rpl_extraColmaster_myisam.test | 13 -- mysql-test/t/rpl_row_extraColmaster_ndb.test | 12 - mysql-test/t/rpl_stm_extraColmaster_ndb.test | 13 -- 13 files changed, 271 deletions(-) delete mode 100644 mysql-test/r/rpl_row_extraColmaster_ndb.result delete mode 100644 mysql-test/r/rpl_stm_extraColmaster_ndb.result rename mysql-test/{ => suite/ndb}/r/ndb_bug26793.result (100%) rename mysql-test/{ => suite/ndb}/t/ndb_bug26793.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_dd_partitions-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_dd_partitions-slave.opt (100%) delete mode 100644 mysql-test/t/rpl_colSize.test delete mode 100644 mysql-test/t/rpl_extraColmaster_innodb-master.opt delete mode 100644 mysql-test/t/rpl_extraColmaster_innodb-slave.opt delete mode 100644 mysql-test/t/rpl_extraColmaster_innodb.test delete mode 100644 mysql-test/t/rpl_extraColmaster_myisam.test delete mode 100644 mysql-test/t/rpl_row_extraColmaster_ndb.test delete mode 100644 mysql-test/t/rpl_stm_extraColmaster_ndb.test diff --git a/mysql-test/r/rpl_row_extraColmaster_ndb.result b/mysql-test/r/rpl_row_extraColmaster_ndb.result deleted file mode 100644 index 230b880e46f76449988aeb95120343d4606e376d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12243 zcmeHN-EZ4C62DjJ@ql|Lb{~`!+N?y$UkUu+B<`-Uj+3*U?iEg= z8H}bbiK+Yz@RwYT2N%8Zd-6yBJ+y`7?DyXIfO?0n{p%Z8K$%D6&98RcAa944y(u~G zzwKQQr^KO0p69s4j+>%Oc(`tx_9s)vwc{2aL3aUqJ8qL{|6fxmbja{>^xNt1@)RC? zkDLys2h9M+jeVcI>y1wbBbe7gGdw)B`=j3mqkh*Jou4`$%_&e>mNZs=jowH@Bxa8 zY?a$#iKCL-EV3J@xN$tc`h_a*lTU-N(LCHbJaviqa|(8w zrE};6G6(Jt(F2YGjm}*L`(0)WmXbKnmZZFA1IvS605M!(!7 zDV%Zm`1Y7Z^O+nA$*!^j_>9>idYb8O)ru-XrQa6zdRgODnkMO;^_~@St&@KaXVuy< zdt4;9u=v?|HakDHU=pfgaF=E|)EkvRHAQp0f$&-VpUGm5Y&SPZ_OfvZf}i#CJk2c6 zRu5Tj*^`IladrlF0c;dB^*^!Omn1iNjBarwuhTMFK)-aJlu4Faqby~zQVY29jPmu= zwoWF)S#Pn(KC(IVtJa?N#E#bLuA=hZGU^y8hEb6`!U;60{$NkAI&O-J*(tkEQl%1W zJ;a&3V|fxk%_b~|lQKI)&M>K+PpWYwt0&4fJsSObk9K}}jm}Z~r;1DKkFGBcoCs|w z8gS>-Tq0$ls!!P!C6 z1$U|W(RB~-gW&qO5B5D8N^dA#A$Vmnx|{-+;cz|czr5YPIBB1fNq@R^VK+|Q)&3df zcp!^oTb97eG(+ohRie|&BlLdUUy?Y>$!)e+EmPve9fyGT%fW#8wQUQ&^S0HtDEC%!&@==jD2}A@#8cX0(Bs1J{$_j3M}@+Z-o z2K+&eK|}Js-y36>hTe79E39Y=fX_`DZLRka+uGWe2A;UV_=N&Y(M$<;?kcf|c2vgb`lF+XWNknjh z=DHT_1Y0@l7^fQA=pd)gC)~hLpeL%DrSmTaD^mZV7j%~XU5CIi}h@7OM~CAwsA#`jSU z!LkwDQXSli&=O-v6dj}<4C{~%!CiBp-g{Z z3Jfw|%8L`ogh>a$e}XL^o;uSWzut=wXLCRBK{%em2OIjqp=onHqZPRvZsL>vN)xLFHF; zeuh;sbHJ?z6eNj4s&)1}*~*vm48dwrF$Kw}0%{Q!<4|sOtWAhkSulQV$TCS+1rfUk zrq_VFf|XdgkRmCQB_ziAE;+Vnf&BFbL%mCmpi!~NU*v9SSn2t)EeE{i#Mvq@@1^kf z#$0S0{;!o+s1pR&I@Z+s#;IR2v3p~_7Uz1>ujfZsg`R>Js>Ab4*#e-yh32}7qyKJ8#P@g<%BUh37rb5pYkc!Bki zSazQ%(3W^D6!Wb}RivAQDJ5yVI;r;ACkmu>suCHyU2&*nAzt4z_!jqKYFBG0Szm&K+jEsmaJFyZm)~aGe$A%F zF4&D-tylP}UXY7_aqe)34`UL(4tdYcSQDtF{>($LZ{s4CXc_v6-I#e$&8r_EZ zQCAFuZgYJ_QBl(_UAMz~Rdt0?wfkLuJx5+(gm-w)NdiuSZ$4V8gs(j?0hh9m;&p_+ z0vUASCgX+_n-{jNGj-o4aL8?x;^m4P#_w0uE=|@hQNpy1OO-H!@f_Bk16V|DgR!cr WTKn6Icr$Z-r diff --git a/mysql-test/r/rpl_stm_extraColmaster_ndb.result b/mysql-test/r/rpl_stm_extraColmaster_ndb.result deleted file mode 100644 index 30332e9e7c8d3ee8084ec8aa2d8b8a9d3e1df72c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12256 zcmeGiU2oes@?NFK1MZ#JeNa+pvl1nLCGdmexVy$WPR@3^S6~4{iK#@0BL$M&Huvjq zhF=yHJ9X3UwGXz_nj(iY=&^vLrZm)LPrObHLyW3$0@=D2p;;uQ20fVbl|nGOCkgGPspF2=u|jxJ8&!S~4N zaCXoPfNt#j6)VVr?-KFn#7SP1uvz~I<~dLIMS>5|TxP5E zmXRzbchTcxlCq+J5$6NTpGX{)gEmMkT4o;{HAj*-VGj}}S60OX4n;*x{FCF0L1?~)uT27+R? ze87iqO!35CJuae>A=B{|#9@~>Daf2dKHjmMk=XCT@hsSq0g%|BZwwVMbW@TydN9iu zAR5=e{on)y$%?5J2UZ+fal?w6R@}1UwiS0Q5IFef+tk9ZU@$b0wea&2TP@>ot$*;( zzpku*hVSga!Y}6?{N4lC;ODi-io5KixXf_GQMoEkPV6aanfdTyK7}4;{cN9e#WDXq zD@x0!ts@Vu@$CtV7IR4s!7j4`=ug-(dYbEL)s8AaW!@I_dS{bWnkMP3^_~@SyVHM<=GEQ_ zdt4?ru>bj4Ha|PHU=gZgc$;Q9^c$T3HA9WO0q|M>pUHB8Xg3c?^m1?nyq^#9Jk2c6 zRu5Tj+0*;vaoz{j0BQ<`2A|l?OPrfNMmKntS816nVP3jO$|Oszah5XKsTo{(M*e#0 zWT(^7ytiCtAK3!tReSqAaiX=p%c#7wj6MdkVRR&qa0!jBKiCuOj%%Z0e#-8WREfk| z6mcc*Sf0dB^C`>WvdsI485XtkWi@VP^-|fUQKMgP)Xpxh&^~GtRk3P=@zwc(6QLSK z9q!yXhh)LxXtgW}cB6Sa8}z|?jt=~m+o_EDaAUZ6M00mOI2&G_OFP#gfORk#_79pa zSWJzNu4jNL1nbAmu~qq^sp}E&RI)?_b<~1m942sEx)mzwnik z+TJdy-@t8#t%L814sVkXsRdeuoPl!=eQnX24bSnZLxh)&*VN-)I(LSvelq1=vvi^T zz&ss4l+S{o-;j?Ayh$J^7$No+nS$OLNjUA3`yC>eLOtG^&U)vUFoF8;IDRkJPbq&A zvuVH|Bn=vp_k-R9r!@4b!&zZRQ~3B?rP0><9C56zb!p(aEe_rxLOa87;1N{EgsZJ> z>NxN<_X4Wrl&fY$5un}^7&d8i(D48iRw573zI@$5LrXMmv<`{**oUyBtx*a6+Neat zC#bG#@lLQ6vkr5r(T$FC>UhGfcy^APj5rLqZ+~SZ=1K%Ugf;?|4VXu=f0+t0L1n<0?;YDk_JAfCjPYHR zL%eLnw^YZsBD%ydQU#c{2r$vzkq(K6!&?X<2#x|tVv=-i2zYsT+mfD>Yd;SzZ4q1| zwLrK(9!8j3s3FL%)J~ME@-|RvOC!2P}RxR*jPKca2Hf9kb%}`Cz+UgpeMjv|t|~V^Ks8t31L~3aI}sr2v4p zG7cJD2U@VS4F)}EHmzZLljS)E{*ba^w-E4i|MM6Hxr*3yNPVwj=Zz}?TQGAzD26fv zf>|&~ekm(XAQ>hN0RIWLe0cUuTm1SgLY&R>zy={bzBa(n<3{JW(LU;Q zIuh7$(2NQN7)iNRTAMstrNQ{MArDEq zDu_5eP`!q$D^Q7@3oeo}d4SwFKPAT&Bap)0ps07r5i}|q`HRdg4J$KW*5%-DIdQhi z%R9;Zy)qZahW~5f72*WJwT?Blym9E4RP0`vuNk^m<`ubljWXZsa?CA%H(gF3^CDk- zLYNI=N*4$k&1{PKdv z?PWGKbir=uYO}&u&4OI~i))86K8#8DK4ht#u_xSJ)8h7*_p9PQ{s3iwJQJkr4%N$x zMz>*pRFz@SZLX^n6*TSA^*Fp&RaJ~?-0$-899hE%@9>_31RMn4e6&;xUwdEzE@dCZ z>j+&18FZnTaYKsD3)@y-)!PIPxrtINuDE8rzM@t)S*xRjWgB&sK*4wpYtI2}qISU8 oRTZtjt6=fGH=PY8^UI6LY+tu13LH0=C+_POvG}n6t?L&52gvr;R{#J2 diff --git a/mysql-test/r/ndb_bug26793.result b/mysql-test/suite/ndb/r/ndb_bug26793.result similarity index 100% rename from mysql-test/r/ndb_bug26793.result rename to mysql-test/suite/ndb/r/ndb_bug26793.result diff --git a/mysql-test/t/ndb_bug26793.test b/mysql-test/suite/ndb/t/ndb_bug26793.test similarity index 100% rename from mysql-test/t/ndb_bug26793.test rename to mysql-test/suite/ndb/t/ndb_bug26793.test diff --git a/mysql-test/t/rpl_ndb_dd_partitions-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_dd_partitions-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt diff --git a/mysql-test/t/rpl_ndb_dd_partitions-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_dd_partitions-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt diff --git a/mysql-test/t/rpl_colSize.test b/mysql-test/t/rpl_colSize.test deleted file mode 100644 index 44fb878d4d2..00000000000 --- a/mysql-test/t/rpl_colSize.test +++ /dev/null @@ -1,216 +0,0 @@ -################################################################## -# rpl_colSize # -# # -# This test is designed to test the changes included in WL#3228. # -# The changes include the ability to replicate with the master # -# having columns that are smaller (shorter) than the slave. # -################################################################## - --- source include/master-slave.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - ---echo **** Testing WL#3228 changes. **** ---echo *** Create "wider" table on slave *** -sync_slave_with_master; -STOP SLAVE; -RESET SLAVE; - -eval CREATE TABLE t1 ( - a float (47), - b double (143,9), - c decimal (65,30), - d numeric (4,0), - e bit (32), - f char (21), - g varchar (1300), - h binary (33), - j varbinary (200), - k enum ('5','6','7', '8','9','0'), - l set ('1','2','3','4','5','6','7','8','9','0','11','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29'), - m TINYBLOB, - n BLOB, - o MEDIUMBLOB, - p LONGBLOB, - q TINYTEXT, - r TEXT, - s MEDIUMTEXT, - t LONGTEXT -); - ---echo *** Create same table on master but with narrow columns *** -connection master; -eval CREATE TABLE t1 ( - a float (44), - b double (10,3), - c decimal (10,2), - d numeric (3,0), - e bit (16), - f char (10), - g varchar (100), - h binary (20), - j varbinary (20), - k enum ('5','6','7'), - l set ('1','2','3','4','5','6','7','8','9','0'), - m TINYBLOB, - n BLOB, - o MEDIUMBLOB, - p LONGBLOB, - q TINYTEXT, - r TEXT, - s MEDIUMTEXT, - t LONGTEXT -); - -RESET MASTER; - ---echo *** Start replication *** -connection slave; -START SLAVE; - ---echo *** Insert data on master and display it. *** -connection master; - -INSERT INTO t1 () VALUES ( - 17.567, - 2.123, - 10.20, - 125, - hex(64), - 'TEST', - 'This is a test', - 'binary data', - 'more binary data', - '6', - '7', - "blob 1", - "blob 2", - "blob 3", - "blob 4", - "text 1", - "text 2", - "text 3", - "text 4"); - -# Replace values in columns that display differently between SBR & RBR ---replace_column 5 # 8 # -SELECT * FROM t1 ORDER BY a; - ---echo *** Select data from slave to compare *** -sync_slave_with_master; -connection slave; - -# Replace values in columns that display differently between SBR & RBR ---replace_column 5 # 8 # -SELECT * FROM t1 ORDER BY a; - -# Test boundary limits of varchar and char fields -# Master/Slave -# <256/<256 with m < s, m > s, and m == s <-- col a -# >255/<256 with m < s, m > s, and m == s <-- error will be caught in BUG#22086 -# <256/>255 with m < s, m > s, and m == s <-- col b -# >255/>255 with m < s, m > s, and m == s <-- col c -# -# Test boundary limits of CHAR fields -# Master/Slave -# <256/<256 with m < s, m > s, and m == s <-- col d -# >255/<256 with m < s, m > s, and m == s <-- error char limited to 255 chars -# <256/>255 with m < s, m > s, and m == s <-- error char limited to 255 chars -# >255/>255 with m < s, m > s, and m == s <-- error char limited to 255 chars - -connection master; -DROP TABLE t1; - ---echo Create varchar table on master -CREATE TABLE t1 ( - a VARCHAR(50), - b VARCHAR(100), - c VARCHAR(300), - d CHAR(5) -); - -sync_slave_with_master slave; - ---echo Alter varchar table on slave -ALTER TABLE t1 CHANGE COLUMN a a VARCHAR(100); -ALTER TABLE t1 CHANGE COLUMN b b VARCHAR(400); -ALTER TABLE t1 CHANGE COLUMN c c VARCHAR(500); -ALTER TABLE t1 CHANGE COLUMN d d CHAR(100); - -connection master; - ---echo Insert some values and select them on master -INSERT INTO t1 VALUES ("This is a test of col a.", - "This is another test of col b.", - "This is a test of the large col c.", - "Col d"); -SELECT * FROM t1; -SHOW CREATE TABLE t1; - -sync_slave_with_master slave; - ---echo Insert some values and select them on slave -SELECT * FROM t1; -SHOW CREATE TABLE t1; - - -# Test boundary limits of bit fields -# m < s, m % 8 != 0, and s % 8 == 0 col a -# m < s, m % 8 == 0, and s % 8 != 0 col b -# m < s, m % 8 != 0, and s % 8 != 0 col c -# m > s, m % 8 != 0, and s % 8 == 0 <-- error will be caught in BUG#22086 -# m > s, m % 8 == 0, and s % 8 != 0 <-- error will be caught in BUG#22086 -# m > s, m % 8 != 0, and s % 8 != 0 <-- error will be caught in BUG#22086 - -connection master; -DROP TABLE t1; - ---echo Create bit table on master -CREATE TABLE t1 ( - a BIT(7), - b BIT(8), - c BIT(21), - d BIT(11), - e BIT(11) -); - -sync_slave_with_master slave; - ---echo Create bit table on slave -DROP TABLE t1; -CREATE TABLE t1 ( - a BIT(16), - b BIT(22), - c BIT(54), - d BIT(25), - e BIT(13) -); - -connection master; - ---echo Insert some values and select them on master -INSERT INTO t1 VALUES ( - b'1010101', - b'10101011', - b'101010110101010101111', - b'10101010101', - b'10101011111' - ); - -SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; -SHOW CREATE TABLE t1; - -sync_slave_with_master slave; - ---echo Insert some values and select them on master -SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; -SHOW CREATE TABLE t1; - ---echo *** Cleanup *** -connection master; -DROP TABLE t1; -sync_slave_with_master; - -# END 5.1 Test Case diff --git a/mysql-test/t/rpl_extraColmaster_innodb-master.opt b/mysql-test/t/rpl_extraColmaster_innodb-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/t/rpl_extraColmaster_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/t/rpl_extraColmaster_innodb-slave.opt b/mysql-test/t/rpl_extraColmaster_innodb-slave.opt deleted file mode 100644 index 1338b6eba04..00000000000 --- a/mysql-test/t/rpl_extraColmaster_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ - --innodb diff --git a/mysql-test/t/rpl_extraColmaster_innodb.test b/mysql-test/t/rpl_extraColmaster_innodb.test deleted file mode 100644 index 082c22329fa..00000000000 --- a/mysql-test/t/rpl_extraColmaster_innodb.test +++ /dev/null @@ -1,15 +0,0 @@ -############################################################# -# Purpose: To test having extra columns on the master WL#3915 -############################################################# --- source include/master-slave.inc --- source include/have_innodb.inc - -let $engine_type = 'InnoDB'; - -set binlog_format=row; --- source extra/rpl_tests/rpl_extraMaster_Col.test - -set binlog_format=statement; --- source extra/rpl_tests/rpl_extraMaster_Col.test - - diff --git a/mysql-test/t/rpl_extraColmaster_myisam.test b/mysql-test/t/rpl_extraColmaster_myisam.test deleted file mode 100644 index 5bbd7953294..00000000000 --- a/mysql-test/t/rpl_extraColmaster_myisam.test +++ /dev/null @@ -1,13 +0,0 @@ -############################################################# -# Purpose: To test having extra columns on the master WL#3915 -############################################################# --- source include/master-slave.inc - -let $engine_type = 'MyISAM'; - -set binlog_format=row; --- source extra/rpl_tests/rpl_extraMaster_Col.test - -set binlog_format=statement; --- source extra/rpl_tests/rpl_extraMaster_Col.test - diff --git a/mysql-test/t/rpl_row_extraColmaster_ndb.test b/mysql-test/t/rpl_row_extraColmaster_ndb.test deleted file mode 100644 index b91947e52e2..00000000000 --- a/mysql-test/t/rpl_row_extraColmaster_ndb.test +++ /dev/null @@ -1,12 +0,0 @@ -########################################### -# Purpose: Wrapper for rpl_extraMaster_Col.test -# Using NDB -########################################### --- source include/have_ndb.inc --- source include/ndb_master-slave.inc --- source include/have_binlog_format_row.inc - -let $engine_type = 'NDB'; - --- source extra/rpl_tests/rpl_extraMaster_Col.test - diff --git a/mysql-test/t/rpl_stm_extraColmaster_ndb.test b/mysql-test/t/rpl_stm_extraColmaster_ndb.test deleted file mode 100644 index 84734204439..00000000000 --- a/mysql-test/t/rpl_stm_extraColmaster_ndb.test +++ /dev/null @@ -1,13 +0,0 @@ -########################################### -# Purpose: Wrapper for rpl_extraMaster_Col.test -# Using NDB -########################################### --- source include/have_ndb.inc --- source include/ndb_master-slave.inc --- source include/have_binlog_format_statement.inc - -let $engine_type = 'NDB'; - --- source extra/rpl_tests/rpl_extraMaster_Col.test - -