List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:August 19 2010 8:21am
Subject:bzr push into mysql-5.1-bugteam branch (mattias.jonsson:3484 to 3485)
View as plain text  
 3485 Mattias Jonsson	2010-08-19 [merge]
      merge

    added:
      mysql-test/include/not_blackhole.inc
      mysql-test/r/partition_not_blackhole.result
      mysql-test/std_data/parts/t1_blackhole.frm
      mysql-test/std_data/parts/t1_blackhole.par
      mysql-test/t/partition_not_blackhole-master.opt
      mysql-test/t/partition_not_blackhole.test
    modified:
      sql/ha_partition.cc
 3484 Li-Bing.Song@stripped	2010-08-18
      WL#5370 Keep forward-compatibility when changing
              'CREATE TABLE IF NOT EXISTS ... SELECT' behaviour
      BUG#55474, BUG#55499, BUG#55598, BUG#55616 and BUG#55777 are fixed
      in this patch too.
      
      This is the 5.1 part.
      It implements:
      - if the table exists, binlog two events: CREATE TABLE IF NOT EXISTS
        and INSERT ... SELECT
      
      - Insert nothing and binlog nothing on master if the existing object
        is a view. It only generates a warning that table already exists.
     @ mysql-test/r/trigger.result
        Ather this patch, 'CREATE TABLE IF NOT EXISTS ... SELECT' will not
        insert anything if the creating table already exists and is a view.
     @ sql/sql_class.h
        Declare virtual function write_to_binlog() for select_insert.
        It's used to binlog 'create select'
     @ sql/sql_insert.cc
        Implement write_to_binlog();
        Use write_to_binlog() instead of binlog_query() to binlog the statement.
        if the table exists, binlog two events: CREATE TABLE IF NOT EXISTS
        and INSERT ... SELECT
     @ sql/sql_lex.h
        Declare create_select_start_with_brace and create_select_pos.
        They are helpful for binlogging 'create select'
     @ sql/sql_parse.cc
        Do nothing on master if the existing object is a view.
     @ sql/sql_yacc.yy
        Record the relative postion of 'SELECT' in the 'CREATE ...SELECT' statement.
        Record whether there is a '(' before the 'SELECT' clause.

    added:
      mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
      mysql-test/suite/rpl/r/rpl_stm_create_if_not_exists.result
      mysql-test/suite/rpl/t/rpl_stm_create_if_not_exists.test
    modified:
      mysql-test/include/rpl_diff_tables.inc
      mysql-test/r/trigger.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_row_create_table.result
      mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_row_create_table.test
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_yacc.yy
=== added file 'mysql-test/include/not_blackhole.inc'
--- a/mysql-test/include/not_blackhole.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/not_blackhole.inc	2010-07-08 12:36:55 +0000
@@ -0,0 +1,5 @@
+if (`SELECT count(*) FROM information_schema.engines WHERE
+     (support = 'YES' OR support = 'DEFAULT') AND
+     engine = 'blackhole'`){
+  skip Blackhole engine enabled;
+}

=== added file 'mysql-test/r/partition_not_blackhole.result'
--- a/mysql-test/r/partition_not_blackhole.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/partition_not_blackhole.result	2010-07-08 12:36:55 +0000
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS t1;
+#
+# Bug#46086: crash when dropping a partitioned table and
+#            the original engine is disabled
+# Copy a .frm and .par file which was created with:
+# create table `t1` (`id` int primary key) engine=blackhole
+# partition by key () partitions 1;
+SHOW TABLES;
+Tables_in_test
+t1
+SHOW CREATE TABLE t1;
+ERROR HY000: Incorrect information in file: './test/t1.frm'
+DROP TABLE t1;
+ERROR 42S02: Unknown table 't1'
+t1.frm
+t1.par

=== added file 'mysql-test/std_data/parts/t1_blackhole.frm'
Binary files a/mysql-test/std_data/parts/t1_blackhole.frm	1970-01-01 00:00:00 +0000 and b/mysql-test/std_data/parts/t1_blackhole.frm	2010-07-08 12:36:55 +0000 differ

=== added file 'mysql-test/std_data/parts/t1_blackhole.par'
Binary files a/mysql-test/std_data/parts/t1_blackhole.par	1970-01-01 00:00:00 +0000 and b/mysql-test/std_data/parts/t1_blackhole.par	2010-07-08 12:36:55 +0000 differ

=== added file 'mysql-test/t/partition_not_blackhole-master.opt'
--- a/mysql-test/t/partition_not_blackhole-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/partition_not_blackhole-master.opt	2010-07-08 12:36:55 +0000
@@ -0,0 +1 @@
+--loose-skip-blackhole

=== added file 'mysql-test/t/partition_not_blackhole.test'
--- a/mysql-test/t/partition_not_blackhole.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/partition_not_blackhole.test	2010-07-08 12:36:55 +0000
@@ -0,0 +1,25 @@
+--source include/have_partition.inc
+--source include/not_blackhole.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+
+--echo #
+--echo # Bug#46086: crash when dropping a partitioned table and
+--echo #            the original engine is disabled
+--echo # Copy a .frm and .par file which was created with:
+--echo # create table `t1` (`id` int primary key) engine=blackhole
+--echo # partition by key () partitions 1;
+--copy_file std_data/parts/t1_blackhole.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/parts/t1_blackhole.par $MYSQLD_DATADIR/test/t1.par
+SHOW TABLES;
+--error ER_NOT_FORM_FILE
+SHOW CREATE TABLE t1;
+--error ER_BAD_TABLE_ERROR
+DROP TABLE t1;
+--list_files $MYSQLD_DATADIR/test t1*
+--remove_file $MYSQLD_DATADIR/test/t1.frm
+--remove_file $MYSQLD_DATADIR/test/t1.par

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2010-07-08 23:09:31 +0000
+++ b/sql/ha_partition.cc	2010-08-19 07:20:17 +0000
@@ -2403,9 +2403,14 @@ bool ha_partition::get_from_handler_file
   tot_partition_words= (m_tot_parts + 3) / 4;
   engine_array= (handlerton **) my_alloca(m_tot_parts * sizeof(handlerton*));
   for (i= 0; i < m_tot_parts; i++)
+  {
     engine_array[i]= ha_resolve_by_legacy_type(ha_thd(),
                                                (enum legacy_db_type)
-                                               *(uchar *) ((file_buffer) + 12 + i));
+                                               *(uchar *) ((file_buffer) +
+                                                           12 + i));
+    if (!engine_array[i])
+      goto err3;
+  }
   address_tot_name_len= file_buffer + 12 + 4 * tot_partition_words;
   tot_name_words= (uint4korr(address_tot_name_len) + 3) / 4;
   if (len_words != (tot_partition_words + tot_name_words + 4))


Attachment: [text/bzr-bundle] bzr/mattias.jonsson@oracle.com-20100819072017-61qqj353s1fx2d9u.bundle
Thread
bzr push into mysql-5.1-bugteam branch (mattias.jonsson:3484 to 3485) Mattias Jonsson19 Aug