3485 magnus.blaudd@stripped 2012-04-20
WL#6224 Adapt MySQL Cluster to 5.6
- update .result file to Timestamp2 output from ndb_desc, this test
was previsoulsy disabled by not havine ALTER ONLINE
modified:
mysql-test/suite/ndb/r/ndb_native_default_support.result
3484 magnus.blaudd@stripped 2012-04-20
WL#6224 Adapt MySQL Cluster to 5.6
- update .result file with the new warnings from
ALTER ONLINE|OFFLINE
- update .result to new Datetime2 and Time2 datatype output from ndb_desc
modified:
mysql-test/suite/ndb/r/ndb_database.result
mysql-test/suite/ndb/r/ndb_dd_alter.result
mysql-test/suite/ndb/r/ndb_share.result
mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result
mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result
3483 magnus.blaudd@stripped 2012-04-20
ndb
- don't convert ONLINE to INPLACE until ndbcluster supports inplace
modified:
sql/sql_yacc.yy
3482 magnus.blaudd@stripped 2012-04-20
WL#6224 Adapt MySQL Cluster to 5.6
- record new result file which uses OFFLINE and thus prints the
new deprecation warning
modified:
mysql-test/suite/ndb/r/ndb_multi.result
=== modified file 'mysql-test/suite/ndb/r/ndb_database.result'
--- a/mysql-test/suite/ndb/r/ndb_database.result 2010-09-22 12:06:29 +0000
+++ b/mysql-test/suite/ndb/r/ndb_database.result 2012-04-20 18:08:31 +0000
@@ -14,7 +14,11 @@ drop database mysqltest;
create database `mysqltest.db`;
create table `mysqltest.db`.t1 (a int primary key, b int) engine=ndb;
alter offline table `mysqltest.db`.t1 add column c int;
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
alter online table `mysqltest.db`.t1 add column d int column_format dynamic;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
drop table `mysqltest.db`.t1;
drop database `mysqltest.db`;
create database newdb;
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result 2011-09-05 09:32:41 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result 2012-04-20 18:08:31 +0000
@@ -83,9 +83,9 @@ a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
a4 Char(10;latin1_swedish_ci) NULL AT=FIXED ST=DISK
a5 Decimal(5,1) NULL AT=FIXED ST=DISK
-a6 Time NULL AT=FIXED ST=DISK
+a6 Time2(0) NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Datetime NULL AT=FIXED ST=DISK
+a8 Datetime2(0) NULL AT=FIXED ST=DISK
a9 Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=DISK
a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
SELECT * FROM test.t1 ORDER BY a1;
@@ -183,9 +183,9 @@ a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
a4 Char(10;latin1_swedish_ci) NULL AT=FIXED ST=DISK
a5 Decimal(5,1) NULL AT=FIXED ST=DISK
-a6 Time NULL AT=FIXED ST=DISK
+a6 Time2(0) NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Datetime NULL AT=FIXED ST=DISK
+a8 Datetime2(0) NULL AT=FIXED ST=DISK
a9 Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=DISK
a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
SELECT * FROM test.t1 ORDER BY a1;
@@ -270,9 +270,9 @@ a2 Int NOT NULL AT=FIXED ST=DISK
a3 Bigint NOT NULL AT=FIXED ST=DISK
a4 Char(10;latin1_swedish_ci) NULL AT=FIXED ST=DISK
a5 Decimal(5,1) NULL AT=FIXED ST=DISK
-a6 Time NULL AT=FIXED ST=DISK
+a6 Time2(0) NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Datetime NULL AT=FIXED ST=DISK
+a8 Datetime2(0) NULL AT=FIXED ST=DISK
a9 Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=DISK
a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
ALTER TABLE test.t1 ENGINE=MyISAM;
@@ -395,8 +395,8 @@ a4 Bit(1) NULL AT=FIXED ST=DISK
a5 Tinyint NULL AT=FIXED ST=DISK
a6 Bigint NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Time NULL AT=FIXED ST=DISK
-a9 Datetime NULL AT=FIXED ST=DISK
+a8 Time2(0) NULL AT=FIXED ST=DISK
+a9 Datetime2(0) NULL AT=FIXED ST=DISK
a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
@@ -466,8 +466,8 @@ a4 Bit(1) NULL AT=FIXED ST=DISK
a5 Tinyint NULL AT=FIXED ST=DISK
a6 Bigint NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Time NULL AT=FIXED ST=DISK
-a9 Datetime NULL AT=FIXED ST=DISK
+a8 Time2(0) NULL AT=FIXED ST=DISK
+a9 Datetime2(0) NULL AT=FIXED ST=DISK
a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
@@ -496,14 +496,14 @@ t1 CREATE TABLE `t1` (
) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
Attributes:
a1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-a2 Float NULL AT=FIXED ST=MEMORY
+a2 Float NULL AT=FIXED ST=DISK
a3 Double NULL AT=FIXED ST=MEMORY
a4 Bit(1) NULL AT=FIXED ST=DISK
a5 Tinyint NULL AT=FIXED ST=DISK
a6 Bigint NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Time NULL AT=FIXED ST=DISK
-a9 Datetime NULL AT=FIXED ST=DISK
+a8 Time2(0) NULL AT=FIXED ST=DISK
+a9 Datetime2(0) NULL AT=FIXED ST=DISK
a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
@@ -538,8 +538,8 @@ a4 Bit(1) NULL AT=FIXED ST=DISK
a5 Tinyint NULL AT=FIXED ST=DISK
a6 Bigint NULL AT=FIXED ST=DISK
a7 Date NULL AT=FIXED ST=DISK
-a8 Time NULL AT=FIXED ST=DISK
-a9 Datetime NULL AT=FIXED ST=DISK
+a8 Time2(0) NULL AT=FIXED ST=DISK
+a9 Datetime2(0) NULL AT=FIXED ST=DISK
a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
@@ -576,8 +576,14 @@ DROP TABLE test.t1;
create table t1 (a int primary key, b int, c int, index bc (b,c))
storage disk tablespace ts engine = ndb;
alter online table t1 drop index bc;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
alter online table t1 add index b (b);
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
alter online table t1 drop index b;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
drop table t1;
ALTER TABLESPACE ts
DROP DATAFILE './table_space/datafile.dat'
=== modified file 'mysql-test/suite/ndb/r/ndb_native_default_support.result'
--- a/mysql-test/suite/ndb/r/ndb_native_default_support.result 2011-05-17 23:29:55 +0000
+++ b/mysql-test/suite/ndb/r/ndb_native_default_support.result 2012-04-20 18:23:42 +0000
@@ -155,7 +155,7 @@ b Binary(19) NULL AT=FIXED ST=MEMORY DEF
vb Varbinary(19) NULL AT=SHORT_VAR ST=MEMORY DEFAULT 0x646464
blob1 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_9
text1 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_10
-timestamp_c Timestamp NOT NULL AT=FIXED ST=MEMORY
+timestamp_c Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
ch2 Char(30;latin1_swedish_ci) NULL AT=FIXED ST=MEMORY DEFAULT "alter table"
-- Indexes --
@@ -383,7 +383,7 @@ b Binary(19) NULL AT=FIXED ST=MEMORY DEF
vb Varbinary(19) NULL AT=SHORT_VAR ST=MEMORY DEFAULT 0x646464
blob1 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_9
text1 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_10
-timestamp_c Timestamp NOT NULL AT=FIXED ST=MEMORY
+timestamp_c Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(i) - UniqueHashIndex
@@ -653,7 +653,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -697,7 +697,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -741,7 +741,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -787,7 +787,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
c Int NULL AT=FIXED ST=MEMORY
-- Indexes --
@@ -836,7 +836,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -880,7 +880,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -926,8 +926,8 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
-c Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
+c Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -973,8 +973,8 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
-c Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
+c Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1024,8 +1024,8 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
-c Timestamp NOT NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 235861201
+c Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1069,7 +1069,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NULL AT=FIXED ST=MEMORY
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1113,7 +1113,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NULL AT=FIXED ST=MEMORY DEFAULT 0
+b Timestamp2(0) NULL AT=FIXED ST=MEMORY DEFAULT 0
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1157,7 +1157,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NULL AT=FIXED ST=MEMORY DEFAULT 235861201
+b Timestamp2(0) NULL AT=FIXED ST=MEMORY DEFAULT 235861201
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1201,7 +1201,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NULL AT=FIXED ST=MEMORY
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1247,7 +1247,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NULL AT=FIXED ST=MEMORY
c Int NULL AT=FIXED ST=MEMORY
-- Indexes --
@@ -1296,7 +1296,7 @@ ExtraRowAuthorBits: 0
TableStatus: Retrieved
-- Attributes --
a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-b Timestamp NULL AT=FIXED ST=MEMORY
+b Timestamp2(0) NULL AT=FIXED ST=MEMORY
-- Indexes --
PRIMARY KEY(a) - UniqueHashIndex
@@ -1395,7 +1395,7 @@ b Binary(19) NULL AT=FIXED ST=MEMORY DEF
vb Varbinary(19) NULL AT=SHORT_VAR ST=MEMORY DEFAULT 0x646464
blob1 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_8
text1 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_9
-timestamp_c Timestamp NOT NULL AT=FIXED ST=MEMORY DEFAULT 1275905182
+timestamp_c Timestamp2(0) NOT NULL AT=FIXED ST=MEMORY DEFAULT 1275905182
newOne Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=MEMORY DEFAULT "Comment field default"
newTwo Bigint NULL AT=FIXED ST=MEMORY
=== modified file 'mysql-test/suite/ndb/r/ndb_share.result'
--- a/mysql-test/suite/ndb/r/ndb_share.result 2011-07-07 10:00:25 +0000
+++ b/mysql-test/suite/ndb/r/ndb_share.result 2012-04-20 18:08:31 +0000
@@ -38,6 +38,8 @@ set global ndb_check_shares=1;
set global ndb_check_shares=1;
create table t1 (a int) engine=ndbcluster;
alter offline table t1 add column b int default 77;
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
drop table t1;
set global ndb_check_shares=1;
set global ndb_check_shares=1;
@@ -45,6 +47,8 @@ set global ndb_check_shares=1;
set global ndb_check_shares=1;
create table t1 (a int) engine=ndbcluster;
alter offline table t1 add column b int default 77;
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
drop table t1;
set global ndb_check_shares=1;
set global ndb_check_shares=1;
@@ -53,6 +57,8 @@ set global ndb_check_shares=1;
create table t1 (a int primary key) engine=ndbcluster
partition by list(a) (partition p0 values in (0));
alter offline table t1 add partition (partition p1 values in (1));
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
drop table t1;
set global ndb_check_shares=1;
set global ndb_check_shares=1;
@@ -61,6 +67,8 @@ set global ndb_check_shares=1;
create table t1 (a int primary key) engine=ndbcluster
partition by list(a) (partition p0 values in (0));
alter offline table t1 add partition (partition p1 values in (1));
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
drop table t1;
set global ndb_check_shares=1;
set global ndb_check_shares=1;
@@ -68,6 +76,8 @@ set global ndb_check_shares=1;
set global ndb_check_shares=1;
create table t1 (a int primary key) engine=ndbcluster;
alter online table t1 add column b int column_format dynamic;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
drop table t1;
set global ndb_check_shares=1;
set global ndb_check_shares=1;
@@ -75,6 +85,8 @@ set global ndb_check_shares=1;
set global ndb_check_shares=1;
create table t1 (a int primary key) engine=ndbcluster;
alter offline table t1 add column b int column_format dynamic;
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
drop table t1;
set global ndb_check_shares=1;
set global ndb_check_shares=1;
@@ -128,6 +140,8 @@ create table t1 (a int) engine=myisam;
create table t1 (a int) engine=myisam;
create table t1 (a int) engine = ndb;
alter offline table t1 add column b int column_format dynamic;
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
drop table t1;
desc t1;
Field Type Null Key Default Extra
@@ -147,6 +161,8 @@ create table t1 (a int) engine=myisam;
create table t1 (a int) engine=myisam;
create table t1 (a int primary key) engine = ndb;
alter online table t1 add column b int column_format dynamic;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
drop table t1;
desc t1;
Field Type Null Key Default Extra
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result 2012-04-19 10:59:52 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result 2012-04-20 18:08:31 +0000
@@ -29,14 +29,24 @@ c1 c2
7 7
8 8
ALTER ONLINE TABLE t1 ADD c CHAR(19);
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
INSERT INTO t1 values (11,1,"a");
ALTER ONLINE TABLE t1 ADD d FLOAT;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
INSERT INTO t1 VALUES(12, 2,'b', -3.402823466E+38);
ALTER ONLINE TABLE t1 ADD f DECIMAL(5,2);
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
INSERT INTO t1 VALUES(14, 4,'d', -3.402823466E+38, 456.78);
ALTER ONLINE TABLE t1 ADD g DATETIME;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
INSERT INTO t1 VALUES(15, 5,'e', -3.402823466E+38, 456.78, '2007-10-26 12:00:00');
ALTER ONLINE TABLE t1 ADD h BINARY(4);
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
INSERT INTO t1 VALUES(16, 6,'f', -3.402823466E+38, 456.78, '2007-10-26 12:00:00',"abcd");
**********************
"Master data"
@@ -111,6 +121,8 @@ CREATE TABLE t1 (a INT UNSIGNED KEY, b I
INSERT INTO t1 VALUES(1,1),(2,2);
BEGIN;
ALTER ONLINE TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255);
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
INSERT INTO t1 VALUES (3,0,'3','3','3'),(4,0,'4','4','4'),(5,0,null,null,null);
UPDATE t1 SET c = 'aaa', d = 'bbb', e = 'ccc' WHERE a = 4;
COMMIT;
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result 2012-04-19 10:59:52 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result 2012-04-20 18:08:31 +0000
@@ -237,9 +237,13 @@ set @v10000 = concat(@v1000,@v1000,@v100
set @v13000 = concat(@v10000, @v1000,@v1000,@v1000);
insert into t1 (c1,c500) values (1,@v10000), (2,@v10000), (3,@v10000);
alter offline table t1 modify c1 int auto_increment;
+Warnings:
+Warning 1287 'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
alter online table t1 add column c501 bit(1) column_format DYNAMIC;
+Warnings:
+Warning 1287 'ONLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=INPLACE instead
alter online table t1 add column c502 varchar(2000);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 14000. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 14000. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
select length(c500) from t1 order by 1;
length(c500)
10000
=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy 2012-04-20 14:09:44 +0000
+++ b/sql/sql_yacc.yy 2012-04-20 15:37:05 +0000
@@ -7274,7 +7274,12 @@ opt_online_offline:
ER_WARN_DEPRECATED_SYNTAX,
ER(ER_WARN_DEPRECATED_SYNTAX),
"ONLINE", "ALGORITHM=INPLACE");
+#ifdef MCP_WL6224
+ // ha_ndbcluster must be adapted to inplace alter
$$= Alter_info::ALTER_TABLE_ALGORITHM_INPLACE;
+#else
+ $$= Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT;
+#endif
}
| OFFLINE_SYM
{
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-cluster branch (magnus.blaudd:3482 to 3485) WL#6224 | magnus.blaudd | 23 Apr |
