diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 10:40:45 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 10:40:45 +0400 |
| commit | 0e8b04d98096ccf1ddfd6f5a3c21134d257e0b66 (patch) | |
| tree | e8d5fa15c5dba6c81caa8712835a6f0d7acc1675 /mysql-test | |
| parent | 4a8c61f372c808cd14e9ec2ce0b063f58345e8ba (diff) | |
| download | mariadb-git-0e8b04d98096ccf1ddfd6f5a3c21134d257e0b66.tar.gz | |
More test result updates:
- strict.test updated (changed back) after the cset with "Fix
type_newdecimal.test ..." two csets ago
- row-checksum.test changed the code from HA_WRONG_CREATE_OPTION
to ER_ILLEGAL_HA_CREATE_OPTION, like mysql-5.6 did
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/row-checksum.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/strict.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/row-checksum.result b/mysql-test/r/row-checksum.result index 9e58d6fa96e..fb8a1260a1d 100644 --- a/mysql-test/r/row-checksum.result +++ b/mysql-test/r/row-checksum.result @@ -73,7 +73,7 @@ test.t1 3885665021 drop table if exists t1; create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=fixed; Warnings: -Warning 140 InnoDB: assuming ROW_FORMAT=COMPACT. +Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT. insert into t1 values(null, null), (1, "hello"); checksum table t1; Table Checksum diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 3861f12d5ed..c9bc1e87754 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -793,7 +793,7 @@ INSERT INTO t1 (col1) VALUES ('1a'); ERROR 22007: Incorrect decimal value: '1a' for column 'col1' at row 1 INSERT IGNORE INTO t1 (col1) VALUES ('2a'); Warnings: -Warning 1265 Data truncated for column 'col1' at row 1 +Note 1265 Data truncated for column 'col1' at row 1 INSERT IGNORE INTO t1 values (1/0); Warnings: Warning 1365 Division by 0 |