Skip to content

Commit 191821f

Browse files
dr-mdr-m
committed
Merge 10.9 into 10.10
2 parents 78d0d74 + 55e78eb commit 191821f

File tree

113 files changed

+3104
-3031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+3104
-3031
lines changed

‎mysql-test/main/mysqlbinlog-innodb.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
3333
SET @@session.sql_mode=#/*!*/;
3434
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
3535
/*!\C latin1 *//*!*/;
36-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
36+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
3737
SET @@session.lc_time_names=0/*!*/;
3838
SET @@session.collation_database=DEFAULT/*!*/;
3939
INSERT INTO t1 VALUES (1)
@@ -64,7 +64,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
6464
SET @@session.sql_mode=#/*!*/;
6565
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
6666
/*!\C latin1 *//*!*/;
67-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
67+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
6868
SET @@session.lc_time_names=0/*!*/;
6969
SET @@session.collation_database=DEFAULT/*!*/;
7070
INSERT INTO t1 VALUES (1)

‎mysql-test/main/mysqlbinlog.result‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
2626
SET @@session.sql_mode=#/*!*/;
2727
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2828
/*!\C latin1 *//*!*/;
29-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
29+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
3030
SET @@session.lc_time_names=0/*!*/;
3131
SET @@session.collation_database=DEFAULT/*!*/;
3232
DROP TABLE IF EXISTS `t1`,`t2`,`t3`,`t4`,`t5`,`t03`,`t04` /* generated by server */
@@ -106,7 +106,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
106106
SET @@session.sql_mode=#/*!*/;
107107
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
108108
/*!\C latin1 *//*!*/;
109-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
109+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
110110
SET @@session.lc_time_names=0/*!*/;
111111
SET @@session.collation_database=DEFAULT/*!*/;
112112
LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
@@ -142,7 +142,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
142142
SET @@session.sql_mode=#/*!*/;
143143
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
144144
/*!\C latin1 *//*!*/;
145-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
145+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
146146
SET @@session.lc_time_names=0/*!*/;
147147
SET @@session.collation_database=DEFAULT/*!*/;
148148
COMMIT
@@ -193,7 +193,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
193193
SET @@session.sql_mode=#/*!*/;
194194
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
195195
/*!\C latin1 *//*!*/;
196-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
196+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
197197
SET @@session.lc_time_names=0/*!*/;
198198
SET @@session.collation_database=DEFAULT/*!*/;
199199
insert into t1 values ("Alas")
@@ -220,7 +220,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
220220
SET @@session.sql_mode=#/*!*/;
221221
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
222222
/*!\C latin1 *//*!*/;
223-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
223+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
224224
SET @@session.lc_time_names=0/*!*/;
225225
SET @@session.collation_database=DEFAULT/*!*/;
226226
DROP TABLE IF EXISTS `t1`,`t2`,`t3`,`t4`,`t5`,`t03`,`t04` /* generated by server */
@@ -300,7 +300,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
300300
SET @@session.sql_mode=#/*!*/;
301301
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
302302
/*!\C latin1 *//*!*/;
303-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
303+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
304304
SET @@session.lc_time_names=0/*!*/;
305305
SET @@session.collation_database=DEFAULT/*!*/;
306306
LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
@@ -336,7 +336,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
336336
SET @@session.sql_mode=#/*!*/;
337337
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
338338
/*!\C latin1 *//*!*/;
339-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
339+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
340340
SET @@session.lc_time_names=0/*!*/;
341341
SET @@session.collation_database=DEFAULT/*!*/;
342342
COMMIT
@@ -387,7 +387,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
387387
SET @@session.sql_mode=#/*!*/;
388388
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
389389
/*!\C latin1 *//*!*/;
390-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
390+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
391391
SET @@session.lc_time_names=0/*!*/;
392392
SET @@session.collation_database=DEFAULT/*!*/;
393393
insert into t1 values ("Alas")
@@ -496,7 +496,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
496496
SET @@session.sql_mode=#/*!*/;
497497
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
498498
/*!\C latin1 *//*!*/;
499-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
499+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
500500
SET @@session.lc_time_names=0/*!*/;
501501
SET @@session.collation_database=DEFAULT/*!*/;
502502
CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
@@ -548,7 +548,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
548548
SET @@session.sql_mode=#/*!*/;
549549
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
550550
/*!\C latin1 *//*!*/;
551-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
551+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
552552
SET @@session.lc_time_names=0/*!*/;
553553
SET @@session.collation_database=DEFAULT/*!*/;
554554
create table t1 (a varchar(64) character set utf8)
@@ -728,7 +728,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
728728
SET @@session.sql_mode=0/*!*/;
729729
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
730730
/*!\C latin1 *//*!*/;
731-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
731+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
732732
SET @@session.lc_time_names=0/*!*/;
733733
SET @@session.collation_database=DEFAULT/*!*/;
734734
create table t1(a int) engine= innodb
@@ -782,7 +782,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
782782
SET @@session.sql_mode=0/*!*/;
783783
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
784784
/*!\C latin1 *//*!*/;
785-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
785+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
786786
SET @@session.lc_time_names=0/*!*/;
787787
SET @@session.collation_database=DEFAULT/*!*/;
788788
BEGIN
@@ -817,7 +817,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
817817
SET @@session.sql_mode=0/*!*/;
818818
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
819819
/*!\C latin1 *//*!*/;
820-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
820+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
821821
SET @@session.lc_time_names=0/*!*/;
822822
SET @@session.collation_database=DEFAULT/*!*/;
823823
BEGIN
@@ -859,7 +859,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
859859
SET @@session.sql_mode=0/*!*/;
860860
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
861861
/*!\C latin1 *//*!*/;
862-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
862+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
863863
SET @@session.lc_time_names=0/*!*/;
864864
SET @@session.collation_database=DEFAULT/*!*/;
865865
BEGIN
@@ -977,7 +977,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
977977
SET @@session.sql_mode=0/*!*/;
978978
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
979979
/*!\C latin1 *//*!*/;
980-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
980+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
981981
SET @@session.lc_time_names=0/*!*/;
982982
SET @@session.collation_database=DEFAULT/*!*/;
983983
create table test.t1 (id int not null)
@@ -1060,7 +1060,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
10601060
SET @@session.sql_mode=0/*!*/;
10611061
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
10621062
/*!\C latin1 *//*!*/;
1063-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
1063+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
10641064
SET @@session.lc_time_names=0/*!*/;
10651065
SET @@session.collation_database=DEFAULT/*!*/;
10661066
create table test.t1 (id int not null)
@@ -1143,7 +1143,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
11431143
SET @@session.sql_mode=0/*!*/;
11441144
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
11451145
/*!\C latin1 *//*!*/;
1146-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
1146+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
11471147
SET @@session.lc_time_names=0/*!*/;
11481148
SET @@session.collation_database=DEFAULT/*!*/;
11491149
create table test.t1 (id int not null)
@@ -1226,7 +1226,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
12261226
SET @@session.sql_mode=0/*!*/;
12271227
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
12281228
/*!\C latin1 *//*!*/;
1229-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
1229+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
12301230
SET @@session.lc_time_names=0/*!*/;
12311231
SET @@session.collation_database=DEFAULT/*!*/;
12321232
create table test.t1 (id int not null)

