1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#12384993 EXTRA/RPL_TEST/CHECK_TYPE.INC NEED SUPPORT FOR SPECIFIC ENGINE

Browse Source 
- add support for choosing the engine of test
    table(t1) with $engine_type
 - add primary key to the test table(t1) to support
   replication of BLOB/TEXT (also with ENGINE=ndb)
 - change the suppression since the warning printed to error log
  now says "Column 1"
This commit is contained in:
Magnus Blåudd 2011-05-11 09:49:23 +02:00
parent 724cc40023
commit 46c08b9459
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/extra/rpl_tests/check_type.inc
View File

@ -11,18 +11,28 @@
# on the slave) # on the slave)
# $can_convert True if conversion shall work, false if it # $can_convert True if conversion shall work, false if it
# shall generate an error # shall generate an error
# $engine_type The storage engine to be used for storing table
# on both master and slave
if (!$engine_type)
{
# Use the default storage engine
let $engine_type=`SELECT @@storage_engine`;
}
connection master; connection master;
disable_warnings; disable_warnings;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
enable_warnings; enable_warnings;
eval CREATE TABLE t1 (a $source_type); eval CREATE TABLE t1(
pk INT NOT NULL PRIMARY KEY,
a $source_type
) ENGINE=$engine_type;
sync_slave_with_master; sync_slave_with_master;
eval ALTER TABLE t1 MODIFY a $target_type; eval ALTER TABLE t1 MODIFY a $target_type;
connection master; connection master;
eval INSERT INTO t1 VALUES($source_value); eval INSERT INTO t1 VALUES(1, $source_value);
if ($can_convert) { if ($can_convert) {
sync_slave_with_master; sync_slave_with_master;
eval SELECT a = $target_value into @compare FROM t1; eval SELECT a = $target_value into @compare FROM t1;

2
mysql-test/suite/rpl/r/rpl_typeconv.result
View File

@ -534,7 +534,7 @@ BIT(6) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY,ALL_NON_LOSSY <Correct value> BIT(5) BIT(12) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value> BIT(12) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DROP TABLE type_conversions; DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677"); call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
DROP TABLE t1; DROP TABLE t1;
set global slave_type_conversions = @saved_slave_type_conversions; set global slave_type_conversions = @saved_slave_type_conversions;
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/t/rpl_typeconv.test
View File

@ -61,7 +61,7 @@ SELECT RPAD(Source, 15, ' ') AS Source_Type,
enable_query_log; enable_query_log;
DROP TABLE type_conversions; DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677"); call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;