summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r/log_basic.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/sys_vars/r/log_basic.result')
-rw-r--r--mysql-test/suite/sys_vars/r/log_basic.result10
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/suite/sys_vars/r/log_basic.result b/mysql-test/suite/sys_vars/r/log_basic.result
index 18a12b72437..5574d49514d 100644
--- a/mysql-test/suite/sys_vars/r/log_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_basic.result
@@ -6,10 +6,12 @@ INIT_VALUE
SELECT @@log AS INIT_VALUE;
INIT_VALUE
1
-SET @@global.general_log = ON;
-SET global general_log = 0;
-'Bug# 34832: log is a system but it is not accessible using SET @@global.log;'
-'SET GLOBAL log; and SELECT @@global.log. SHOW VARIABLES shows the value of log.'
+SET @@global.log = ON;
+Warnings:
+Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+SET global log = 0;
+Warnings:
+Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
'#--------------------FN_DYNVARS_062_02-------------------------#'
SELECT VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES