bk commit into 5.1 tree (mskold:1.2637) BUG#31097

[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 09:14:25+02:00, mskold@stripped +2 -0
  Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm:
fixed testcase so result is time independent

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-09-20 09:14:00+02:00,
mskold@stripped +2 -2
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm:
fixed testcase so result is time independent

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@stripped, 2007-09-20 09:14:00+02:00,
mskold@stripped +1 -1
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm:
fixed testcase so result is time independent

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-19 17:52:48 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2007-09-20 09:14:00 +02:00
@@ -166,11 +166,11 @@ LOAD DATA INFILE 'tmp.dat' INTO TABLE nd
 select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like
'%UserTable%';
 name
 truncate ndb_show_tables;
-INSERT INTO t1 values (2,1,NULL);
+INSERT INTO t1 values (2,2,'2007-09-19 18:46:02');
 SELECT * FROM t1 ORDER BY a;
 a	b	c
 1	1	0000-00-00 00:00:00
-2	1	2007-09-19 18:46:02
[phone]:46:02
 DROP TABLE t1;
 CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ROW_FORMAT=DYNAMIC 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-19 17:52:48 +02:00
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test	2007-09-20 09:14:00 +02:00
@@ -241,7 +241,7 @@ select name from ndb_show_tables where i
 
 truncate ndb_show_tables;
 
-INSERT INTO t1 values (2,1,NULL);
+INSERT INTO t1 values (2,2,'2007-09-19 18:46:02');
 SELECT * FROM t1 ORDER BY a;
 DROP TABLE t1;