bzr push into mysql-trunk branch (sergey.glukhov:3417 to 3418)

[Sergey Glukhov]

 3418 Sergey Glukhov	2011-11-11
      pushbuild failure fix
     @ mysql-test/r/func_analyse.result
        pushbuild failure fix
     @ mysql-test/t/func_analyse.test
        pushbuild failure fix

    modified:
      mysql-test/r/func_analyse.result
      mysql-test/t/func_analyse.test
 3417 Jorgen Loland	2011-11-10 [merge]
      Automerge opt-backporting -> opt-team

    modified:
      mysql-test/r/derived.result
      mysql-test/t/derived.test
=== modified file 'mysql-test/r/func_analyse.result'
--- a/mysql-test/r/func_analyse.result	2011-11-10 07:42:43 +0000
+++ b/mysql-test/r/func_analyse.result	2011-11-11 08:17:08 +0000
@@ -168,6 +168,4 @@ drop table t1;
 #
 CREATE TABLE t1 (i INT);
 EXPLAIN SELECT * FROM t1 PROCEDURE ANALYSE();
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	
 DROP TABLE t1;

=== modified file 'mysql-test/t/func_analyse.test'
--- a/mysql-test/t/func_analyse.test	2011-11-10 07:42:43 +0000
+++ b/mysql-test/t/func_analyse.test	2011-11-11 08:17:08 +0000
@@ -186,5 +186,7 @@ drop table t1;
 --echo #
 
 CREATE TABLE t1 (i INT);
+--disable_result_log
 EXPLAIN SELECT * FROM t1 PROCEDURE ANALYSE();
+--enable_result_log
 DROP TABLE t1;

No bundle (reason: useless for push emails).