Below is the list of changes that have just been committed into a local
6.0 repository of uchum. When uchum 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-10-28 01:13:17+05:00, gshchepa@stripped +14 -0
Many files:
Error message numbers.
mysql-test/r/locktrans_myisam.result@stripped, 2007-10-28 01:12:42+05:00, gshchepa@stripped +19 -19
Error message numbers.
mysql-test/r/rpl_locktrans_myisam.result@stripped, 2007-10-28 01:12:42+05:00, gshchepa@stripped +19 -19
Error message numbers.
mysql-test/r/sp.result@stripped, 2007-10-28 01:12:42+05:00, gshchepa@stripped +4 -4
Error message numbers.
mysql-test/suite/ndb/r/ndb_alter_table.result@stripped, 2007-10-28 01:12:42+05:00, gshchepa@stripped +1 -1
Error message numbers.
mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-10-28 01:12:42+05:00, gshchepa@stripped +8 -8
Error message numbers.
mysql-test/suite/ndb/r/ndb_alter_table_online2.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +2 -2
Error message numbers.
mysql-test/suite/ndb/r/ndb_binlog_basic.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +1 -1
Error message numbers.
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +1 -1
Error message numbers.
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +1 -1
Error message numbers.
mysql-test/suite/ndb/r/ndb_blob.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +2 -2
Error message numbers.
mysql-test/suite/ndb/r/ndb_column_properties.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +9 -9
Error message numbers.
mysql-test/suite/ndb/r/ndb_dd_alter.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +7 -7
Error message numbers.
mysql-test/suite/ndb/r/ndb_gis.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +2 -2
Error message numbers.
mysql-test/suite/ndb/r/ndb_row_format.result@stripped, 2007-10-28 01:12:43+05:00, gshchepa@stripped +1 -1
Error message numbers.
diff -Nrup a/mysql-test/r/locktrans_myisam.result b/mysql-test/r/locktrans_myisam.result
--- a/mysql-test/r/locktrans_myisam.result 2007-10-20 01:19:57 +05:00
+++ b/mysql-test/r/locktrans_myisam.result 2007-10-28 01:12:42 +05:00
@@ -21,8 +21,8 @@ UNLOCK TABLES;
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
#
# Valid syntax for aliases with and without 'AS'.
@@ -30,19 +30,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE;
UNLOCK TABLES;
LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 'a1'
-Warning 1598 Converted to non-transactional lock on 'a2'
+Warning 1599 Converted to non-transactional lock on 'a1'
+Warning 1599 Converted to non-transactional lock on 'a2'
UNLOCK TABLES;
#
# Transactional locks taken on a view.
CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 'v1'
+Warning 1599 Converted to non-transactional lock on 'v1'
DROP VIEW v1;
#
# Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -94,12 +94,12 @@ ERROR 42000: You have an error in your S
# Implicit lock method conversion due to mix in statement.
LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
# Lock t1 share (converted to read), t2 write.
LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't1'
# Show t1 is read locked, t2 write locked.
INSERT INTO t1 SELECT * FROM t2;
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -110,8 +110,8 @@ INSERT INTO t2 SELECT * FROM t1;
# Lock t1 exclusive (converted to write), t2 share (converted to read).
LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't2'
# Show t1 is write locked, t2 read locked.
INSERT INTO t1 SELECT * FROM t2;
INSERT INTO t2 SELECT * FROM t1;
@@ -135,8 +135,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1599 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1599 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1600 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1600 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -156,7 +156,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;
# Request a transactional lock, which is converted to non-transactional.
LOCK TABLE t4 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't4'
+Warning 1599 Converted to non-transactional lock on 't4'
# Try a conflict with the existing non-transactional lock.
INSERT INTO t4 VALUES(444);
ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -173,8 +173,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W
# Request a share lock on the view, which is converted to read locks.
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't3'
-Warning 1598 Converted to non-transactional lock on 't4'
+Warning 1599 Converted to non-transactional lock on 't3'
+Warning 1599 Converted to non-transactional lock on 't4'
# Show that read locks on the base tables prohibit writing ...
INSERT INTO t3 SELECT * FROM t4;
ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -190,7 +190,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 'v1'
+Warning 1599 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -199,8 +199,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't3'
-Warning 1598 Converted to non-transactional lock on 't4'
+Warning 1599 Converted to non-transactional lock on 't3'
+Warning 1599 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/r/rpl_locktrans_myisam.result b/mysql-test/r/rpl_locktrans_myisam.result
--- a/mysql-test/r/rpl_locktrans_myisam.result 2007-10-20 01:19:57 +05:00
+++ b/mysql-test/r/rpl_locktrans_myisam.result 2007-10-28 01:12:42 +05:00
@@ -27,8 +27,8 @@ UNLOCK TABLES;
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
#
# Valid syntax for aliases with and without 'AS'.
@@ -36,19 +36,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE;
UNLOCK TABLES;
LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 'a1'
-Warning 1598 Converted to non-transactional lock on 'a2'
+Warning 1599 Converted to non-transactional lock on 'a1'
+Warning 1599 Converted to non-transactional lock on 'a2'
UNLOCK TABLES;
#
# Transactional locks taken on a view.
CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 'v1'
+Warning 1599 Converted to non-transactional lock on 'v1'
DROP VIEW v1;
#
# Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -100,12 +100,12 @@ ERROR 42000: You have an error in your S
# Implicit lock method conversion due to mix in statement.
LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
# Lock t1 share (converted to read), t2 write.
LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't1'
# Show t1 is read locked, t2 write locked.
INSERT INTO t1 SELECT * FROM t2;
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -116,8 +116,8 @@ INSERT INTO t2 SELECT * FROM t1;
# Lock t1 exclusive (converted to write), t2 share (converted to read).
LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't1'
-Warning 1598 Converted to non-transactional lock on 't2'
+Warning 1599 Converted to non-transactional lock on 't1'
+Warning 1599 Converted to non-transactional lock on 't2'
# Show t1 is write locked, t2 read locked.
INSERT INTO t1 SELECT * FROM t2;
INSERT INTO t2 SELECT * FROM t1;
@@ -141,8 +141,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1599 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1599 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1600 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1600 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -162,7 +162,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;
# Request a transactional lock, which is converted to non-transactional.
LOCK TABLE t4 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't4'
+Warning 1599 Converted to non-transactional lock on 't4'
# Try a conflict with the existing non-transactional lock.
INSERT INTO t4 VALUES(444);
ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -179,8 +179,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W
# Request a share lock on the view, which is converted to read locks.
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't3'
-Warning 1598 Converted to non-transactional lock on 't4'
+Warning 1599 Converted to non-transactional lock on 't3'
+Warning 1599 Converted to non-transactional lock on 't4'
# Show that read locks on the base tables prohibit writing ...
INSERT INTO t3 SELECT * FROM t4;
ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -196,7 +196,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 'v1'
+Warning 1599 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -205,8 +205,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1598 Converted to non-transactional lock on 't3'
-Warning 1598 Converted to non-transactional lock on 't4'
+Warning 1599 Converted to non-transactional lock on 't3'
+Warning 1599 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result 2007-10-20 01:19:58 +05:00
+++ b/mysql-test/r/sp.result 2007-10-28 01:12:42 +05:00
@@ -5661,7 +5661,7 @@ drop function if exists pi;
create function pi() returns varchar(50)
return "pie, my favorite desert.";
Warnings:
-Note 1584 This function 'pi' has the same name as a native function
+Note 1585 This function 'pi' has the same name as a native function
SET @save_sql_mode=@@sql_mode;
SET SQL_MODE='IGNORE_SPACE';
select pi(), pi ();
@@ -5710,15 +5710,15 @@ use test;
create function `database`() returns varchar(50)
return "Stored function database";
Warnings:
-Note 1584 This function 'database' has the same name as a native function
+Note 1585 This function 'database' has the same name as a native function
create function `current_user`() returns varchar(50)
return "Stored function current_user";
Warnings:
-Note 1584 This function 'current_user' has the same name as a native function
+Note 1585 This function 'current_user' has the same name as a native function
create function md5(x varchar(50)) returns varchar(50)
return "Stored function md5";
Warnings:
-Note 1584 This function 'md5' has the same name as a native function
+Note 1585 This function 'md5' has the same name as a native function
SET SQL_MODE='IGNORE_SPACE';
select database(), database ();
database() database ()
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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table.result 2007-10-28 01:12:42 +05: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-10-11 20:02:55 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-10-28 01:12:42 +05:00
@@ -24,7 +24,7 @@ set @t1_id = (select id from ndb_show_ta
truncate ndb_show_tables;
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
LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
select name from ndb_show_tables where id = @t1_id and name like '%t1%' and type like '%UserTable%';
name
@@ -43,7 +43,7 @@ set @t1_id = (select id from ndb_show_ta
truncate ndb_show_tables;
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
LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;
select id,name from ndb_show_tables where id = @t1_id and name like '%t1%';
id name
@@ -92,9 +92,9 @@ insert into t1 values (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;
@@ -125,9 +125,9 @@ insert into t1 values (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;
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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result 2007-10-28 01:12:43 +05:00
@@ -4,10 +4,10 @@ create table t1 (pk int key, a int) engi
insert into t1 values (1,0);
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
update t1 set b= 0;
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
update t1 set c= 0;
drop table t1;
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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_basic.result 2007-10-28 01:12:43 +05: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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2007-10-28 01:12:43 +05: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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2007-10-28 01:12:43 +05: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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_blob.result 2007-10-28 01:12:43 +05: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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_column_properties.result 2007-10-28 01:12:43 +05: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-10 17:23:06 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result 2007-10-28 01:12:43 +05: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-10-28 01:04:39 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_gis.result 2007-10-28 01:12:43 +05: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-10-28 01:06:04 +05:00
+++ b/mysql-test/suite/ndb/r/ndb_row_format.result 2007-10-28 01:12:43 +05: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
