bzr push into mysql-6.0-falcon-team branch (lars-erik.bjork:2901 to 2902) Bug#40158

[lars-erik.bjork]

 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

 2901 lars-erik.bjork@stripped	2008-11-05
      This is a commit for bug#40158 
      (Falcon assertion in StorageInterface::encodeRecord() line 2635 on CREATE TABLE)
      
      The nature of this bug is explained earlier. 
      
      This patch adds a bool argument to StorageTableShare::cleanupFieldName
      telling if the function should double the number of quotes or not. So
      far, StorageInterface::mapFields, is the only place this method is
      called, passing 'false'. All other places it is called passing
      'true'. This will ensure that the parser still gets the expected
      number of quotes and we are able to look up the fields correctly.
      
      I have also added a regression test for this bug, creating - and
      inserting into - a table with a field name containing quotes.
      
      
      added mysql-test/suite/falcon/r/falcon_bug_40158.result
      -------------------------------------------------------
      Result file for the regression test
      
      
      
      added mysql-test/suite/falcon/t/falcon_bug_40158.test
      -----------------------------------------------------
      * Regression test, testing differently quoted field names
      
      modified storage/falcon/StorageTableShare.cpp
      ---------------------------------------------
      * Modified StorageTableShare::cleanupFieldName to handle the new
        argument.
      
      modified storage/falcon/StorageTableShare.h
      -------------------------------------------
      * Added  new argument to the signature of
        StorageTableShare::cleanupFieldName
      * Made sure that all usages of StorageTableShare::cleanupFieldName
        passes the new argument
      
      modified storage/falcon/ha_falcon.cpp
      -------------------------------------
      * Made sure that all usages of StorageTableShare::cleanupFieldName
        passes the new argument
added:
  mysql-test/suite/falcon/r/falcon_bug_40158.result
  mysql-test/suite/falcon/t/falcon_bug_40158.test
modified:
  storage/falcon/StorageTableShare.cpp
  storage/falcon/StorageTableShare.h
  storage/falcon/ha_falcon.cpp

=== 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;