bzr commit into mysql-6.0 branch (serg:2746)

[Sergei Golubchik]

#At file:///usr/home/serg/Abk/mysql/6.0-maria/ based on revid:serg@stripped

 2746 Sergei Golubchik	2009-04-21
      update *.result files

    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2009-03-18 21:09:40 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2009-04-21 21:31:05 +0000
@@ -134,8 +134,8 @@ def	mysql	ndb_binlog_index	orig_server_i
 def	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references		Default	Default
 def	mysql	ndb_binlog_index	schemaops	7	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references		Default	Default
 def	mysql	ndb_binlog_index	updates	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references		Default	Default
-def	mysql	plugin	dl	2		NO	char	128	512	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		Default	Default
-def	mysql	plugin	name	1		NO	char	64	256	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references		Default	Default
+def	mysql	plugin	dl	2		NO	varchar	128	512	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		Default	Default
+def	mysql	plugin	name	1		NO	varchar	64	256	NULL	NULL	utf8	utf8_general_ci	varchar(64)	PRI		select,insert,update,references		Default	Default
 def	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references		Default	Default
 def	mysql	proc	body_utf8	20	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references		Default	Default
 def	mysql	proc	character_set_client	17	NULL	YES	char	32	128	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		Default	Default
@@ -447,8 +447,8 @@ NULL	mysql	ndb_binlog_index	schemaops	in
 NULL	mysql	ndb_binlog_index	orig_server_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	ndb_binlog_index	orig_epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	ndb_binlog_index	gci	int	NULL	NULL	NULL	NULL	int(10) unsigned
-4.0000	mysql	plugin	name	char	64	256	utf8	utf8_bin	char(64)
-4.0000	mysql	plugin	dl	char	128	512	utf8	utf8_bin	char(128)
+4.0000	mysql	plugin	name	varchar	64	256	utf8	utf8_general_ci	varchar(64)
+4.0000	mysql	plugin	dl	varchar	128	512	utf8	utf8_general_ci	varchar(128)
 4.0000	mysql	proc	db	char	64	256	utf8	utf8_bin	char(64)
 4.0000	mysql	proc	name	char	64	256	utf8	utf8_general_ci	char(64)
 4.0000	mysql	proc	type	enum	9	36	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')

=== modified file 'mysql-test/suite/funcs_1/r/is_tables_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result	2009-04-21 21:31:05 +0000
@@ -330,7 +330,7 @@ TABLE_NAME	plugin
 TABLE_TYPE	BASE TABLE
 ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Fixed
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -341,7 +341,7 @@ AUTO_INCREMENT	NULL
 CREATE_TIME	#CRT#
 UPDATE_TIME	#UT#
 CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_bin
+TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
 TABLE_COMMENT	#TC#


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