bzr push into mysql-5.1 branch (Martin.Skold:2781 to 2782) Bug#40081

[Martin Skold]

 2782 Martin Skold	2008-12-05
      Bug#40081 UPDATE....ORDER BY cannot find rows in cluster: Added test case
modified:
  mysql-test/suite/ndb/r/ndb_update.result
  mysql-test/suite/ndb/t/ndb_update.test

 2781 Jonas Oreland	2008-12-03 [merge]
      merge 62 to 63
modified:
  storage/ndb/test/run-test/daily-basic-tests.txt

=== modified file 'mysql-test/suite/ndb/r/ndb_update.result'
--- a/mysql-test/suite/ndb/r/ndb_update.result	2007-12-07 10:05:19 +0000
+++ b/mysql-test/suite/ndb/r/ndb_update.result	2008-12-05 10:59:32 +0000
@@ -93,4 +93,22 @@ a	b
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
+CREATE TABLE t1 (id INT NOT NULL AUTO_INCREMENT,
+mytext CHAR(30) DEFAULT NULL,
+PRIMARY KEY (`id`) ) ENGINE=ndbcluster;
+insert into t1 values(NULL,"hello"),(NULL,"world"),(NULL,"hello"),(NULL,"world");
+select * from t1 order by id;
+id	mytext
+1	hello
+2	world
+3	hello
+4	world
+update t1 set mytext = "goodbye" where mytext = "world" order by mytext;
+select * from t1 order by id;
+id	mytext
+1	hello
+2	goodbye
+3	hello
+4	goodbye
+DROP TABLE IF EXISTS t1;
 End of 5.1 tests

=== modified file 'mysql-test/suite/ndb/t/ndb_update.test'
--- a/mysql-test/suite/ndb/t/ndb_update.test	2007-11-29 10:29:35 +0000
+++ b/mysql-test/suite/ndb/t/ndb_update.test	2008-12-05 10:59:32 +0000
@@ -89,5 +89,18 @@ DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
 --enable_warnings
 
+# Bug#40081 UPDATE....ORDER BY cannot find rows in cluster
+CREATE TABLE t1 (id INT NOT NULL AUTO_INCREMENT,
+                 mytext CHAR(30) DEFAULT NULL,
+                 PRIMARY KEY (`id`) ) ENGINE=ndbcluster;
+insert into t1 values(NULL,"hello"),(NULL,"world"),(NULL,"hello"),(NULL,"world");
+select * from t1 order by id;
+update t1 set mytext = "goodbye" where mytext = "world" order by mytext;
+select * from t1 order by id;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
 --echo End of 5.1 tests