bk commit into 5.1 tree (tomas:1.2593)

[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-07-27 08:56:38+02:00, tomas@stripped +5 -0
  WL#3627
  - correct some result files

  mysql-test/r/ndb_alter_table.result@stripped, 2007-07-27 08:56:35+02:00, tomas@stripped +2 -0
    WL#3627
    - correct some result files

  mysql-test/r/ndb_alter_table_online.result@stripped, 2007-07-27 08:56:35+02:00, tomas@stripped +34 -0
    WL#3627
    - correct some result files

  mysql-test/r/ndb_binlog_basic.result@stripped, 2007-07-27 08:56:35+02:00, tomas@stripped +2 -0
    WL#3627
    - correct some result files

  mysql-test/r/ndb_binlog_log_bin.result@stripped, 2007-07-27 08:56:35+02:00, tomas@stripped +2 -0
    WL#3627
    - correct some result files

  mysql-test/r/rpl_ndb_basic.result@stripped, 2007-07-27 08:56:35+02:00, tomas@stripped +2 -0
    WL#3627
    - correct some result files

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.2

--- 1.43/mysql-test/r/ndb_alter_table.result	2007-02-22 15:49:30 +01:00
+++ 1.44/mysql-test/r/ndb_alter_table.result	2007-07-27 08:56:35 +02:00
@@ -343,6 +343,8 @@
 a	b
 6	203
 alter table t2 add c int;
+Warnings:
+Warning	1466	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 insert into t2 (b) values (301),(302),(303);
 select * from t2 where a = 9;
 a	b	c

--- 1.5/mysql-test/r/ndb_binlog_basic.result	2006-12-01 15:48:23 +01:00
+++ 1.6/mysql-test/r/ndb_binlog_basic.result	2007-07-27 08:56:35 +02:00
@@ -11,6 +11,8 @@
 #
 delete from t1;
 alter table t1 add (b int);
+Warnings:
+Warning	1466	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;

--- 1.14/mysql-test/r/rpl_ndb_basic.result	2007-07-12 12:01:53 +02:00
+++ 1.15/mysql-test/r/rpl_ndb_basic.result	2007-07-27 08:56:35 +02:00
@@ -188,6 +188,8 @@
 CREATE TABLE t1 (c1 INT KEY) ENGINE=NDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 ALTER TABLE t1 ADD c2 INT;
+Warnings:
+Warning	1466	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
 1	NULL

--- 1.1/mysql-test/r/ndb_alter_table_online.result	2007-07-26 22:31:41 +02:00
+++ 1.2/mysql-test/r/ndb_alter_table_online.result	2007-07-27 08:56:35 +02:00
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a INT UNSIGNED KEY, b INT UNSIGNED) ENGINE NDB;
+INSERT INTO t1 values (1,1);
+ALTER TABLE t1 ADD c CHAR(19);
+Warnings:
+Warning	1466	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+INSERT INTO t1 values (2,1,"a");
+SELECT * FROM t1 ORDER BY a;
+a	b	c
+1	1	NULL
+2	1	a
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNSIGNED KEY, b VARCHAR(19)) ENGINE NDB;
+INSERT INTO t1 values (1,"a");
+ALTER TABLE t1 ADD c INT;
+Warnings:
+Warning	1466	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+INSERT INTO t1 values (2,"a",1);
+SELECT * FROM t1 ORDER BY a;
+a	b	c
+1	a	NULL
+2	a	1
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNSIGNED KEY, b INT COLUMN_FORMAT DYNAMIC) ENGINE NDB;
+INSERT INTO t1 values (1,1);
+ALTER TABLE t1 ADD c INT;
+Warnings:
+Warning	1466	Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+INSERT INTO t1 values (2,1,1);
+SELECT * FROM t1 ORDER BY a;
+a	b	c
+1	1	NULL
+2	1	1
+DROP TABLE t1;

--- 1.1/mysql-test/r/ndb_binlog_log_bin.result	2007-04-18 21:39:43 +02:00
+++ 1.2/mysql-test/r/ndb_binlog_log_bin.result	2007-07-27 08:56:35 +02:00
@@ -9,6 +9,8 @@
 create table t2 (a int key, b int) engine=ndb;
 insert into t1 values (1,1);
 alter table t1 add c int;
+Warnings:
+Warning	1466	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
 master-bin.000001	#	Query	1	#	BEGIN