summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorpem@mysql.comhem.se <>2004-02-11 18:21:55 +0100
committerpem@mysql.comhem.se <>2004-02-11 18:21:55 +0100
commitf9e73c771684df31b89262cd4f18cc1e0f32849b (patch)
treef215891d215ef5e3a173f8641ca3adbcca8f5835 /mysql-test/r/variables.result
parentc8585f3283816dea04c28774ef87537521b6aa80 (diff)
downloadmariadb-git-f9e73c771684df31b89262cd4f18cc1e0f32849b.tar.gz
Post-merge fixes.
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index ee40d0a48fa..5394c3e1e45 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -360,7 +360,7 @@ set sql_log_bin=1;
set sql_log_off=1;
set sql_log_update=1;
Warnings:
-Note 1299 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
+Note 1302 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
set sql_low_priority_updates=1;
set sql_max_join_size=200;
select @@sql_max_join_size,@@max_join_size;