diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 17:51:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 17:51:28 +0200 |
| commit | 4749d40c635634e25e07d28ce1a04e9263bcc375 (patch) | |
| tree | c5bb3287675cd8676d76c8ee42ef2d79cc599e25 /mysql-test/r/user_var-binlog.result | |
| parent | 1ff1cb10fc236010b5969058cab934c2b306c931 (diff) | |
| parent | 33ef993773449cb3917665b188f6b6575d399bd0 (diff) | |
| download | mariadb-git-4749d40c635634e25e07d28ce1a04e9263bcc375.tar.gz | |
5.5 merge
Diffstat (limited to 'mysql-test/r/user_var-binlog.result')
| -rw-r--r-- | mysql-test/r/user_var-binlog.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/r/user_var-binlog.result index 56fe19200f8..eaaf5c39ec4 100644 --- a/mysql-test/r/user_var-binlog.result +++ b/mysql-test/r/user_var-binlog.result @@ -9,12 +9,12 @@ insert into t1 values (@var1),(@var2); show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # BEGIN GTID #-#-# -master-bin.000001 # User var # # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci +master-bin.000001 # User var # # @`a b`=_latin1 X'68656C6C6F' COLLATE latin1_swedish_ci master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(@`a b`) master-bin.000001 # Query # # COMMIT master-bin.000001 # Gtid # # BEGIN GTID #-#-# -master-bin.000001 # User var # # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci -master-bin.000001 # User var # # @`var2`=_binary 0x61 COLLATE binary +master-bin.000001 # User var # # @`var1`=_latin1 X'273B616161' COLLATE latin1_swedish_ci +master-bin.000001 # User var # # @`var2`=_binary X'61' COLLATE binary master-bin.000001 # Query # # use `test`; insert into t1 values (@var1),(@var2) master-bin.000001 # Query # # COMMIT flush logs; @@ -25,7 +25,7 @@ DELIMITER /*!*/; ROLLBACK/*!*/; BEGIN /*!*/; -SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`/*!*/; +SET @`a b`:=_latin1 X'68656C6C6F' COLLATE `latin1_swedish_ci`/*!*/; use `test`/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; @@ -43,8 +43,8 @@ COMMIT /*!*/; BEGIN /*!*/; -SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`/*!*/; -SET @`var2`:=_binary 0x61 COLLATE `binary`/*!*/; +SET @`var1`:=_latin1 X'273B616161' COLLATE `latin1_swedish_ci`/*!*/; +SET @`var2`:=_binary X'61' COLLATE `binary`/*!*/; SET TIMESTAMP=10000/*!*/; insert into t1 values (@var1),(@var2) /*!*/; |