1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
MDEV-4489 "Replication of big5, cp932, gbk, sjis strings makes wrong values on slave"
has been fixed.

Problem:
String constants of some Asian charsets (big5,cp932,gbk,sjis)
can have backslash '\' (0x5C) in the second byte of multi-byte characters.
Replicating of such constants using the standard '\'-escaping is dangerous.
Therefore, constants of these charsets are replicated using hex notation:
INSERT INTO t1 (a) VALUES (0x815C);

However, 0xHHHH constants do not work well in some cases,
because they can behave as strings and as numbers, depending on context
(for example, depending on the data type of the column in an INSERT statement).

This SQL script was not replicated correctly with statement-based replication:

SET NAMES gbk;
PREPARE STMT FROM 'INSERT INTO t1 (a) VALUES (?)';
SET @a = '1';
EXECUTE STMT USING @a;

The INSERT statement was replicated as:
INSERT INTO t1 (a) VALUES (0x31);

'1' was correctly converted to the number 1 on master.
But the 0x31 constant was treated as number 49 on slave.

Fix:

1. Binary log now uses X'HHHH' instead of 0xHHHH constants.
2. The X'HHHH' constants now work always as strings, in all contexts.
This is the SQL standard compliant behaviour.

After the fix, the above statement is replicated as:
INSERT INTO t1 (a) VALUES (X'31');
X'31' is treated as string '1' on slave, and is correctly converted to 1.


modified:
  @ mysql-test/r/ctype_cp932_binlog_stm.result
  @ mysql-test/r/select.result
  @ mysql-test/r/select_jcl6.result
  @ mysql-test/r/select_pkeycache.result
  @ mysql-test/r/user_var-binlog.result
  @ mysql-test/r/varbinary.result
  @ mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
  @ mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  @ mysql-test/suite/rpl/r/rpl_charset_sjis.result
  @ mysql-test/suite/rpl/r/rpl_mdev382.result
  @ mysql-test/suite/rpl/t/rpl_charset_sjis.test
  @ mysql-test/t/ctype_cp932_binlog_stm.test
  @ mysql-test/t/select.test
  @ mysql-test/t/varbinary.test
    Adding and updating tests

  @ sql/item.cc
  @ sql/item.h
  @ sql/sql_yacc.yy
  @ sql/sql_lex.cc
    Splitting the implementations of X'HH' and 0xHH constants into two
    separate classes. Fixing the parser to distinguish the two syntaxes.

  @ sql/log_event.cc
    Using X'HH' instead of 0xHH for binary logging for string constants
    of the "dangerous" charsets.

  @ sql/sql_string.h
    Adding a helped method String::append_hex().
This commit is contained in:
Alexander Barkov
2013-05-08 13:36:17 +04:00
parent da846a153b
commit e013bf9f0e
20 changed files with 376 additions and 89 deletions

View File

@@ -5,9 +5,62 @@ A 65 9223372036854775807 18446744073709551615
select 0x31+1,concat(0x31)+1,-0xf;
0x31+1 concat(0x31)+1 -0xf
50 2 -15
select x'31',X'ffff'+0;
x'31' X'ffff'+0
select x'31',0xffff+0;
x'31' 0xffff+0
1 65535
select X'FFFF'+0;
X'FFFF'+0
0
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: '\xFF\xFF'
SELECT x'31'+0, 0x31+0;
x'31'+0 0x31+0
1 49
SELECT x'31'+0.1e0, 0x31+0.1e0;
x'31'+0.1e0 0x31+0.1e0
1.1 49.1
SELECT x'312E39'+0e0, 0x312E39+0e0;
x'312E39'+0e0 0x312E39+0e0
1.9 3223097
SELECT CAST(x'31' AS SIGNED), CAST(0x31 AS SIGNED);
CAST(x'31' AS SIGNED) CAST(0x31 AS SIGNED)
1 49
SELECT CAST(x'31' AS DECIMAL(10,1)), CAST(0x31 AS DECIMAL(10,1));
CAST(x'31' AS DECIMAL(10,1)) CAST(0x31 AS DECIMAL(10,1))
1.0 49.0
SELECT CAST(x'312E39' AS SIGNED), CAST(0x312E39 AS SIGNED);
CAST(x'312E39' AS SIGNED) CAST(0x312E39 AS SIGNED)
1 3223097
Warnings:
Warning 1292 Truncated incorrect INTEGER value: '1.9'
SELECT CAST(x'312E39' AS DECIMAL(10,1)), CAST(0x312E39 AS DECIMAL(10,1));
CAST(x'312E39' AS DECIMAL(10,1)) CAST(0x312E39 AS DECIMAL(10,1))
1.9 3223097.0
EXPLAIN EXTENDED SELECT X'FFFF', 0xFFFF;
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
Note 1003 select X'ffff' AS `X'FFFF'`,0xffff AS `0xFFFF`
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (X'31'),(0x31);
INSERT INTO t1 VALUES (X'312E39'),(0x312E39);
SELECT * FROM t1;
a
1
49
2
3223097
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL(10,1));
INSERT INTO t1 VALUES (X'31'),(0x31);
INSERT INTO t1 VALUES (X'312E39'),(0x312E39);
SELECT * FROM t1;
a
1.0
49.0
1.9
3223097.0
DROP TABLE t1;
create table t1 (ID int(8) unsigned zerofill not null auto_increment,UNIQ bigint(21) unsigned zerofill not null,primary key (ID),unique (UNIQ) );
insert into t1 set UNIQ=0x38afba1d73e6a18a;
insert into t1 set UNIQ=123;
@@ -104,8 +157,8 @@ A
select b'01000001';
b'01000001'
A
select x'41', 0+x'41';
x'41' 0+x'41'
select x'41', 0+x'3635';
x'41' 0+x'3635'
A 65
select N'abc', length(N'abc');
abc length(N'abc')