bk commit into 5.1 tree (mattiasj:1.2568) BUG#30695

[mattiasj]

Below is the list of changes that have just been committed into a local
5.1 repository of mattiasj. When mattiasj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-11 13:34:41+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug #30695: An apostrophe ' in the comment of the ADD PARTITION
    causes the Server to crash.
  
  Crashed because of the comment in the partition clause was saved in
  the frm file without escaping, causing the server to crash when it was
  read/parsed again.
  
  Fixed by escaping quoted text in the partition info when writing it to
  the frm-file and added a check that it was able to parse the partition
  info before using it 
  
  NOTE: If the comment is written by an earlier version of the server,
  the corrupted frm-file is not fixed, but left corrupted, you have to
  manually drop the table and recreate it.

  mysql-test/r/partition.result@stripped, 2007-10-11 13:34:39+02:00,
mattiasj@mattiasj-laptop.(none) +16 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
     testresult

  mysql-test/t/partition.test@stripped, 2007-10-11 13:34:39+02:00,
mattiasj@mattiasj-laptop.(none) +26 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
      testcase

  sql/sql_partition.cc@stripped, 2007-10-11 13:34:39+02:00, mattiasj@mattiasj-laptop.(none)
+17 -4
    Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
      the Server to crash.
    
      Crashes when there is an non escaped apostrophe in the partition comment
    
      fixed by escaping quoted text before writing to the frm-file

  sql/table.cc@stripped, 2007-10-11 13:34:39+02:00, mattiasj@mattiasj-laptop.(none) +2 -1
    Bug #30695 An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash
    
    problem was using a null poiter without check -> crash.
    
    added a check that the previus call succeded

diff -Nrup a/mysql-test/r/partition.result b/mysql-test/r/partition.result
--- a/mysql-test/r/partition.result	2007-07-02 20:11:52 +02:00
+++ b/mysql-test/r/partition.result	2007-10-11 13:34:39 +02:00
@@ -1,4 +1,20 @@
 drop table if exists t1;
+CREATE TABLE t1 (
+d DATE NOT NULL
+)
+PARTITION BY RANGE( YEAR(d) ) (
+PARTITION p0 VALUES LESS THAN (1960),
+PARTITION p1 VALUES LESS THAN (1970),
+PARTITION p2 VALUES LESS THAN (1980),
+PARTITION p3 VALUES LESS THAN (1990)
+);
+ALTER TABLE t1 ADD PARTITION (
+PARTITION `p5` VALUES LESS THAN (2010)
+COMMENT 'APSTART \' APEND'
+);
+SELECT * FROM t1 LIMIT 1;
+d
+DROP TABLE t1;
 create table t1 (a int)
 partition by key(a)
 partitions 0.2+e1;
diff -Nrup a/mysql-test/t/partition.test b/mysql-test/t/partition.test
--- a/mysql-test/t/partition.test	2007-07-02 20:11:52 +02:00
+++ b/mysql-test/t/partition.test	2007-10-11 13:34:39 +02:00
@@ -10,6 +10,32 @@ drop table if exists t1;
 --enable_warnings
 
 #
+# Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes the Server to
crash.
+#
+# To verify the fix for crashing (on unix-type OS)
+# uncomment the exec and error rows!
+
+CREATE TABLE t1 (
+    d DATE NOT NULL
+)
+PARTITION BY RANGE( YEAR(d) ) (
+    PARTITION p0 VALUES LESS THAN (1960),
+    PARTITION p1 VALUES LESS THAN (1970),
+    PARTITION p2 VALUES LESS THAN (1980),
+    PARTITION p3 VALUES LESS THAN (1990)
+);
+
+ALTER TABLE t1 ADD PARTITION (
+PARTITION `p5` VALUES LESS THAN (2010)
+COMMENT 'APSTART \' APEND'
+);
+#--exec sed 's/APSTART \\/APSTART  /' var/master-data/test/t1.frm > tmpt1.frm
&& mv tmpt1.frm var/master-data/test/t1.frm
+#--error 1064
+SELECT * FROM t1 LIMIT 1;
+
+DROP TABLE t1;
+
+#
 # Bug 15890: Strange number of partitions accepted
 #
 -- error 1064
diff -Nrup a/sql/sql_partition.cc b/sql/sql_partition.cc
--- a/sql/sql_partition.cc	2007-09-14 12:17:40 +02:00
+++ b/sql/sql_partition.cc	2007-10-11 13:34:39 +02:00
@@ -1849,6 +1849,20 @@ static int add_uint(File fptr, ulonglong
   return add_string(fptr, buff);
 }
 
+/*
+   Must escape strings in partitioned tables frm-files,
+   parsing it later with mysql_unpack_partition will fail otherwise.
+*/
+static int add_quoted_string(File fptr, const char *quotestr)
+{
+  String orgstr(quotestr, system_charset_info);
+  String escapedstr;
+  int err= add_string(fptr, "'");
+  err+= append_escaped(&escapedstr, &orgstr);
+  err+= add_string(fptr, escapedstr.c_ptr());
+  return err + add_string(fptr, "'");
+}
+
 static int add_keyword_string(File fptr, const char *keyword,
                               bool should_use_quotes, 
                               const char *keystr)
@@ -1859,10 +1873,9 @@ static int add_keyword_string(File fptr,
   err+= add_equal(fptr);
   err+= add_space(fptr);
   if (should_use_quotes)
-    err+= add_string(fptr, "'");
-  err+= add_string(fptr, keystr);
-  if (should_use_quotes)
-    err+= add_string(fptr, "'");
+    err+= add_quoted_string(fptr, keystr);
+  else
+    err+= add_string(fptr, keystr);
   return err + add_space(fptr);
 }
 
diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2007-08-31 11:55:53 +02:00
+++ b/sql/table.cc	2007-10-11 13:34:39 +02:00
@@ -1782,7 +1782,8 @@ int open_table_from_share(THD *thd, TABL
                                 outparam, is_create_table,
                                 share->default_part_db_type,
                                 &work_part_info_used);
-    outparam->part_info->is_auto_partitioned= share->auto_partitioned;
+    if (!tmp)
+      outparam->part_info->is_auto_partitioned= share->auto_partitioned;
     DBUG_PRINT("info", ("autopartitioned: %u", share->auto_partitioned));
     /* we should perform the fix_partition_func in either local or
        caller's arena depending on work_part_info_used value