bk commit into 5.1 tree (mskold:1.2341)

[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-04-13 10:51:03+02:00, mskold@stripped +1 -0
  ndb_field_flag.result:
    Fixed bug that incorrectly created all fields on disk after one is found

  mysql-test/r/ndb_field_flag.result@stripped, 2007-04-13 10:47:28+02:00, mskold@stripped +0 -10
    Fixed bug that incorrectly created all fields on disk after one is found

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-wl3627

--- 1.4/mysql-test/r/ndb_field_flag.result	2007-04-13 10:51:16 +02:00
+++ 1.5/mysql-test/r/ndb_field_flag.result	2007-04-13 10:51:16 +02:00
@@ -36,8 +36,6 @@ f CHAR(100) NOT NULL field_format FIXED,
 f1 char(100) NOT NULL field_format DYNAMIC storage DISK,
 index (b)) TABLESPACE ts1 engine NDB;
 Warnings:
-Warning	1466	DYNAMIC field d1 declared with STORAGE DISK is not supported, field will become STATIC
-Warning	1466	DYNAMIC field e1 declared with STORAGE DISK is not supported, field will become STATIC
 Warning	1466	DYNAMIC field f1 declared with STORAGE DISK is not supported, field will become STATIC
 insert into t1 (b, b1, d,d1,f,f1) values
 (1,1,"1","1","1","1"),
@@ -115,8 +113,6 @@ t1	CREATE TABLE `t1` (
 alter table t1 change column b b int NOT NULL storage memory;
 alter table t1 add column a2 int field_format FIXED;
 Warnings:
-Warning	1466	DYNAMIC field d1 declared with STORAGE DISK is not supported, field will become STATIC
-Warning	1466	DYNAMIC field e1 declared with STORAGE DISK is not supported, field will become STATIC
 Warning	1466	DYNAMIC field f1 declared with STORAGE DISK is not supported, field will become STATIC
 show create table t1;
 Table	Create Table
@@ -138,10 +134,7 @@ t1	CREATE TABLE `t1` (
 ) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 alter table t1 add column c2 VARCHAR(100) field_format DYNAMIC;
 Warnings:
-Warning	1466	DYNAMIC field d1 declared with STORAGE DISK is not supported, field will become STATIC
-Warning	1466	DYNAMIC field e1 declared with STORAGE DISK is not supported, field will become STATIC
 Warning	1466	DYNAMIC field f1 declared with STORAGE DISK is not supported, field will become STATIC
-Warning	1466	DYNAMIC field c2 declared with STORAGE DISK is not supported, field will become STATIC
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -163,10 +156,7 @@ t1	CREATE TABLE `t1` (
 ) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 alter table t1 add column c3 VARCHAR(100) field_format FIXED;
 Warnings:
-Warning	1466	DYNAMIC field d1 declared with STORAGE DISK is not supported, field will become STATIC
-Warning	1466	DYNAMIC field e1 declared with STORAGE DISK is not supported, field will become STATIC
 Warning	1466	DYNAMIC field f1 declared with STORAGE DISK is not supported, field will become STATIC
-Warning	1466	DYNAMIC field c2 declared with STORAGE DISK is not supported, field will become STATIC
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (