From e7337563d70bf85e333ab3a6d65d2c3dbca9052a Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Tue, 30 Nov 2010 12:49:11 +0300 Subject: [PATCH] Make suite/optimizer_unfixed_bugs/t/bug43617.test work with --ps-protocol - dodge some bug in mysql-test-run that makes it to consider multiple statements as one (most likely it doesn't understand quotes in /* comments */) --- mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result | 6 ++---- mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result index 185e7a4faa4..562fe4785d5 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result @@ -37,10 +37,8 @@ c1 c2 c3 c4 2007-05-25 00:00:00 2007-05-25 00:00:00 2007-05-26 2007-05-26 00:00:00 2008-01-01 00:00:00 NULL 2008-01-02 2008-01-03 00:00:00 2009-01-29 11:11:27 2009-01-29 00:00:00 2009-01-29 2009-01-29 00:00:00 -INSERT IGNORE INTO t1(c1,c2) VALUES('20070525','20070527') /* doesn't throw error */; - -# Ignore unique constraint -INSERT IGNORE INTO t1(c1,c2) VALUES(19840905,830907) /* doesn't throw error */; +INSERT IGNORE INTO t1(c1,c2) VALUES('20070525','20070527') /* doesnt throw error */; +INSERT IGNORE INTO t1(c1,c2) VALUES(19840905,830907) /* doesnt throw error */; SELECT * FROM t1 WHERE c1='20070527' /* Returns no rows */; c1 c2 c3 c4 INSERT INTO t1(c1) VALUES('20070525') ON DUPLICATE KEY UPDATE c1='20070527'; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test index 103aa224d46..2b3b65577af 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test @@ -43,10 +43,10 @@ SELECT * FROM t1; # Test 'INSERT IGNORE' with the same rows that reported constraint violation above # Ignore pk constraint -INSERT IGNORE INTO t1(c1,c2) VALUES('20070525','20070527') /* doesn't throw error */; +INSERT IGNORE INTO t1(c1,c2) VALUES('20070525','20070527') /* doesnt throw error */; # Ignore unique constraint -INSERT IGNORE INTO t1(c1,c2) VALUES(19840905,830907) /* doesn't throw error */; +INSERT IGNORE INTO t1(c1,c2) VALUES(19840905,830907) /* doesnt throw error */; # Test 'INSERT ON DUPLICATE KEY UPDATE' with single column PK SELECT * FROM t1 WHERE c1='20070527' /* Returns no rows */;