bk commit into 5.1 tree (skozlov:1.2369)

[Serge Kozlov]

Below is the list of changes that have just been committed into a local
5.1 repository of ksm. When ksm 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, 2006-12-18 09:46:44+03:00, skozlov@stripped +2 -0
  fix for commit 1.2368

  mysql-test/r/ndb_alter_table.result@stripped, 2006-12-18 09:46:37+03:00, skozlov@stripped
+6 -6
    fix for commit 1.2368

  mysql-test/t/ndb_alter_table.test@stripped, 2006-12-18 09:46:37+03:00, skozlov@stripped +2
-2
    fix for commit 1.2368

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	skozlov
# Host:	virtop.localdomain
# Root:	/space/skozlov/5.1-new-ndb-addfunc

--- 1.40/mysql-test/r/ndb_alter_table.result	2006-12-18 09:46:56 +03:00
+++ 1.41/mysql-test/r/ndb_alter_table.result	2006-12-18 09:46:56 +03:00
@@ -386,16 +386,16 @@
 drop table t1;
 create table t1 (a int not null, b int not null) engine=ndb;
 insert into t1 values (1, 300), (2, 200), (3, 100);
-select * from t1;
+select * from t1 order by a;
 a	b
-3	100
-2	200
 1	300
+2	200
+3	100
 alter table t1 order by b;
-select * from t1;
+select * from t1 order by b;
 a	b
-1	300
-2	200
 3	100
+2	200
+1	300
 drop table t1;
 End of 5.1 tests

--- 1.36/mysql-test/t/ndb_alter_table.test	2006-12-18 09:46:56 +03:00
+++ 1.37/mysql-test/t/ndb_alter_table.test	2006-12-18 09:46:56 +03:00
@@ -431,9 +431,9 @@
 # alter .. order by
 create table t1 (a int not null, b int not null) engine=ndb;
 insert into t1 values (1, 300), (2, 200), (3, 100);
-select * from t1;
+select * from t1 order by a;
 alter table t1 order by b;
-select * from t1;
+select * from t1 order by b;
 drop table t1;
 
 --echo End of 5.1 tests