‎mysql-test/main/mysqlbinlog_row_compressed.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
3737
SET @@session.sql_mode=#/*!*/;
3838
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
3939
/*!\C latin1 *//*!*/;
40-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
40+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
4141
SET @@session.lc_time_names=0/*!*/;
4242
SET @@session.collation_database=DEFAULT/*!*/;
4343
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))

‎mysql-test/main/mysqlbinlog_row_minimal.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
3535
SET @@session.sql_mode=#/*!*/;
3636
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
3737
/*!\C latin1 *//*!*/;
38-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
38+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
3939
SET @@session.lc_time_names=0/*!*/;
4040
SET @@session.collation_database=DEFAULT/*!*/;
4141
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))
@@ -401,7 +401,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
401401
SET @@session.sql_mode=#/*!*/;
402402
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
403403
/*!\C latin1 *//*!*/;
404-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
404+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
405405
SET @@session.lc_time_names=0/*!*/;
406406
SET @@session.collation_database=DEFAULT/*!*/;
407407
COMMIT

‎mysql-test/main/mysqlbinlog_stmt_compressed.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
3737
SET @@session.sql_mode=#/*!*/;
3838
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
3939
/*!\C latin1 *//*!*/;
40-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
40+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
4141
SET @@session.lc_time_names=0/*!*/;
4242
SET @@session.collation_database=DEFAULT/*!*/;
4343
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))

‎mysql-test/main/user_var-binlog.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
3333
SET @@session.sql_mode=1411383296/*!*/;
3434
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
3535
/*!\C latin1 *//*!*/;
36-
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
36+
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
3737
SET @@session.lc_time_names=0/*!*/;
3838
SET @@session.collation_database=DEFAULT/*!*/;
3939
INSERT INTO t1 VALUES(@`a b`)

0 commit comments

Comments
 (0)