Commit 20586596 authored by unknown's avatar unknown
Browse files

Re-enable ctype_latin1_de test for embedded server (already passes, so it 

appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file.


mysql-test/mysql-test-run.sh:
  Remove hardcoded skip of ctype_latin1_de and ctype_ucs for embedded server
mysql-test/t/ctype_ucs.test:
  Move binlog test to a new test file
mysql-test/r/ctype_ucs.result:
  Update result after test moved
parent 4f7a0857

mysql-test/mysql-test-run.sh

+0 −2
Original line number Diff line number Diff line
@@ -1508,8 +1508,6 @@ run_testcase () 
   for t in \

	"bdb-deadlock" \

	"connect" \

        "ctype_latin1_de" \

        "ctype_ucs" \

	"flush_block_commit" \

	"grant2" \

	"grant_cache" \

mysql-test/r/ctype_ucs.result

+0 −15
Original line number Diff line number Diff line
@@ -510,21 +510,6 @@ prepare stmt1 from @str2; 
execute stmt1 using @ivar;

?

1234

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;

use test;

SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t2;

set names latin1;

create table t1 (a enum('x','y','z') character set ucs2);

show create table t1;

mysql-test/r/ctype_ucs_binlog.result

0 → 100644
+15 −0
Original line number Diff line number Diff line 
SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;

use test;

SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t2;

mysql-test/t/ctype_ucs.test

+0 −17
Original line number Diff line number Diff line
@@ -328,23 +328,6 @@ set @str2 = convert(@str1 using ucs2); 
prepare stmt1 from @str2;

execute stmt1 using @ivar;



#

# Check correct binlogging of UCS2 user variables (BUG#3875)

#

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

drop table t2;





#

# Check that ucs2 works with ENUM and SET type

#

mysql-test/t/ctype_ucs_binlog.test

0 → 100644
+19 −0
Original line number Diff line number Diff line 
--source include/not_embedded.inc



#

# Check correct binlogging of UCS2 user variables (BUG#3875)

#

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

drop table t2;