Skip to content

Commit 99cff0b

Browse files
author
Jimmy Yang
committed
Merge branch 'mysql-5.7' of myrepo.no.oracle.com:mysql into mysql-5.7
2 parents 1166887 + 3d5dc1f commit 99cff0b

13 files changed

+232
-233
lines changed

‎mysql-test/r/mysqld--help-win.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,6 +1258,7 @@ delay-key-write ON
12581258
delayed-insert-limit 100
12591259
delayed-insert-timeout 300
12601260
delayed-queue-size 1000
1261+
disabled-storage-engines
12611262
disconnect-on-expired-password TRUE
12621263
disconnect-slave-event-count 0
12631264
div-precision-increment 4
@@ -1516,7 +1517,7 @@ slow-query-log FALSE
15161517
slow-start-timeout 15000
15171518
sort-buffer-size 262144
15181519
sporadic-binlog-dump-fail FALSE
1519-
sql-mode ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
1520+
sql-mode ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
15201521
stored-program-cache 256
15211522
super-read-only FALSE
15221523
symbolic-links FALSE

‎mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ use `test`/*!*/;
382382
SET TIMESTAMP=#/*!*/;
383383
SET @@session.pseudo_thread_id=#/*!*/;
384384
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
385-
SET @@session.sql_mode=1344274464/*!*/;
385+
SET @@session.sql_mode=1436549152/*!*/;
386386
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
387387
/*!\C latin1 *//*!*/;
388388
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -4887,7 +4887,7 @@ SET @@SESSION.GTID_NEXT= '#'/*!*/;
48874887
# at #
48884888
# # server id # end_log_pos # CRC32 # Query thread_id=# exec_time=# error_code=0
48894889
SET TIMESTAMP=#/*!*/;
4890-
SET @@session.sql_mode=1344274464/*!*/;
4890+
SET @@session.sql_mode=1436549152/*!*/;
48914891
CREATE TABLE t1 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0)
48924892
/*!*/;
48934893
# at #

‎mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ use `test`/*!*/;
22642264
SET TIMESTAMP=#/*!*/;
22652265
SET @@session.pseudo_thread_id=#/*!*/;
22662266
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2267-
SET @@session.sql_mode=1344274464/*!*/;
2267+
SET @@session.sql_mode=1436549152/*!*/;
22682268
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
22692269
/*!\C utf8 *//*!*/;
22702270
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
@@ -3928,7 +3928,7 @@ use `test`/*!*/;
39283928
SET TIMESTAMP=#/*!*/;
39293929
SET @@session.pseudo_thread_id=#/*!*/;
39303930
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
3931-
SET @@session.sql_mode=1344274464/*!*/;
3931+
SET @@session.sql_mode=1436549152/*!*/;
39323932
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
39333933
/*!\C utf8 *//*!*/;
39343934
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
@@ -4325,7 +4325,7 @@ use `test`/*!*/;
43254325
SET TIMESTAMP=#/*!*/;
43264326
SET @@session.pseudo_thread_id=#/*!*/;
43274327
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
4328-
SET @@session.sql_mode=1344274464/*!*/;
4328+
SET @@session.sql_mode=1436549152/*!*/;
43294329
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
43304330
/*!\C utf8 *//*!*/;
43314331
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
@@ -4940,7 +4940,7 @@ use `test`/*!*/;
49404940
SET TIMESTAMP=#/*!*/;
49414941
SET @@session.pseudo_thread_id=#/*!*/;
49424942
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
4943-
SET @@session.sql_mode=1344274464/*!*/;
4943+
SET @@session.sql_mode=1436549152/*!*/;
49444944
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
49454945
/*!\C utf8 *//*!*/;
49464946
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;

‎mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ use `test`/*!*/;
22642264
SET TIMESTAMP=#/*!*/;
22652265
SET @@session.pseudo_thread_id=#/*!*/;
22662266
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2267-
SET @@session.sql_mode=1344274464/*!*/;
2267+
SET @@session.sql_mode=1436549152/*!*/;
22682268
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
22692269
/*!\C utf8 *//*!*/;
22702270
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
@@ -3950,7 +3950,7 @@ use `test`/*!*/;
39503950
SET TIMESTAMP=#/*!*/;
39513951
SET @@session.pseudo_thread_id=#/*!*/;
39523952
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
3953-
SET @@session.sql_mode=1344274464/*!*/;
3953+
SET @@session.sql_mode=1436549152/*!*/;
39543954
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
39553955
/*!\C utf8 *//*!*/;
39563956
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
@@ -4353,7 +4353,7 @@ use `test`/*!*/;
43534353
SET TIMESTAMP=#/*!*/;
43544354
SET @@session.pseudo_thread_id=#/*!*/;
43554355
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
4356-
SET @@session.sql_mode=1344274464/*!*/;
4356+
SET @@session.sql_mode=1436549152/*!*/;
43574357
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
43584358
/*!\C utf8 *//*!*/;
43594359
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
@@ -4978,7 +4978,7 @@ use `test`/*!*/;
49784978
SET TIMESTAMP=#/*!*/;
49794979
SET @@session.pseudo_thread_id=#/*!*/;
49804980
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
4981-
SET @@session.sql_mode=1344274464/*!*/;
4981+
SET @@session.sql_mode=1436549152/*!*/;
49824982
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
49834983
/*!\C utf8 *//*!*/;
49844984
SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;

0 commit comments

Comments
 (0)