MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Glukhov Date:February 17 2009 10:14am
Subject:bzr commit into mysql-6.0-bugteam branch (Sergey.Glukhov:3052)
Bug#35427
View as plain text  
#At file:///home/gluh/MySQL/mysql-6.0-bugteam/ based on revid:matthias.leich@stripped

 3052 Sergey Glukhov	2009-02-17
      additional fix for Bug#35427
modified:
  mysql-test/suite/ndb/r/ndb_dd_alter.result
  mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
  mysql-test/suite/ndb/r/ndb_partition_range.result
  mysql-test/suite/ndb/r/ndb_restore.result

per-file messages:
  mysql-test/suite/ndb/r/ndb_dd_alter.result
    result fix
  mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
    result fix
  mysql-test/suite/ndb/r/ndb_partition_range.result
    result fix
  mysql-test/suite/ndb/r/ndb_restore.result
    result fix
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result	2007-12-10 09:42:39 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result	2009-02-17 10:14:26 +0000
@@ -314,14 +314,14 @@ a1
 20
 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
+def	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	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
+def	test	t1	p0	NULL	1	NULL	KEY	NULL		NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	ts
 SELECT * FROM test.t1 ORDER BY a1;
 a1	a2	a3
 1	2.2345	20000001

=== modified file 'mysql-test/suite/ndb/r/ndb_dd_restore_compat.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2008-09-02 15:44:54 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2009-02-17 10:14:26 +0000
@@ -1,16 +1,16 @@
 select * from information_schema.columns
 where table_name = "t1";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	STORAGE	FORMAT
-NULL	test	t1	a1	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)	PRI		select,insert,update,references		Default	Default
-NULL	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references		Default	Default
-NULL	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references		Default	Default
-NULL	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)			select,insert,update,references		Default	Default
-NULL	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	decimal(5,1)			select,insert,update,references		Default	Default
-NULL	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references		Default	Default
-NULL	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references		Default	Default
-NULL	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references		Default	Default
-NULL	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references		Default	Default
-NULL	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references		Default	Default
+def	test	t1	a1	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)	PRI		select,insert,update,references		Default	Default
+def	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references		Default	Default
+def	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references		Default	Default
+def	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)			select,insert,update,references		Default	Default
+def	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	decimal(5,1)			select,insert,update,references		Default	Default
+def	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references		Default	Default
+def	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references		Default	Default
+def	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references		Default	Default
+def	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references		Default	Default
+def	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references		Default	Default
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'mysql-test/suite/ndb/r/ndb_partition_range.result'
--- a/mysql-test/suite/ndb/r/ndb_partition_range.result	2008-12-13 11:02:16 +0000
+++ b/mysql-test/suite/ndb/r/ndb_partition_range.result	2009-02-17 10:14:26 +0000
@@ -17,9 +17,9 @@ INSERT into t1 values (10, 1, 1);
 INSERT into t1 values (15, 1, 1);
 select * from information_schema.partitions where table_name= 't1';
 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	x1	NULL	1	NULL	RANGE	NULL	a	NULL	5	0	0	0	#	0	0	#	#	NULL	NULL		default	NULL
-NULL	test	t1	x2	NULL	2	NULL	RANGE	NULL	a	NULL	10	0	0	0	#	0	0	#	#	NULL	NULL		default	NULL
-NULL	test	t1	x3	NULL	3	NULL	RANGE	NULL	a	NULL	20	0	0	0	#	0	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x1	NULL	1	NULL	RANGE	NULL	a	NULL	5	0	0	0	#	0	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x2	NULL	2	NULL	RANGE	NULL	a	NULL	10	0	0	0	#	0	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x3	NULL	3	NULL	RANGE	NULL	a	NULL	20	0	0	0	#	0	0	#	#	NULL	NULL		default	NULL
 select * from t1 order by a;
 a	b	c
 1	1	1

=== modified file 'mysql-test/suite/ndb/r/ndb_restore.result'
--- a/mysql-test/suite/ndb/r/ndb_restore.result	2009-02-02 15:58:48 +0000
+++ b/mysql-test/suite/ndb/r/ndb_restore.result	2009-02-17 10:14:26 +0000
@@ -139,9 +139,9 @@ ForceVarPart: 0
 ForceVarPart: 1
 select * from information_schema.columns where table_name = "t1_c";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	STORAGE	FORMAT
-NULL	test	t1_c	capgoaledatta	1	NULL	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(5) unsigned	PRI	auto_increment	select,insert,update,references		Default	Default
-NULL	test	t1_c	goaledatta	2		NO	char	2	2	NULL	NULL	latin1	latin1_swedish_ci	char(2)	PRI		select,insert,update,references		Default	Default
-NULL	test	t1_c	maturegarbagefa	3		NO	varchar	32	32	NULL	NULL	latin1	latin1_swedish_ci	varchar(32)	PRI		select,insert,update,references		Default	Default
+def	test	t1_c	capgoaledatta	1	NULL	NO	mediumint	NULL	NULL	7	0	NULL	NULL	mediumint(5) unsigned	PRI	auto_increment	select,insert,update,references		Default	Default
+def	test	t1_c	goaledatta	2		NO	char	2	2	NULL	NULL	latin1	latin1_swedish_ci	char(2)	PRI		select,insert,update,references		Default	Default
+def	test	t1_c	maturegarbagefa	3		NO	varchar	32	32	NULL	NULL	latin1	latin1_swedish_ci	varchar(32)	PRI		select,insert,update,references		Default	Default
 select count(*) from t1;
 count(*)
 5

Thread
bzr commit into mysql-6.0-bugteam branch (Sergey.Glukhov:3052)Bug#35427Sergey Glukhov17 Feb