Commit 45fc29b7 authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 

into  dator5.(none):/home/pappa/push_clone


mysql-test/r/partition.result:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
parents 86d29fdf fb338e6c

mysql-test/r/ndb_partition_key.result

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ drop table t1; 
CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b))

ENGINE = NDB

PARTITION BY KEY (c);

ERROR HY000: A PRIMARY KEY need to include all fields in the partition function

ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function

CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b))

ENGINE = NDB

PARTITION BY KEY (a);

mysql-test/r/partition.result

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ ERROR HY000: Cannot create temporary table with partitions 
create table t1 (a int, b int) partition by list (a)

(partition p1 values in (1), partition p2 values in (2));

alter table t1 add primary key (b);

ERROR HY000: A PRIMARY KEY need to include all fields in the partition function

ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

sql/share/errmsg.txt

+1 −3
Original line number Diff line number Diff line
@@ -5702,9 +5702,7 @@ ER_BLOB_FIELD_IN_PART_FUNC_ERROR 
        ger "In der Partitionierungsfunktion sind BLOB-Spalten nicht erlaubt"

        swe "Ett BLOB-flt r inte tilltet i partitioneringsfunktioner"

ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF

        eng "A %-.64s need to include all fields in the partition function"

        ger "Ein %-.64s muss alle Spalten der Partitionierungsfunktion umfassen"

        swe "En %-.64s behver inkludera alla flt i partitioneringsfunktionen fr denna lagringsmotor"

        eng "A %-.64s must include all columns in the table's partitioning function"

ER_NO_PARTS_ERROR

        eng "Number of %-.64s = 0 is not an allowed value"

        ger "Eine Anzahl von %-.64s = 0 ist kein erlaubter Wert"