From 13dca0125a14726d2c3274f679aa002d0f7577a0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 21 Jul 2013 19:24:20 +0200 Subject: 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 --- mysql-test/r/strict.result | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mysql-test/r/strict.result') 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 # -- cgit v1.2.1