summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_tables.result
diff options
context:
space:
mode:
authorunknown <bar@mysql.com/bar.intranet.mysql.r18.ru>2006-10-03 18:48:50 +0500
committerunknown <bar@mysql.com/bar.intranet.mysql.r18.ru>2006-10-03 18:48:50 +0500
commitdc4418edcfd468a8f612aa04045abfe8fe3f0e1e (patch)
treee989d57f2e8553580bc7dd1b5aa6cb66c703dfa7 /mysql-test/r/log_tables.result
parentfd5ea175a32281319f41e64132d4a60040e8e8b7 (diff)
downloadmariadb-git-dc4418edcfd468a8f612aa04045abfe8fe3f0e1e.tar.gz
Automerge fix: "Out of range value" error message adjusted to 5.1.
Diffstat (limited to 'mysql-test/r/log_tables.result')
-rw-r--r--mysql-test/r/log_tables.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 33f6c0c7af2..a9683cc7c56 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -112,8 +112,8 @@ slow_log CREATE TABLE `slow_log` (
alter table mysql.general_log engine=myisam;
alter table mysql.slow_log engine=myisam;
Warnings:
-Warning 1264 Out of range value for column 'last_insert_id' at row 0
-Warning 1264 Out of range value for column 'insert_id' at row 0
+Warning 1366 Incorrect integer value: '' for column 'last_insert_id' at row 0
+Warning 1366 Incorrect integer value: '' for column 'insert_id' at row 0
show create table mysql.general_log;
Table Create Table
general_log CREATE TABLE `general_log` (