From 89a87e8e422bc342ed31764fa858898dabbf0be4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 20 Oct 2018 14:05:33 +0200 Subject: MDEV-14429 sql_safe_updates in my.cnf not work add a test case --- mysql-test/include/mtr_warnings.sql | 2 +- mysql-test/main/sql_safe_updates.opt | 1 + mysql-test/main/sql_safe_updates.result | 3 +++ mysql-test/main/sql_safe_updates.test | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mysql-test/main/sql_safe_updates.opt create mode 100644 mysql-test/main/sql_safe_updates.result create mode 100644 mysql-test/main/sql_safe_updates.test diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index b7b2a316dfb..524ea0f4859 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -242,7 +242,7 @@ BEGIN DECLARE `pos` bigint unsigned; -- Don't write these queries to binlog - SET SQL_LOG_BIN=0; + SET SQL_LOG_BIN=0, SQL_SAFE_UPDATES=0; -- -- Remove mark from lines that are suppressed by global suppressions diff --git a/mysql-test/main/sql_safe_updates.opt b/mysql-test/main/sql_safe_updates.opt new file mode 100644 index 00000000000..7ffaa462d01 --- /dev/null +++ b/mysql-test/main/sql_safe_updates.opt @@ -0,0 +1 @@ +--enable-sql-safe-updates diff --git a/mysql-test/main/sql_safe_updates.result b/mysql-test/main/sql_safe_updates.result new file mode 100644 index 00000000000..356cd36bad9 --- /dev/null +++ b/mysql-test/main/sql_safe_updates.result @@ -0,0 +1,3 @@ +select @@sql_safe_updates; +@@sql_safe_updates +1 diff --git a/mysql-test/main/sql_safe_updates.test b/mysql-test/main/sql_safe_updates.test new file mode 100644 index 00000000000..18decd0ff2c --- /dev/null +++ b/mysql-test/main/sql_safe_updates.test @@ -0,0 +1,4 @@ +# +# MDEV-14429 sql_safe_updates in my.cnf not work +# +select @@sql_safe_updates; -- cgit v1.2.1