diff options
author | unknown <pem@mysql.com> | 2005-04-05 16:01:29 +0200 |
---|---|---|
committer | unknown <pem@mysql.com> | 2005-04-05 16:01:29 +0200 |
commit | 5ec69db745f951767857b39cde775438340e9d19 (patch) | |
tree | 69dc0a21fef6bc9fef67751ba4949742867a17bf /mysql-test | |
parent | 377bdbd33b2ce54550d45ddd799649f9535ad639 (diff) | |
parent | f3281e7b3381841cdab52d5f53c0ff813754e108 (diff) | |
download | mariadb-git-5ec69db745f951767857b39cde775438340e9d19.tar.gz |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/strict.result | 3 | ||||
-rw-r--r-- | mysql-test/t/strict.test | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index c4d860c5c77..99ea0d577da 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -1180,7 +1180,8 @@ Note 1305 PROCEDURE t1 does not exist create procedure t1 () begin declare exit handler for sqlexception select'a'; insert into t1 values (200); end;| call t1(); -ERROR 22003: Out of range value adjusted for column 'col1' at row 1 +a +a select * from t1; col1 drop procedure t1; diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index b5d234b7bea..6b7ce1a8f9e 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -1040,7 +1040,6 @@ delimiter |; create procedure t1 () begin declare exit handler for sqlexception select'a'; insert into t1 values (200); end;| delimiter ;| ---error 1264 call t1(); select * from t1; drop procedure t1; |