bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3219)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedfjhxr

 3219 Magnus Blåudd	2011-02-21
      ndb
       - fix .result file for ndb_dd_restore_compat
       -- TABLE_CATALOG is now def instead of NULL. 
       -- remove COLUMN_FORMAT and STORAGE column from I_S.columns

    modified:
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_restore_compat.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2010-02-22 12:18:59 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2011-02-21 09:43:59 +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		#		Default	Default
-NULL	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			#		Default	Default
-NULL	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			#		Default	Default
-NULL	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)			#		Default	Default
-NULL	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	decimal(5,1)			#		Default	Default
-NULL	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			#		Default	Default
-NULL	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			#		Default	Default
-NULL	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			#		Default	Default
-NULL	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			#		Default	Default
-NULL	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	blob			#		Default	Default
+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
+def	test	t1	a1	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)	PRI		#	
+def	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			#	
+def	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			#	
+def	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)			#	
+def	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	decimal(5,1)			#	
+def	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			#	
+def	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			#	
+def	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			#	
+def	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			#	
+def	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	blob			#	
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

Attachment: [text/bzr-bundle] bzr/[e-mail]