bzr commit into mysql-5.1 branch (jonas:2700)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/

 2700 Jonas Oreland	2008-09-19 [merge]
      merge
modified:
  mysql-test/suite/ndb/r/ndb_insert.result
  mysql-test/suite/ndb/t/ndb_insert.test

=== modified file 'mysql-test/suite/ndb/r/ndb_insert.result'
--- a/mysql-test/suite/ndb/r/ndb_insert.result	2007-11-23 12:25:00 +0000
+++ b/mysql-test/suite/ndb/r/ndb_insert.result	2008-09-19 10:56:53 +0000
@@ -427,8 +427,8 @@ COUNT(*)
 INSERT INTO t1 VALUES (1,1,1);
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 INSERT INTO t1 VALUES 
-(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
-(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
+(-1,-1,-1),(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
+(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),(9999,9999,9999);
 ERROR 23000: Can't write; duplicate key in table 't1'
 select count(*) from t1;
 count(*)

=== modified file 'mysql-test/suite/ndb/t/ndb_insert.test'
--- a/mysql-test/suite/ndb/t/ndb_insert.test	2007-11-29 10:29:35 +0000
+++ b/mysql-test/suite/ndb/t/ndb_insert.test	2008-09-19 10:56:53 +0000
@@ -449,8 +449,8 @@ INSERT INTO t1 VALUES (1,1,1);
 
 --error 1022
 INSERT INTO t1 VALUES 
-(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
-(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
+(-1,-1,-1),(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
+(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),(9999,9999,9999);
 
 select count(*) from t1;