List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:October 7 2011 2:21pm
Subject:bzr push into mysql-trunk branch (mattias.jonsson:3479 to 3480) Bug#56590
Bug#11763825
View as plain text  
 3480 Mattias Jonsson	2011-10-07
      bug#11763825/Bug#56590: PARTITIONS: FULLTEXT SEARCHES FAIL
      
      Confusing error message:
      ERROR 1214 (HY000): The used table type doesn't support FULLTEXT
      indexes
      
      Fixed by adding a new error for this:
      ERROR HY000: FULLTEXT index is not supported for partitioned tables.

    modified:
      mysql-test/r/partition_myisam.result
      mysql-test/t/partition_myisam.test
      sql/share/errmsg-utf8.txt
      sql/sql_table.cc
 3479 Andrei Elkin	2011-10-07
      Bug#12960284 - RPL.RPL_PARALLEL_SWITCH_SEQUENTIAL TEST FAILED IN VALGRIND RUN ON
      
      There was a timeout at the very end of the test.
      Details of printout upon the failure does not reveal any issue with the text nor
      the server code. It's just slow and is used to pass on the same valgrind but the run
      time is apparently big (over 1 000 000 msec) -
        rpl.rpl_parallel_switch_sequential 'mix' w2 [ pass ]  1068101
      
      So it's fixed with decreasing load size when the test runs on valgrind.
     @ mysql-test/collections/default.experimental
        correcting ref:s to bugs to accord them with the format.
     @ mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test
        decreasing load size when the test runs on valgrind.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test
=== modified file 'mysql-test/r/partition_myisam.result'
--- a/mysql-test/r/partition_myisam.result	2011-10-06 09:50:40 +0000
+++ b/mysql-test/r/partition_myisam.result	2011-10-07 14:20:21 +0000
@@ -1,5 +1,25 @@
 DROP TABLE IF EXISTS t1, t2;
 #
+# Bug#11763825/56590: PARTITIONS: FULLTEXT SEARCHES FAIL
+# (bad/confusing error message)
+CREATE TABLE t1
+(a INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+b VARCHAR(200),
+c TEXT)
+ENGINE=MyISAM
+PARTITION BY HASH(a) PARTITIONS 1;
+CREATE FULLTEXT INDEX msg ON t1 (b, c);
+ERROR HY000: FULLTEXT index is not supported for partitioned tables.
+DROP TABLE t1;
+CREATE TABLE t1
+(a INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+b VARCHAR(200),
+c TEXT,
+FULLTEXT (b, c))
+ENGINE=MyISAM
+PARTITION BY HASH(a) PARTITIONS 1;
+ERROR HY000: FULLTEXT index is not supported for partitioned tables.
+#
 # BUG#11933226 - 60681: CHECKSUM TABLE RETURNS 0 FOR PARTITIONED TABLE
 #
 CREATE TABLE t1 (

=== modified file 'mysql-test/t/partition_myisam.test'
--- a/mysql-test/t/partition_myisam.test	2011-10-06 09:50:40 +0000
+++ b/mysql-test/t/partition_myisam.test	2011-10-07 14:20:21 +0000
@@ -10,6 +10,27 @@ DROP TABLE IF EXISTS t1, t2;
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
 --echo #
+--echo # Bug#11763825/56590: PARTITIONS: FULLTEXT SEARCHES FAIL
+--echo # (bad/confusing error message)
+CREATE TABLE t1
+(a INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ b VARCHAR(200),
+ c TEXT)
+ENGINE=MyISAM
+PARTITION BY HASH(a) PARTITIONS 1;
+--error ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING
+CREATE FULLTEXT INDEX msg ON t1 (b, c);
+DROP TABLE t1;
+--error ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING
+CREATE TABLE t1
+(a INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ b VARCHAR(200),
+ c TEXT,
+ FULLTEXT (b, c))
+ENGINE=MyISAM
+PARTITION BY HASH(a) PARTITIONS 1;
+
+--echo #
 --echo # BUG#11933226 - 60681: CHECKSUM TABLE RETURNS 0 FOR PARTITIONED TABLE
 --echo #
 CREATE TABLE t1 (

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-09-29 12:55:06 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-10-07 14:20:21 +0000
@@ -6592,3 +6592,7 @@ ER_PLUGIN_NO_UNINSTALL
 
 ER_PLUGIN_NO_INSTALL
   eng "Plugin '%s' is marked as not dynamically installable. You have to stop the server to install it."
+
+ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING
+  eng "FULLTEXT index is not supported for partitioned tables."
+  swe "FULLTEXT index st├╢ds ej f├╢r partitionerade tabeller."

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-08-30 04:28:18 +0000
+++ b/sql/sql_table.cc	2011-10-07 14:20:21 +0000
@@ -3457,6 +3457,15 @@ mysql_prepare_create_table(THD *thd, HA_
     {
       if (!(file->ha_table_flags() & HA_CAN_FULLTEXT))
       {
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+        if (file->ht == partition_hton)
+        {
+          my_message(ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING,
+                     ER(ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING),
+                     MYF(0));
+          DBUG_RETURN(TRUE);
+        }
+#endif
 	my_message(ER_TABLE_CANT_HANDLE_FT, ER(ER_TABLE_CANT_HANDLE_FT),
                    MYF(0));
 	DBUG_RETURN(TRUE);

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (mattias.jonsson:3479 to 3480) Bug#56590Bug#11763825Mattias Jonsson7 Oct