bk commit into 5.1 tree (tomas:1.2416)

[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
  1.2416 07/01/30 11:56:50 tomas@stripped +3 -0
  ndb - corrected merge error and testcase as a result of previous patch

  storage/ndb/tools/listTables.cpp
    1.32 07/01/30 11:56:21 tomas@stripped +3 -3
    corrected merge error and testcase as a result of previous patch

  mysql-test/t/ndb_alter_table.test
    1.38 07/01/30 11:56:21 tomas@stripped +4 -4
    corrected merge error and testcase as a result of previous patch

  mysql-test/r/ndb_alter_table.result
    1.42 07/01/30 11:56:21 tomas@stripped +4 -5
    corrected merge error and testcase as a result of previous patch

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco

--- 1.41/mysql-test/r/ndb_alter_table.result	2006-12-18 13:46:37 +07:00
+++ 1.42/mysql-test/r/ndb_alter_table.result	2007-01-30 11:56:21 +07:00
@@ -317,20 +317,19 @@
 ) engine=ndb;
 CREATE TEMPORARY TABLE ndb_show_tables (id INT, type VARCHAR(20), state VARCHAR(20), logging VARCHAR(20), _database VARCHAR(255), _schema VARCHAR(20), name VARCHAR(255));
 LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-set @t1_id = (select id from ndb_show_tables where name like '%t1%');
+set @t1_id = (select id from ndb_show_tables where name = 't1');
 truncate ndb_show_tables;
 alter table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL;
 LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%';
+select 'no_copy' from ndb_show_tables where id = @t1_id and name = 't1';
 no_copy
-set @t1_id = (select id from ndb_show_tables where name like '%t1%');
+set @t1_id = (select id from ndb_show_tables where name = 't1');
 truncate ndb_show_tables;
 create index i1 on t1(medium);
 alter table t1 add index i2(new_tiny);
 drop index i1 on t1;
 LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
-select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%';
-no_copy
+select 'no_copy' from ndb_show_tables where id = @t1_id and name = 't1';
 no_copy
 DROP TABLE t1, ndb_show_tables;
 create table t1 (a int primary key auto_increment, b int) engine=ndb;

--- 1.37/mysql-test/t/ndb_alter_table.test	2006-12-18 13:46:37 +07:00
+++ 1.38/mysql-test/t/ndb_alter_table.test	2007-01-30 11:56:21 +07:00
@@ -368,7 +368,7 @@
 --enable_warnings
 
 # Ndb doesn't support renaming attributes on-line
-set @t1_id = (select id from ndb_show_tables where name like '%t1%');
+set @t1_id = (select id from ndb_show_tables where name = 't1');
 truncate ndb_show_tables;
 
 alter table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL;
@@ -377,9 +377,9 @@
 LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
 --enable_warnings
 
-select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%';
+select 'no_copy' from ndb_show_tables where id = @t1_id and name = 't1';
 
-set @t1_id = (select id from ndb_show_tables where name like '%t1%');
+set @t1_id = (select id from ndb_show_tables where name = 't1');
 truncate ndb_show_tables;
 
 create index i1 on t1(medium);
@@ -392,7 +392,7 @@
 --exec rm $MYSQLTEST_VARDIR/master-data/test/tmp.dat || true
 --enable_warnings
 
-select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%';
+select 'no_copy' from ndb_show_tables where id = @t1_id and name = 't1';
 
 DROP TABLE t1, ndb_show_tables;
 

--- 1.31/storage/ndb/tools/listTables.cpp	2007-01-30 11:07:10 +07:00
+++ 1.32/storage/ndb/tools/listTables.cpp	2007-01-30 11:56:21 +07:00
@@ -141,6 +141,9 @@
 	case NdbDictionary::Object::Undofile:
 	  strcpy(type, "Undofile");
 	  break;
+        case NdbDictionary::Object::TableEvent:
+            strcpy(type, "TableEvent");
+            break;
         default:
 	  sprintf(type, "%d", (int)elt.type);
             break;
@@ -164,9 +167,6 @@
             break;
         case NdbDictionary::Object::StateBroken:
             strcpy(state, "Broken");
-            break;
-        case NdbDictionary::Object::TableEvent:
-            strcpy(type, "TableEvent");
             break;
         default:
             sprintf(state, "%d", (int)elt.state);