[Commits] Rev 2870: Make suite/optimizer_unfixed_bugs/t/bug43617.test work with --ps-protocol in file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

Sergey Petrunya psergey at askmonty.org
Tue Nov 30 11:49:12 EET 2010


At file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

------------------------------------------------------------
revno: 2870
revision-id: psergey at askmonty.org-20101130094911-dtkfeve7zekj2pe4
parent: psergey at askmonty.org-20101129191316-4vqhmpo6tty0rsx7
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: maria-5.3-mwl128-dsmrr-cpk
timestamp: Tue 2010-11-30 12:49:11 +0300
message:
  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 */)
=== modified file 'mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result'
--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result	2010-11-29 16:47:32 +0000
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result	2010-11-30 09:49:11 +0000
@@ -37,10 +37,8 @@
 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';

=== modified file 'mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test'
--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test	2010-11-29 16:47:32 +0000
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test	2010-11-30 09:49:11 +0000
@@ -43,10 +43,10 @@
 
 # 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 */;



More information about the commits mailing list