bk commit into 5.1 tree (mskold:1.2639)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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-20 12:03:28+02:00, mskold@stripped +2 -0
  OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): Added new test cases

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-09-20 12:02:36+02:00, mskold@stripped +23 -0
    OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): Added new test cases

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@stripped, 2007-09-20 12:02:36+02:00, mskold@stripped +47 -0
    OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): Added new test cases

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-09-20 09:14:00 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2007-09-20 12:02:36 +02:00
@@ -54,6 +54,29 @@ SELECT * FROM t1 ORDER BY a;
 a	b	c
 1	1	NULL
 2	1	1
+CREATE ONLINE INDEX ci on t1(c);
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+id	name
+5	't1'
+truncate ndb_show_tables;
+CREATE OFFLINE INDEX ci2 on t1(c);
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+id	name
+set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
+truncate ndb_show_tables;
+DROP ONLINE INDEX ci on t1;
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+id	name
+8	't1'
+truncate ndb_show_tables;
+DROP OFFLINE INDEX ci2 on t1;
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+id	name
+truncate ndb_show_tables;
 DROP TABLE t1;
 CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ENGINE NDB;
 insert into t1 values (1,1);
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-09-20 09:14:00 +02:00
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2007-09-20 12:02:36 +02:00
@@ -86,6 +86,53 @@ truncate ndb_show_tables;
 
 INSERT INTO t1 values (2,1,1);
 SELECT * FROM t1 ORDER BY a;
+
+CREATE ONLINE INDEX ci on t1(c);
+
+--disable_warnings
+--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+--enable_warnings
+
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+truncate ndb_show_tables;
+ 
+CREATE OFFLINE INDEX ci2 on t1(c);
+
+--disable_warnings
+--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+--enable_warnings
+
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+set @t1_id = (select id from ndb_show_tables where name like '%t1%' and type like '%UserTable%');
+
+truncate ndb_show_tables;
+ 
+DROP ONLINE INDEX ci on t1;
+
+--disable_warnings
+--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+--enable_warnings
+
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+truncate ndb_show_tables;
+
+DROP OFFLINE INDEX ci2 on t1;
+
+--disable_warnings
+--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat
+LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
+--enable_warnings
+
+select id,name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
+
+truncate ndb_show_tables;
+
 DROP TABLE t1;
 
 #