MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:holyfoot Date:November 1 2005 9:18am
Subject:bk commit into 4.1 tree (hf:1.2460) BUG#14183
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2460 05/11/01 13:18:46 hf@deer.(none) +4 -0
  Fix for bug #14183 (ctype_cp983.test fails with the embedded server)

  mysql-test/t/ctype_cp932_binlog.test
    1.1 05/11/01 13:17:52 hf@deer.(none) +35 -0

  mysql-test/t/ctype_cp932_binlog.test
    1.0 05/11/01 13:17:52 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.14183/mysql-test/t/ctype_cp932_binlog.test

  mysql-test/r/ctype_cp932_binlog.result
    1.1 05/11/01 13:17:51 hf@deer.(none) +19 -0

  mysql-test/t/ctype_cp932.test
    1.8 05/11/01 13:17:51 hf@deer.(none) +0 -23
    these lines don't work in embedded-server

  mysql-test/r/ctype_cp932_binlog.result
    1.0 05/11/01 13:17:51 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.14183/mysql-test/r/ctype_cp932_binlog.result

  mysql-test/r/ctype_cp932.result
    1.7 05/11/01 13:17:51 hf@deer.(none) +0 -16
    result fixed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.14183
--- New file ---
+++ mysql-test/r/ctype_cp932_binlog.result	05/11/01 13:17:51
drop table if exists t1;
set names cp932;
set character_set_database = cp932;
RESET MASTER;
CREATE TABLE t1(f1 blob);
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
SET @var1= x'8300';
EXECUTE stmt1 USING @var1;
SHOW BINLOG EVENTS FROM 79;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)
master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
master-bin.000001	#	User var	1	#	@`var1`=_binary 0x8300 COLLATE binary
master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(@'var1')
SELECT HEX(f1) FROM t1;
HEX(f1)
8300
DROP table t1;

--- New file ---
+++ mysql-test/t/ctype_cp932_binlog.test	05/11/01 13:17:52
-- source include/not_embedded.inc
-- source include/have_cp932.inc

--character_set cp932
--disable_warnings
drop table if exists t1;
--enable_warnings

set names cp932;
set character_set_database = cp932;

# Test prepared statement with 0x8300 sequence in parameter while
# running with cp932 client character set.
RESET MASTER;
CREATE TABLE t1(f1 blob);
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
SET @var1= x'8300';
# TODO: Note that this doesn't actually test the code which was added for
# bug#11338 because this syntax for prepared statements causes the PS to
# be replicated differently than if we executed the PS from C or Java.
# Using this syntax, variable names are inserted into the binlog instead
# of values. The real goal of this test is to check the code that was
# added to Item_param::query_val_str() in order to do hex encoding of
# PS parameters when the client character set is cp932;
# Bug#11338 has an example java program which can be used to verify this 
# code (and I have used it to test the fix) until there is some way to
# exercise this code from mysql-test-run.
EXECUTE stmt1 USING @var1;
--replace_column 2 # 5 #
SHOW BINLOG EVENTS FROM 79;
SELECT HEX(f1) FROM t1;
DROP table t1;
# end test for bug#11338

# End of 4.1 tests


--- 1.6/mysql-test/r/ctype_cp932.result	Wed Sep 21 22:17:24 2005
+++ 1.7/mysql-test/r/ctype_cp932.result	Tue Nov  1 13:17:51 2005
@@ -8576,22 +8576,6 @@
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
-RESET MASTER;
-CREATE TABLE t1(f1 blob);
-PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
-SET @var1= x'8300';
-EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
-master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
-master-bin.000001	#	User var	1	#	@`var1`=_binary 0x8300 COLLATE binary
-master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(@'var1')
-SELECT HEX(f1) FROM t1;
-HEX(f1)
-8300
-DROP table t1;
 SET collation_connection='cp932_japanese_ci';
 create table t1 select repeat('a',4000) a;
 delete from t1;

--- 1.7/mysql-test/t/ctype_cp932.test	Wed Sep 21 22:13:27 2005
+++ 1.8/mysql-test/t/ctype_cp932.test	Tue Nov  1 13:17:51 2005
@@ -401,29 +401,6 @@
 DROP TABLE t3;
 #DROP TABLE t4;
 
-# Test prepared statement with 0x8300 sequence in parameter while
-# running with cp932 client character set.
-RESET MASTER;
-CREATE TABLE t1(f1 blob);
-PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
-SET @var1= x'8300';
-# TODO: Note that this doesn't actually test the code which was added for
-# bug#11338 because this syntax for prepared statements causes the PS to
-# be replicated differently than if we executed the PS from C or Java.
-# Using this syntax, variable names are inserted into the binlog instead
-# of values. The real goal of this test is to check the code that was
-# added to Item_param::query_val_str() in order to do hex encoding of
-# PS parameters when the client character set is cp932;
-# Bug#11338 has an example java program which can be used to verify this 
-# code (and I have used it to test the fix) until there is some way to
-# exercise this code from mysql-test-run.
-EXECUTE stmt1 USING @var1;
---replace_column 2 # 5 #
-SHOW BINLOG EVENTS FROM 79;
-SELECT HEX(f1) FROM t1;
-DROP table t1;
-# end test for bug#11338
-
 SET collation_connection='cp932_japanese_ci';
 -- source include/ctype_filesort.inc
 -- source include/ctype_innodb_like.inc
Thread
bk commit into 4.1 tree (hf:1.2460) BUG#14183holyfoot1 Nov