diff options
| author | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2006-09-18 15:52:16 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2006-09-18 15:52:16 -0700 |
| commit | 3d4b52ef28e87fa1867141ac12b66ea66370b68e (patch) | |
| tree | e477b851bcf7d5c73489da9a4d72c880cc7ea614 /mysql-test/r/strict_autoinc_1myisam.result | |
| parent | 5d249a711c92f807d85f2ae4b9ffae0695bdb53e (diff) | |
| download | mariadb-git-3d4b52ef28e87fa1867141ac12b66ea66370b68e.tar.gz | |
post merge fixes
BitKeeper/deleted/.del-strict_autoinc_4bdb.test:
Delete: mysql-test/t/strict_autoinc_4bdb.test
mysql-test/r/strict_autoinc_1myisam.result:
post merge fixes, error message was changed
mysql-test/r/strict_autoinc_2innodb.result:
post merge fixes, error message was changed
mysql-test/r/strict_autoinc_3heap.result:
post merge fixes, error message was changed
mysql-test/r/strict_autoinc_5ndb.result:
post merge fixes, error message was changed
Diffstat (limited to 'mysql-test/r/strict_autoinc_1myisam.result')
| -rw-r--r-- | mysql-test/r/strict_autoinc_1myisam.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/strict_autoinc_1myisam.result b/mysql-test/r/strict_autoinc_1myisam.result index 5d3c2698cda..dcda74a19cd 100644 --- a/mysql-test/r/strict_autoinc_1myisam.result +++ b/mysql-test/r/strict_autoinc_1myisam.result @@ -6,21 +6,21 @@ primary key (`a`) ) engine = 'MYISAM' ; set @@sql_mode='strict_all_tables'; insert into t1 values(1000); -ERROR 22003: Out of range value adjusted for column 'a' at row 1 +ERROR 22003: Out of range value for column 'a' at row 1 select count(*) from t1; count(*) 0 set auto_increment_increment=1000; set auto_increment_offset=700; insert into t1 values(null); -ERROR 22003: Out of range value adjusted for column 'a' at row 1 +ERROR 22003: Out of range value for column 'a' at row 1 select count(*) from t1; count(*) 0 set @@sql_mode=@org_mode; insert into t1 values(null); Warnings: -Warning 1264 Out of range value adjusted for column 'a' at row 1 +Warning 1264 Out of range value for column 'a' at row 1 select * from t1; a 127 |