bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3172)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped0frqq

 3172 Magnus Blåudd	2011-02-04
      ndb
       - the duplicate partition field error got a proper error number and related error
        message in 5.5, update test and result file to use the new error code and message

    modified:
      mysql-test/suite/ndb/r/ndb_partition_error.result
      mysql-test/suite/ndb/t/ndb_partition_error.test
=== modified file 'mysql-test/suite/ndb/r/ndb_partition_error.result'
--- a/mysql-test/suite/ndb/r/ndb_partition_error.result	2011-01-21 14:27:30 +0000
+++ b/mysql-test/suite/ndb/r/ndb_partition_error.result	2011-02-04 10:10:31 +0000
@@ -46,4 +46,4 @@ insert into t1 values (NULL,1,1);
 Got one of the listed errors
 drop table t1;
 create table `t1` (`a` int, b int, primary key (a,b)) engine=ndb partition by key(`a`,`b`,`a`);
-ERROR HY000: Field in list of fields for partition function not found in table
+ERROR HY000: Duplicate partition field name 'a'

=== modified file 'mysql-test/suite/ndb/t/ndb_partition_error.test'
--- a/mysql-test/suite/ndb/t/ndb_partition_error.test	2011-01-21 09:14:41 +0000
+++ b/mysql-test/suite/ndb/t/ndb_partition_error.test	2011-02-04 10:10:31 +0000
@@ -77,6 +77,6 @@ drop table t1;
 # test bug#53354 - crash when creating partitioned table with multiple columns in the partition key
 #
 
---error ER_FIELD_NOT_FOUND_PART_ERROR
+--error ER_SAME_NAME_PARTITION_FIELD
 create table `t1` (`a` int, b int, primary key (a,b)) engine=ndb partition by key(`a`,`b`,`a`);
 

Attachment: [text/bzr-bundle] bzr/[e-mail]