bk commit into 5.1 tree (tomas:1.2644)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-10-14 14:44:23+02:00, tomas@stripped +2 -0
  correction of test

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-10-14 14:44:21+02:00,
tomas@stripped +1 -1
    correction of test

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@stripped, 2007-10-14 14:44:21+02:00,
tomas@stripped +1 -1
    correction of test

diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online.result
b/mysql-test/suite/ndb/r/ndb_alter_table_online.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2007-10-05 19:39:28 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2007-10-14 14:44:21 +02:00
@@ -74,7 +74,7 @@ Warning	1475	Converted FIXED field to DY
 
 ndb_show_tables completed.....
 
-select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%';
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and
type like '%UserTable%';
 id	name
 5	't1'
 truncate ndb_show_tables_results;
diff -Nrup a/mysql-test/suite/ndb/t/ndb_alter_table_online.test
b/mysql-test/suite/ndb/t/ndb_alter_table_online.test
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2007-10-05 19:39:39 +02:00
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2007-10-14 14:44:21 +02:00
@@ -83,7 +83,7 @@ truncate ndb_show_tables_results;
 ALTER TABLE t1 ADD c INT;
 
 --source include/ndb_show_tables_result.inc
-select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%';
+select id,name from ndb_show_tables_results where id = @t1_id and name like '%t1%' and
type like '%UserTable%';
 truncate ndb_show_tables_results;
 
 INSERT INTO t1 values (2,1,1);