summaryrefslogtreecommitdiff
path: root/mysql-test/r/auto_increment.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-02-16 10:03:25 +0200
committermonty@mysql.com <>2004-02-16 10:03:25 +0200
commitf43093ec0e1ca391f0cdde589418d19c4b82241a (patch)
tree44dc172194086edaeef7da9c9ed059171579a886 /mysql-test/r/auto_increment.result
parentce145789092b294a562f565671478ae2bf51d14a (diff)
downloadmariadb-git-f43093ec0e1ca391f0cdde589418d19c4b82241a.tar.gz
After merge fixes
Added more DBUG statements Ensure that we are comparing end space with BINARY strings Use 'any_db' instead of '' to mean any database. (For HANDLER command) Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
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 7a7faf0db9a..8f77b306d3e 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 1263 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 1262 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 1262 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