bzr commit into mysql-6.0-falcon-team branch (lars-erik.bjork:2902)

[lars-erik.bjork]

#At file:///home/lb200670/devel/mysql/nanna21/

 2902 lars-erik.bjork@stripped	2008-11-05
      Removing IGNORE keywords from INSERT statements in the testcase, after request from Hakan
modified:
  mysql-test/suite/falcon/r/falcon_bug_40130.result
  mysql-test/suite/falcon/t/falcon_bug_40130.test

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_40130.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_40130.result	2008-11-04 14:51:59 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_40130.result	2008-11-05 15:04:45 +0000
@@ -2,16 +2,16 @@
 SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS table10;
 CREATE TABLE table10 (`time_key` time, key (`time_key` ));
-INSERT IGNORE INTO table10 VALUES ('23:43:55');
-INSERT IGNORE INTO table10 VALUES ('03:18:59');
-INSERT IGNORE INTO table10 VALUES ('05:05:23');
-INSERT IGNORE INTO table10 VALUES ('09:20:40');
-INSERT IGNORE INTO table10 VALUES ('22:32:50');
-INSERT IGNORE INTO table10 VALUES ('07:41:31');
-INSERT IGNORE INTO table10 VALUES ('10:52:13');
-INSERT IGNORE INTO table10 VALUES ('12:40:54');
-INSERT IGNORE INTO table10 VALUES ('10:33:25');
-INSERT IGNORE INTO table10 VALUES ('22:11:46');
+INSERT INTO table10 VALUES ('23:43:55');
+INSERT INTO table10 VALUES ('03:18:59');
+INSERT INTO table10 VALUES ('05:05:23');
+INSERT INTO table10 VALUES ('09:20:40');
+INSERT INTO table10 VALUES ('22:32:50');
+INSERT INTO table10 VALUES ('07:41:31');
+INSERT INTO table10 VALUES ('10:52:13');
+INSERT INTO table10 VALUES ('12:40:54');
+INSERT INTO table10 VALUES ('10:33:25');
+INSERT INTO table10 VALUES ('22:11:46');
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 UPDATE table10 SET `time_key` = '09:11:23' WHERE `time_key` < '16:23:56';

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_40130.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_40130.test	2008-11-04 14:51:59 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_40130.test	2008-11-05 15:04:45 +0000
@@ -20,16 +20,16 @@ DROP TABLE IF EXISTS table10;
 # ----------------------------------------------------- #
 
 CREATE TABLE table10 (`time_key` time, key (`time_key` ));
-INSERT IGNORE INTO table10 VALUES ('23:43:55');
-INSERT IGNORE INTO table10 VALUES ('03:18:59');
-INSERT IGNORE INTO table10 VALUES ('05:05:23');
-INSERT IGNORE INTO table10 VALUES ('09:20:40');
-INSERT IGNORE INTO table10 VALUES ('22:32:50');
-INSERT IGNORE INTO table10 VALUES ('07:41:31');
-INSERT IGNORE INTO table10 VALUES ('10:52:13');
-INSERT IGNORE INTO table10 VALUES ('12:40:54');
-INSERT IGNORE INTO table10 VALUES ('10:33:25');
-INSERT IGNORE INTO table10 VALUES ('22:11:46');
+INSERT INTO table10 VALUES ('23:43:55');
+INSERT INTO table10 VALUES ('03:18:59');
+INSERT INTO table10 VALUES ('05:05:23');
+INSERT INTO table10 VALUES ('09:20:40');
+INSERT INTO table10 VALUES ('22:32:50');
+INSERT INTO table10 VALUES ('07:41:31');
+INSERT INTO table10 VALUES ('10:52:13');
+INSERT INTO table10 VALUES ('12:40:54');
+INSERT INTO table10 VALUES ('10:33:25');
+INSERT INTO table10 VALUES ('22:11:46');
 
 SET AUTOCOMMIT=OFF;