database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/mysql-4.1

Browse Source 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
This commit is contained in:
unknown
2005-08-19 12:10:34 -07:00
parent 01f4258a02 1b970e94e0
commit 5ff24316d9
9 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/ctype_cp932.result
View File

@ -8576,6 +8576,20 @@ FC4B
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
CREATE TABLE t1(f1 blob);
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
SET @var1= x'8300';
EXECUTE stmt1 USING @var1;
SHOW BINLOG EVENTS FROM 27642;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 27642 Query 1 27642 use `test`; CREATE TABLE t1(f1 blob)
master-bin.000001 27701 Query 1 27701 use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
master-bin.000001 27837 User var 1 27837 @`var1`=_binary 0x8300 COLLATE binary
master-bin.000001 27876 Query 1 27876 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;

20
mysql-test/t/ctype_cp932.test
View File

@ -401,6 +401,26 @@ DROP TABLE t2;
DROP TABLE t3;
#DROP TABLE t4;
# Test prepared statement with 0x8300 sequence in parameter while
# running with cp932 client character set.
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;
SHOW BINLOG EVENTS FROM 27642;
SELECT HEX(f1) FROM t1;
DROP table t1;
# end test for bug#11338
SET collation_connection='cp932_japanese_ci';
-- source include/ctype_filesort.inc