diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 19:24:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 19:24:20 +0200 |
| commit | 13dca0125a14726d2c3274f679aa002d0f7577a0 (patch) | |
| tree | fcfb6d72dcfb5af60bd8158b1641318295b9b609 /mysql-test/r/strict.result | |
| parent | d1fdb17bfb774e4e29c8a337b497128fd01a3473 (diff) | |
| download | mariadb-git-13dca0125a14726d2c3274f679aa002d0f7577a0.tar.gz | |
more post-merge fixes:
* update results
* don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables,
(bad for CREATE ... LIKE) instead imply it in myisam/aria
* restore HA_ERR_TABLE_DEF_CHANGED in archive
* increase the default number of rwlock classes in P_S to fit all our rwlocks
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 1321545798f..7cc29ae4ed6 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -1517,12 +1517,11 @@ Warning 1411 Incorrect datetime value: '0000' for function str_to_date SET sql_mode='NO_ZERO_IN_DATE'; SELECT STR_TO_DATE('2001','%Y'),CONCAT(STR_TO_DATE('2001','%Y')), STR_TO_DATE('2001','%Y')+1, STR_TO_DATE('0000','%Y')+1; STR_TO_DATE('2001','%Y') CONCAT(STR_TO_DATE('2001','%Y')) STR_TO_DATE('2001','%Y')+1 STR_TO_DATE('0000','%Y')+1 -NULL NULL NULL NULL +NULL NULL NULL 1 Warnings: Warning 1411 Incorrect datetime value: '2001' for function str_to_date Warning 1411 Incorrect datetime value: '2001' for function str_to_date Warning 1411 Incorrect datetime value: '2001' for function str_to_date -Warning 1411 Incorrect datetime value: '0000' for function str_to_date # # End of 5.6 tests # |