mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.
mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test: Updated test to run for both row and mixed replication testing mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result: Updated results file mysql-test/extra/rpl_tests/rpl_row_charset.test: Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB mysql-test/suite/rpl/r/rpl_row_charset.result: Updated results file mysql-test/suite/rpl/t/rpl_row_charset_innodb.test: Created a wrapper to test innodb storage engine as well mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt: Option file to ensure innodb on master mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt: Option file to ensure innodb on slave mysql-test/suite/rpl/r/rpl_row_charset_innodb.result: New results file for innodb test case
This commit is contained in:
@ -38,7 +38,7 @@ show create database mysqltest3;
|
||||
|
||||
connection master;
|
||||
use mysqltest2;
|
||||
create table t1 (a int auto_increment primary key, b varchar(100));
|
||||
--eval create table t1 (a int auto_increment primary key, b varchar(100))engine=$engine_type;
|
||||
set character_set_client=cp850, collation_connection=latin2_croatian_ci;
|
||||
insert into t1 (b) values(@@character_set_server);
|
||||
insert into t1 (b) values(@@collation_server);
|
||||
@ -146,13 +146,15 @@ set collation_server=9999998;
|
||||
|
||||
select "--- --3943--" as "";
|
||||
use test;
|
||||
CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
|
||||
--eval CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=$engine_type;
|
||||
SET CHARACTER_SET_CLIENT=koi8r,
|
||||
CHARACTER_SET_CONNECTION=cp1251,
|
||||
CHARACTER_SET_RESULTS=koi8r;
|
||||
INSERT INTO t1 (c1, c2) VALUES ('<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
|
||||
SET SQL_BIG_SELECTS=1;
|
||||
select hex(c1), hex(c2) from t1;
|
||||
sync_slave_with_master;
|
||||
SET SQL_BIG_SELECTS=1;
|
||||
select hex(c1), hex(c2) from t1;
|
||||
|
||||
connection master;
|
||||
|
Reference in New Issue
Block a user