bzr commit into mysql-6.0-backup-merge branch (alik:2830)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/mysql-6.0-backup-merge/ based on revid:charles.bell@stripped

 2830 Alexander Nozdrin	2009-06-25 [merge]
      Merge mysql-azalea -> mysql-6.0-backup-merge

    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/information_schema.result
      mysql-test/t/disabled.def
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-06-17 13:34:01 +0000
+++ b/mysql-test/collections/default.experimental	2009-06-25 11:04:30 +0000
@@ -1,3 +1,4 @@
 funcs_1.charset_collation_1              # depends on compile-time decisions
 backup.backup_external_non_win           # BUG#45117
 rpl.rpl_backup_multi                     # BUG#45284
+main.information_schema                  # Bug#42893 2009-06-23 guilhem main.information_schema times out sporadically

=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2009-05-15 13:45:06 +0000
+++ b/mysql-test/r/information_schema.result	2009-06-23 20:29:59 +0000
@@ -613,7 +613,7 @@ proc	definer	char(77)
 proc	created	timestamp
 proc	modified	timestamp
 proc	sql_mode	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')
-proc	comment	char(64)
+proc	comment	text
 proc	character_set_client	char(32)
 proc	collation_connection	char(32)
 proc	db_collation	char(32)
@@ -797,6 +797,7 @@ information_schema	PLUGINS	PLUGIN_DESCRI
 information_schema	PROCESSLIST	INFO
 information_schema	ROUTINES	DTD_IDENTIFIER
 information_schema	ROUTINES	ROUTINE_DEFINITION
+information_schema	ROUTINES	ROUTINE_COMMENT
 information_schema	TRIGGERS	ACTION_CONDITION
 information_schema	TRIGGERS	ACTION_STATEMENT
 information_schema	VIEWS	VIEW_DEFINITION
@@ -827,8 +828,6 @@ TRIGGERS	CREATED	datetime
 backup_history	validity_point_time	datetime
 backup_history	start_time	datetime
 backup_history	stop_time	datetime
-backup_progress	start_time	datetime
-backup_progress	stop_time	datetime
 event	execute_at	datetime
 event	last_executed	datetime
 event	starts	datetime
@@ -1187,8 +1186,8 @@ default character set utf8;
 select CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH from
 information_schema.columns where table_schema='test' and table_name = 't1';
 CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH
-1	4
-9	36
+1	3
+9	27
 drop table t1;
 use mysql;
 INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL',

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-06-11 14:24:28 +0000
+++ b/mysql-test/t/disabled.def	2009-06-23 20:29:59 +0000
@@ -13,5 +13,4 @@ cast                 : Bug#35594 2008-03
 kill                 : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 innodb_bug39438      : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
 query_cache_28249    : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-information_schema   : Bug#42893 2009-03-26 alik main.information_schema times out sporadically
 init_connect         : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows


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