bk commit into 5.1 tree (stewart:1.2557) BUG#28158

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-07 19:07:45+10:00, stewart@stripped +2 -0
  [PATCH] Add test for BUG#28158 (unique key violation gives wrong error message) using NDB engine
  
  Index: ndb-work/mysql-test/r/ndb_bug28158_unique_key_err.result
  ===================================================================

  mysql-test/r/ndb_bug28158_unique_key_err.result@stripped, 2007-05-08 15:03:41+10:00, stewart@stripped +11 -0
    Add test for BUG#28158 (unique key violation gives wrong error message) using NDB engine

  mysql-test/r/ndb_bug28158_unique_key_err.result@stripped, 2007-05-08 15:03:41+10:00, stewart@stripped +0 -0

  mysql-test/t/ndb_bug28158_unique_key_err.test@stripped, 2007-05-08 15:01:27+10:00, stewart@stripped +22 -0
    Add test for BUG#28158 (unique key violation gives wrong error message) using NDB engine

  mysql-test/t/ndb_bug28158_unique_key_err.test@stripped, 2007-05-08 15:01:27+10:00, stewart@stripped +0 -0

diff -Nrup a/mysql-test/r/ndb_bug28158_unique_key_err.result b/mysql-test/r/ndb_bug28158_unique_key_err.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/ndb_bug28158_unique_key_err.result	2007-05-08 15:03:41 +10:00
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+drop database if exists mysqltest;
+CREATE TABLE t2 (a int, b int, UNIQUE KEY (a, b)) Engine NDB;
+INSERT INTO t2 VALUES (1,2);
+INSERT INTO t2 VALUES (2,2);
+UPDATE t2 SET a = 1;
+ERROR 23000: Duplicate entry '1-2' for key 'a'
+UPDATE t2 SET a = 1 ORDER BY a;
+ERROR 23000: Duplicate entry '1-2' for key 'a'
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+drop database if exists mysqltest;
diff -Nrup a/mysql-test/t/ndb_bug28158_unique_key_err.test b/mysql-test/t/ndb_bug28158_unique_key_err.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/ndb_bug28158_unique_key_err.test	2007-05-08 15:01:27 +10:00
@@ -0,0 +1,22 @@
+-- source include/have_ndb.inc
+-- source include/not_embedded.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+drop database if exists mysqltest;
+--enable_warnings
+
+CREATE TABLE t2 (a int, b int, UNIQUE KEY (a, b)) Engine NDB;
+INSERT INTO t2 VALUES (1,2);
+INSERT INTO t2 VALUES (2,2);
+
+--error 1582
+UPDATE t2 SET a = 1;
+
+--error 1582
+UPDATE t2 SET a = 1 ORDER BY a;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+drop database if exists mysqltest;
+--enable_warnings