Skip to content
/ server Public
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mysql-test/main/deprecated_sql_mode_cli-master.opt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--sql-mode=MYSQL323
3 changes: 3 additions & 0 deletions mysql-test/main/deprecated_sql_mode_cli.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SELECT @@sql_mode;
@@sql_mode
REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,HIGH_NOT_PRECEDENCE,MYSQL323
8 changes: 8 additions & 0 deletions mysql-test/main/deprecated_sql_mode_cli.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--let = $MYSQLTEST_VARDIR/log/master.err
--let = SQL mode MYSQL323 is deprecated and will be removed in future versions
--source include/search_pattern_in_file.inc

--let = SQL mode MYSQL40 is deprecated and will be removed in future versions
--source include/search_pattern_in_file.inc

SELECT @@sql_mode;
13 changes: 13 additions & 0 deletions mysql-test/r/deprecated_sql_mode.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# MDEV-39164: Deprecate MYSQL323 and MYSQL40 SQL modes
#

SET sql_mode='MYSQL323';
SHOW WARNINGS;
Level Code Message
Warning 1287 SQL mode MYSQL323 is deprecated and will be removed in future versions

SET sql_mode='MYSQL40';
SHOW WARNINGS;
Level Code Message
Warning 1287 SQL mode MYSQL40 is deprecated and will be removed in future versions
9 changes: 9 additions & 0 deletions mysql-test/t/deprecated_sql_mode.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--echo #
--echo # MDEV-39164: Deprecate MYSQL323 and MYSQL40 SQL modes
--echo #

SET sql_mode='MYSQL323';
SHOW WARNINGS;

SET sql_mode='MYSQL40';
SHOW WARNINGS;
2 changes: 1 addition & 1 deletion sql/sys_vars.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6575,7 +6575,7 @@ static Sys_var_charptr Sys_wsrep_start_position (
CMD_LINE(REQUIRED_ARG),
DEFAULT(WSREP_START_POSITION_ZERO),
NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(wsrep_start_position_check),
ON_CHECK(wsrep_start_position_check),
ON_UPDATE(wsrep_start_position_update));

static Sys_var_ulong Sys_wsrep_max_ws_size (
Expand Down
Loading