bzr commit into mysql-6.0 branch (mattiasj:2693) Bug#36001

[Mattias Jonsson]

#At file:///Users/mattiasj/clones/bzrroot/b36001-60-bugteam/

 2693 Mattias Jonsson	2008-07-03
      Bug#36001 Partitions: spelling and using some error messages
      
      Changed error message to show that it is partitioning
      that does not support foreign keys yet.
      
      Changed spelling from British english to American english.
modified:
  mysql-test/r/partition.result
  mysql-test/r/partition_mgm_err.result
  mysql-test/t/partition.test
  sql/share/errmsg.txt
  sql/sql_table.cc

per-file messages:
  mysql-test/r/partition.result
    Bug#36001 Partitions: spelling and using some error messages
    
    Added test for verifying error message change.
  mysql-test/r/partition_mgm_err.result
    Bug#36001 Partitions: spelling and using some error messages
    
    Changed spelling from British english to American english.
  mysql-test/t/partition.test
    Bug#36001 Partitions: spelling and using some error messages
    
    Added test for verifying error message change.
  sql/share/errmsg.txt
    Bug#36001 Partitions: spelling and using some error messages
    
    Changed spelling from British english to American english.
    Changed condition to clause in error message.
  sql/sql_table.cc
    Bug#36001 Partitions: spelling and using some error messages
    
    Changed error message to show that it is partitioning
    that does not support foreign keys yet.
=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2008-06-18 04:01:25 +0000
+++ b/mysql-test/r/partition.result	2008-07-03 19:12:02 +0000
@@ -1,4 +1,8 @@
 drop table if exists t1, t2;
+CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
+ENGINE=MyISAM
+PARTITION BY HASH (a);
+ERROR HY000: Foreign key clause is not yet supported in conjunction with partitioning
 CREATE TABLE t1 (
 a INT NOT NULL,   
 b MEDIUMINT NOT NULL,   

=== modified file 'mysql-test/r/partition_mgm_err.result'
--- a/mysql-test/r/partition_mgm_err.result	2006-06-09 14:20:23 +0000
+++ b/mysql-test/r/partition_mgm_err.result	2008-07-03 19:12:02 +0000
@@ -25,13 +25,13 @@ ALTER TABLE t1 DROP PARTITION x10, x1, x
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 REORGANIZE PARTITION x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10 INTO
 (PARTITION x11 VALUES LESS THAN (22));
-ERROR HY000: More partitions to reorganise than there are partitions
+ERROR HY000: More partitions to reorganize than there are partitions
 ALTER TABLE t1 REORGANIZE PARTITION x0,x1,x2 INTO
 (PARTITION x3 VALUES LESS THAN (6));
 ERROR HY000: Duplicate partition name x3
 ALTER TABLE t1 REORGANIZE PARTITION x0, x2 INTO
 (PARTITION x11 VALUES LESS THAN (2));
-ERROR HY000: When reorganising a set of partitions they must be in consecutive order
+ERROR HY000: When reorganizing a set of partitions they must be in consecutive order
 ALTER TABLE t1 REORGANIZE PARTITION x0, x1, x1 INTO
 (PARTITION x11 VALUES LESS THAN (4));
 ERROR HY000: Error in list of partitions to REORGANIZE

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2008-06-18 04:01:25 +0000
+++ b/mysql-test/t/partition.test	2008-07-03 19:12:02 +0000
@@ -15,6 +15,15 @@ drop table if exists t1, t2;
 --enable_warnings
 
 #
+# Bug#36001: Partitions: spelling and using some error messages
+#
+
+--error ER_FOREIGN_KEY_ON_PARTITIONED
+CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
+ENGINE=MyISAM
+PARTITION BY HASH (a);
+
+#
 # Bug35931: Index search may return duplicates
 #
 CREATE TABLE t1 (

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2008-06-03 11:49:53 +0000
+++ b/sql/share/errmsg.txt	2008-07-03 19:12:02 +0000
@@ -5775,9 +5775,9 @@ ER_PARTITION_MGMT_ON_NONPARTITIONED
         ger "Partitionsverwaltung einer nicht partitionierten Tabelle ist nicht m�ch"
         swe "Partitioneringskommando p�n opartitionerad tabell �inte m�gt"
 ER_FOREIGN_KEY_ON_PARTITIONED
-        eng "Foreign key condition is not yet supported in conjunction with partitioning"
+        eng "Foreign key clause is not yet supported in conjunction with partitioning"
         ger "Fremdschl�Beschr�ungen sind im Zusammenhang mit Partitionierung nicht zul�ig"
-        swe "Foreign key villkor �inte �u implementerad i kombination med partitionering"
+        swe "Foreign key klausul �inte �u implementerad i kombination med partitionering"
 ER_DROP_PARTITION_NON_EXISTENT
         eng "Error in list of partitions to %-.64s"
         ger "Fehler in der Partitionsliste bei %-.64s"
@@ -5791,13 +5791,13 @@ ER_COALESCE_ONLY_ON_HASH_PARTITION
         ger "COALESCE PARTITION kann nur auf HASH- oder KEY-Partitionen benutzt werden"
         swe "COALESCE PARTITION kan bara anv�as p�ASH/KEY partitioner"
 ER_REORG_HASH_ONLY_ON_SAME_NO
-        eng "REORGANISE PARTITION can only be used to reorganise partitions not to change their numbers"
+        eng "REORGANIZE PARTITION can only be used to reorganize partitions not to change their numbers"
         ger "REORGANIZE PARTITION kann nur zur Reorganisation von Partitionen verwendet werden, nicht, um ihre Nummern zu �ern"
-        swe "REORGANISE PARTITION kan bara anv�as f�tt omorganisera partitioner, inte f�tt �ra deras antal"
+        swe "REORGANIZE PARTITION kan bara anv�as f�tt omorganisera partitioner, inte f�tt �ra deras antal"
 ER_REORG_NO_PARAM_ERROR
-        eng "REORGANISE PARTITION without parameters can only be used on auto-partitioned tables using HASH PARTITIONs"
+        eng "REORGANIZE PARTITION without parameters can only be used on auto-partitioned tables using HASH PARTITIONs"
         ger "REORGANIZE PARTITION ohne Parameter kann nur f�o-partitionierte Tabellen verwendet werden, die HASH-Partitionierung benutzen"
-        swe "REORGANISE PARTITION utan parametrar kan bara anv�as p�uto-partitionerade tabeller som anv�er HASH partitionering"
+        swe "REORGANIZE PARTITION utan parametrar kan bara anv�as p�uto-partitionerade tabeller som anv�er HASH partitionering"
 ER_ONLY_ON_RANGE_LIST_PARTITION
         eng "%-.64s PARTITION can only be used on RANGE/LIST partitions"
         ger "%-.64s PARTITION kann nur f�GE- oder LIST-Partitionen verwendet werden"
@@ -5815,7 +5815,7 @@ ER_COALESCE_PARTITION_NO_PARTITION
         ger "Zumindest eine Partition muss mit COALESCE PARTITION zusammengef�rden"
         swe "�minstone en partition m�e sl�ihop vid COALESCE PARTITION"
 ER_REORG_PARTITION_NOT_EXIST
-        eng "More partitions to reorganise than there are partitions"
+        eng "More partitions to reorganize than there are partitions"
         ger "Es wurde versucht, mehr Partitionen als vorhanden zu reorganisieren"
         swe "Fler partitioner att reorganisera �det finns partitioner"
 ER_SAME_NAME_PARTITION
@@ -5827,7 +5827,7 @@ ER_NO_BINLOG_ERROR
         ger "Es es nicht erlaubt, bei diesem Befehl binlog abzuschalten"
         swe "Det �inte till�t att st�a av binlog p�etta kommando"
 ER_CONSECUTIVE_REORG_PARTITIONS
-        eng "When reorganising a set of partitions they must be in consecutive order"
+        eng "When reorganizing a set of partitions they must be in consecutive order"
         ger "Bei der Reorganisation eines Satzes von Partitionen m�diese in geordneter Reihenfolge vorliegen"
         swe "N�ett antal partitioner omorganiseras m�e de vara i konsekutiv ordning"
 ER_REORG_OUTSIDE_RANGE

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-06-25 11:13:03 +0000
+++ b/sql/sql_table.cc	2008-07-03 19:12:02 +0000
@@ -3318,7 +3318,7 @@ bool mysql_create_table_no_lock(THD *thd
       if (key->type == Key::FOREIGN_KEY &&
           !part_info->is_auto_partitioned)
       {
-        my_error(ER_CANNOT_ADD_FOREIGN, MYF(0));
+        my_error(ER_FOREIGN_KEY_ON_PARTITIONED, MYF(0));
         goto err;
       }
     }