summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2008-10-06 16:22:07 +0200
committerTatiana A. Nurnberg <azundris@mysql.com>2008-10-06 16:22:07 +0200
commit1ad9d23584d39d8de0510782594cab11e4865ad9 (patch)
tree503286e11632ec75f3e2395bdc945ecb2e7f9d7a /mysql-test/r/warnings.result
parent0b097b777768f6a01d02411f7b78e4fce9e55a45 (diff)
parentc1ed70d38459d3064474168c5f9389a4b29a1e73 (diff)
downloadmariadb-git-1ad9d23584d39d8de0510782594cab11e4865ad9.tar.gz
WL#4403 deprecate @log and @slow_log_queries variables
Adds --general-log-file, --slow-query-log-file command- line options to match system variables of the same names. Deprecates --log, --log-slow-queries command-line option and log, log_slow_queries system-variables for v7.0; they are superseded by general_log/general_log_file and slow_query_log/slow_query_log_file, respectively.
Diffstat (limited to 'mysql-test/r/warnings.result')
-rw-r--r--mysql-test/r/warnings.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index aad8a33ea61..090ac1340ea 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -167,7 +167,7 @@ max_error_count 10
drop table t1;
set table_type=MYISAM;
Warnings:
-Warning 1287 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead
+Warning 1287 The syntax '@@table_type' is deprecated and will be removed in MySQL 5.2. Please use '@@storage_engine' instead
create table t1 (a int);
insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
update t1 set a='abc';