summaryrefslogtreecommitdiff
path: root/mysql-test/r/auto_increment.result
diff options
context:
space:
mode:
authorunknown <paul@ice.snake.net>2004-06-15 22:18:20 -0500
committerunknown <paul@ice.snake.net>2004-06-15 22:18:20 -0500
commit3165c7deda48c89f98f21204616376aa3eebfb3a (patch)
tree55d5ba340ed500c61110e640666ad2cde8553489 /mysql-test/r/auto_increment.result
parent1926d4ee3429f18ba7acd3e3b7436596fceb7f4b (diff)
downloadmariadb-git-3165c7deda48c89f98f21204616376aa3eebfb3a.tar.gz
Language/consistency edits to error messages
and affected test results.
Diffstat (limited to 'mysql-test/r/auto_increment.result')
-rw-r--r--mysql-test/r/auto_increment.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
index 66b24248cf9..97bf835a9d2 100644
--- a/mysql-test/r/auto_increment.result
+++ b/mysql-test/r/auto_increment.result
@@ -162,7 +162,7 @@ last_insert_id()
255
insert into t1 set i = null;
Warnings:
-Warning 1264 Data truncated, out of range for column 'i' at row 1
+Warning 1264 Data truncated; out of range for column 'i' at row 1
select last_insert_id();
last_insert_id()
255
@@ -213,7 +213,7 @@ a b
delete from t1 where a=0;
update t1 set a=NULL where b=6;
Warnings:
-Warning 1263 Data truncated, NULL supplied to NOT NULL column 'a' at row 4
+Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 4
update t1 set a=300 where b=7;
SET SQL_MODE='';
insert into t1(a,b)values(NULL,8);
@@ -255,7 +255,7 @@ a b
delete from t1 where a=0;
update t1 set a=NULL where b=13;
Warnings:
-Warning 1263 Data truncated, NULL supplied to NOT NULL column 'a' at row 9
+Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 9
update t1 set a=500 where b=14;
select * from t1 order by b;
a b