diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-22 07:57:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-22 07:57:56 +0100 |
| commit | 6d25c52f58648067e2e645211924ae0d5027893d (patch) | |
| tree | 25306a87efa9c6a4d8f4f1d437ef9bc472361c08 /mysql-test/r | |
| parent | 8fa1643ded83dea442e8c8afc74a023e348c7267 (diff) | |
| parent | 97aefffbf296dd54cc83b2cc0a827c4a7b951a0a (diff) | |
| download | mariadb-git-6d25c52f58648067e2e645211924ae0d5027893d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ctype_cp932_binlog_stm.result | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result index 4ea1ecb6999..d354a8b99f7 100644 --- a/mysql-test/r/ctype_cp932_binlog_stm.result +++ b/mysql-test/r/ctype_cp932_binlog_stm.result @@ -15,3 +15,32 @@ SELECT HEX(f1) FROM t1; HEX(f1) 8300 DROP table t1; +CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1, +s2 CHAR(50) CHARACTER SET cp932, +d DECIMAL(10,2))| +CREATE PROCEDURE bug18293 (IN ins1 CHAR(50), +IN ins2 CHAR(50) CHARACTER SET cp932, +IN ind DECIMAL(10,2)) +BEGIN +INSERT INTO t4 VALUES (ins1, ins2, ind); +END| +CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)| +SELECT HEX(s1),HEX(s2),d FROM t4| +HEX(s1) HEX(s2) d +466F6F2773206120426172 ED40ED41ED42 47.93 +DROP PROCEDURE bug18293| +DROP TABLE t4| +SHOW BINLOG EVENTS FROM 397| +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 397 Query 1 560 use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1, +s2 CHAR(50) CHARACTER SET cp932, +d DECIMAL(10,2)) +master-bin.000001 560 Query 1 805 use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50), +IN ins2 CHAR(50) CHARACTER SET cp932, +IN ind DECIMAL(10,2)) +BEGIN +INSERT INTO t4 VALUES (ins1, ins2, ind); +END +master-bin.000001 805 Query 1 1010 use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1'Foo\'s a Bar'), NAME_CONST('ins2',_cp932 0xED40ED41ED42), NAME_CONST('ind',47.93)) +master-bin.000001 1010 Query 1 1096 use `test`; DROP PROCEDURE bug18293 +master-bin.000001 1096 Query 1 1172 use `test`; DROP TABLE t4 |