diff options
| author | Elena Stepanova <elenst@ubuntu11.home> | 2012-08-02 04:48:33 +0400 |
|---|---|---|
| committer | Elena Stepanova <elenst@ubuntu11.home> | 2012-08-02 04:48:33 +0400 |
| commit | b69e8d46b64e221ff046b15338118d7328425229 (patch) | |
| tree | 2e560c1d14b1062d20271ae4000a2fcf43f249a3 /mysql-test/suite/engines/iuds | |
| parent | f2b4305bd4e33168fbbb334fbd2ee2d12cecec4c (diff) | |
| download | mariadb-git-b69e8d46b64e221ff046b15338118d7328425229.tar.gz | |
MDEV-369: Mismatches in MySQL engines test suite
Post-merge fixes for mismatches that only affect 5.5 (but not 5.3)
Diffstat (limited to 'mysql-test/suite/engines/iuds')
| -rw-r--r-- | mysql-test/suite/engines/iuds/r/update_time.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/engines/iuds/r/update_time.result b/mysql-test/suite/engines/iuds/r/update_time.result index 3c651b45466..09a7cbf0c7f 100644 --- a/mysql-test/suite/engines/iuds/r/update_time.result +++ b/mysql-test/suite/engines/iuds/r/update_time.result @@ -1122,7 +1122,7 @@ c2 838:59:59 NULL UPDATE t4 SET c1=11:11:11 WHERE c2=NULL; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':11:11 WHERE c2=NULL' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':11:11 WHERE c2=NULL' at line 1 SELECT c1 FROM t4; c1 00:00:01 @@ -1262,7 +1262,7 @@ c1 c2 838:59:59 838:59:59 UPDATE t1 SET c1=c1+1,c2=c2-1 WHERE c1 IN (222222,8385955,1500000) ORDER BY c1; Warnings: -Warning 1264 Out of range value for column 'c2' at row 2 +Warning 1265 Data truncated for column 'c2' at row 2 SELECT * FROM t1; c1 c2 -12:12:12 12:12:12 |