bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3209)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped0g95p

 3209 Magnus Blåudd	2011-02-15
      ndb
       - remove the "Converted FIXED field to DYNAMIC .. " warnings from .result file,
        either we add them back when this is supported again, disable warnings
        or rewrite theese alters that are not there to test that we get this specific
        warning

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result
      mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result	2008-02-25 13:50:20 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result	2011-02-15 09:51:38 +0000
@@ -12,8 +12,6 @@ select @max_epoch:=max(epoch)-1 from mys
 #
 delete from t1;
 alter table t1 add (b int);
-Warnings:
-Warning	1478	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 insert into t1 values (3,3),(4,4);
 alter table t1 rename t2;
 begin;

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result	2011-02-15 09:46:02 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result	2011-02-15 09:51:38 +0000
@@ -21,8 +21,6 @@ mysqld-bin.000001	#	Query	1	#	use `test`
 reset master;
 reset master;
 alter table t2 add column (b int);
-Warnings:
-Warning	1478	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	#	Query	1	#	use `test`; alter table t2 add column (b int)

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result	2011-02-15 09:51:38 +0000
@@ -9,8 +9,6 @@ create table t1 (a int key, b int) engin
 create table t2 (a int key, b int) engine=ndb;
 insert into t1 values (1,1);
 alter table t1 add c int;
-Warnings:
-Warning	1478	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 reset master;

Attachment: [text/bzr-bundle] bzr/[e-mail]