summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-10-20 14:05:33 +0200
committerSergei Golubchik <serg@mariadb.org>2018-11-06 13:36:50 +0100
commit89a87e8e422bc342ed31764fa858898dabbf0be4 (patch)
treea5c3071ebdb1595df0ba8cf5ce7cd222a5ade899
parent564a63b5a35b644dc038965b4cf3b0cbfdc398af (diff)
downloadmariadb-git-89a87e8e422bc342ed31764fa858898dabbf0be4.tar.gz
MDEV-14429 sql_safe_updates in my.cnf not work
add a test case
-rw-r--r--mysql-test/include/mtr_warnings.sql2
-rw-r--r--mysql-test/main/sql_safe_updates.opt1
-rw-r--r--mysql-test/main/sql_safe_updates.result3
-rw-r--r--mysql-test/main/sql_safe_updates.test4
4 files changed, 9 insertions, 1 deletions
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;