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-11-19 13:56:54+01:00, tomas@stripped +11 -0
result files corrected
mysql-test/suite/ndb/r/ndb_alter_table.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +1 -1
result files corrected
mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +15 -15
result files corrected
mysql-test/suite/ndb/r/ndb_alter_table_online2.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +2 -2
result files corrected
mysql-test/suite/ndb/r/ndb_binlog_basic.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +1 -1
result files corrected
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +1 -1
result files corrected
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +1 -1
result files corrected
mysql-test/suite/ndb/r/ndb_blob.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +2 -2
result files corrected
mysql-test/suite/ndb/r/ndb_column_properties.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +9 -9
result files corrected
mysql-test/suite/ndb/r/ndb_dd_alter.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +7 -7
result files corrected
mysql-test/suite/ndb/r/ndb_gis.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +2 -2
result files corrected
mysql-test/suite/ndb/r/ndb_row_format.result@stripped, 2007-11-19 13:56:51+01:00, tomas@stripped +1 -1
result files corrected
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table.result b/mysql-test/suite/ndb/r/ndb_alter_table.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table.result 2007-11-19 13:56:51 +01:00
@@ -298,7 +298,7 @@ a b
6 203
alter table t2 add c int;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 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
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-11-12 11:38:44 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-11-19 13:56:51 +01:00
@@ -47,7 +47,7 @@ set @t1_id = (select id from ndb_show_ta
truncate ndb_show_tables_results;
ALTER TABLE t1 ADD c INT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
ndb_show_tables completed.....
@@ -80,7 +80,7 @@ set @t1_id = (select id from ndb_show_ta
truncate ndb_show_tables_results;
ALTER TABLE t1 ADD c INT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
ndb_show_tables completed.....
@@ -156,9 +156,9 @@ insert into t1 values (5,5),(6,6);
update t1 set b = 0 where a = 6;
ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
update t1 set b = 0 where a = 2;
update t1 set b = 0 where a = 4;
update t1 set b = 0 where a = 5;
@@ -188,9 +188,9 @@ insert into t1 values (5,5),(6,6);
update t1 set b = 0 where a = 6;
ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
update t1 set b = 0 where a = 2;
update t1 set b = 0 where a = 4;
update t1 set b = 0 where a = 5;
@@ -498,31 +498,31 @@ truncate ndb_show_tables_results;
*******************************
ALTER ONLINE TABLE t1 ADD c FLOAT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
*******************************
* Add column d as nullable DOUBLE
*******************************
ALTER ONLINE TABLE t1 ADD d DOUBLE UNSIGNED;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
*******************************
* Add column e as nullable DECIMAL
*******************************
ALTER ONLINE TABLE t1 ADD e DECIMAL(5,2);
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
*******************************
* Add column f as nullable DATETIME
*******************************
ALTER ONLINE TABLE t1 ADD f DATETIME;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
*******************************
* Add column g as nullable BINARY
*******************************
ALTER TABLE t1 ADD g BINARY(4);
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
ndb_show_tables completed.....
@@ -583,7 +583,7 @@ CREATE TABLE t1
TABLESPACE ts1 STORAGE DISK
ENGINE=NDB;
Warnings:
-Warning 1477 DYNAMIC column b with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column b with STORAGE DISK is not supported, column will become FIXED
ALTER ONLINE TABLE t1 CHANGE b b_1 INT COLUMN_FORMAT DYNAMIC;
ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 CHANGE b b_1 INT COLUMN_FORMAT DYNAMIC'
ALTER ONLINE TABLE t1 ADD COLUMN c INT COLUMN_FORMAT DYNAMIC;
@@ -619,7 +619,7 @@ CREATE TABLE t1
(pk1 INT NOT NULL PRIMARY KEY, b INT COLUMN_FORMAT DYNAMIC)ROW_FORMAT=FIXED
ENGINE=NDB;
Warnings:
-Warning 1477 Row format FIXED incompatible with dynamic attribute b
+Warning 1478 Row format FIXED incompatible with dynamic attribute b
-- t1 --
Version: #
Fragment type: 5
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result 2007-11-19 13:56:51 +01:00
@@ -24,7 +24,7 @@ truncate ndb_show_tables_results;
ALTER ONLINE TABLE t1 ADD b INT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Check table t1 ID has not changed
@@ -50,7 +50,7 @@ update t1 set b= 0;
ALTER ONLINE TABLE t1 ADD c INT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Check table t1 ID has not changed
diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_basic.result b/mysql-test/suite/ndb/r/ndb_binlog_basic.result
--- a/mysql-test/suite/ndb/r/ndb_binlog_basic.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_basic.result 2007-11-19 13:56:51 +01:00
@@ -12,7 +12,7 @@ select @max_epoch:=max(epoch)-1 from mys
delete from t1;
alter table t1 add (b int);
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+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;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
--- a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2007-11-19 13:56:51 +01:00
@@ -22,7 +22,7 @@ reset master;
reset master;
alter table t2 add column (b int);
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+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
master-bin.000001 # Query 102 # use `test`; alter table t2 add column (b int)
diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
--- a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2007-11-19 13:56:51 +01:00
@@ -10,7 +10,7 @@ create table t2 (a int key, b int) engin
insert into t1 values (1,1);
alter table t1 add c int;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+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
master-bin.000001 # Query 1 # BEGIN
diff -Nrup a/mysql-test/suite/ndb/r/ndb_blob.result b/mysql-test/suite/ndb/r/ndb_blob.result
--- a/mysql-test/suite/ndb/r/ndb_blob.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_blob.result 2007-11-19 13:56:51 +01:00
@@ -343,7 +343,7 @@ a b c d
9 b9 999 dd9
alter table t1 add x int;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
select * from t1 order by a;
a b c d x
1 b1 111 dd1 NULL
@@ -394,7 +394,7 @@ a b c d
9 b9 999 dd9
alter table t1 add x int;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
select * from t1 order by a;
a b c d x
1 b1 111 dd1 NULL
diff -Nrup a/mysql-test/suite/ndb/r/ndb_column_properties.result b/mysql-test/suite/ndb/r/ndb_column_properties.result
--- a/mysql-test/suite/ndb/r/ndb_column_properties.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_column_properties.result 2007-11-19 13:56:51 +01:00
@@ -11,7 +11,7 @@ INITIAL_SIZE 6M
ENGINE NDB;
create table t1 (a int column_format DYNAMIC STORAGE DISK) TABLESPACE ts1 engine NDB;
Warnings:
-Warning 1477 DYNAMIC column a with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column a with STORAGE DISK is not supported, column will become FIXED
select column_name, storage, format from information_schema.columns
where table_name = "t1";
column_name storage format
@@ -38,14 +38,14 @@ f CHAR(100) NOT NULL column_format FIXED
f1 char(100) NOT NULL column_format DYNAMIC storage DISK,
index (b)) TABLESPACE ts1 engine NDB;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
insert into t1 (b, b1, d,d1,f,f1) values
(1,1,"1","1","1","1"),
(2,2,"2","2","2","2"),
(3,3,"3","3","3","3");
alter table t1 change column a a int column_format FIXED;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -80,7 +80,7 @@ f Default Fixed
f1 Disk Dynamic
alter table t1 change column a a int storage disk;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -113,7 +113,7 @@ f1 Char(100;latin1_swedish_ci) NOT NULL
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
alter table t1 change column a a int storage memory;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -146,10 +146,10 @@ f1 Char(100;latin1_swedish_ci) NOT NULL
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
alter table t1 change column b b int NOT NULL storage memory;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
alter table t1 add column a2 int column_format FIXED;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -184,7 +184,7 @@ a2 Int NULL AT=FIXED ST=MEMORY
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
alter table t1 add column c2 VARCHAR(100) column_format DYNAMIC;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -221,7 +221,7 @@ c2 Varchar(100;latin1_swedish_ci) NULL A
$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
alter table t1 add column c3 VARCHAR(100) column_format FIXED;
Warnings:
-Warning 1477 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
+Warning 1478 DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_alter.result b/mysql-test/suite/ndb/r/ndb_dd_alter.result
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result 2007-10-30 17:57:06 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result 2007-11-19 13:56:51 +01:00
@@ -317,8 +317,8 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PA
NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts
ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts
@@ -346,11 +346,11 @@ a1 a2 a3
20 21.2345 20000020
ALTER TABLE test.t1 ADD a4 BIT, ADD a5 TINYINT, ADD a6 BIGINT, ADD a7 DATE, ADD a8 TIME;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
SELECT a1,a2,a3,hex(a4), a5,a6,a7,a8 FROM test.t1 ORDER BY a1;
a1 a2 a3 hex(a4) a5 a6 a7 a8
1 2.2345 20000001 0 1 23457 2006-01-01 07:04:00
diff -Nrup a/mysql-test/suite/ndb/r/ndb_gis.result b/mysql-test/suite/ndb/r/ndb_gis.result
--- a/mysql-test/suite/ndb/r/ndb_gis.result 2007-11-16 11:35:35 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_gis.result 2007-11-19 13:56:51 +01:00
@@ -431,7 +431,7 @@ gc geometrycollection YES NULL
gm geometry YES NULL
ALTER TABLE t1 ADD fid INT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
SHOW FIELDS FROM t1;
Field Type Null Key Default Extra
a int(11) NO PRI NULL auto_increment
@@ -983,7 +983,7 @@ gc geometrycollection YES NULL
gm geometry YES NULL
ALTER TABLE t1 ADD fid INT;
Warnings:
-Warning 1477 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
+Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN
SHOW FIELDS FROM t1;
Field Type Null Key Default Extra
a int(11) NO PRI NULL auto_increment
diff -Nrup a/mysql-test/suite/ndb/r/ndb_row_format.result b/mysql-test/suite/ndb/r/ndb_row_format.result
--- a/mysql-test/suite/ndb/r/ndb_row_format.result 2007-11-16 11:37:23 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_row_format.result 2007-11-19 13:56:51 +01:00
@@ -6,7 +6,7 @@ b VARCHAR(10) )
ROW_FORMAT=FIXED
ENGINE=NDB;
Warnings:
-Warning 1477 Row format FIXED incompatible with dynamic attribute b
+Warning 1478 Row format FIXED incompatible with dynamic attribute b
SHOW WARNINGS;
Level Code Message
Warning 1478 Row format FIXED incompatible with dynamic attribute b
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2650) | tomas | 19 Nov |
