bzr push into mysql-6.0 branch (alik:3064 to 3065)

[Alexander Nozdrin]

 3065 Alexander Nozdrin	2009-02-25 [merge]
      Pull from 6.0-opt
      modified:
        mysql-test/r/subselect_sj2.result
        mysql-test/r/subselect_sj2_jcl6.result
        mysql-test/t/subselect_sj2.test

 3064 Alexander Nozdrin	2009-02-24 [merge]
      Pull from 6.0 main
      modified:
        mysql-test/r/join_cache.result
        mysql-test/r/subselect_sj2.result
        mysql-test/r/subselect_sj2_jcl6.result
        mysql-test/t/join_cache.test
        mysql-test/t/subselect_sj2.test

=== modified file 'mysql-test/r/subselect_sj2.result'
--- a/mysql-test/r/subselect_sj2.result	2009-02-19 11:24:51 +0000
+++ b/mysql-test/r/subselect_sj2.result	2009-02-24 20:44:01 +0000
@@ -76,7 +76,7 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	t0	ALL	NULL	NULL	NULL	NULL	10	Materialize; Scan
 1	PRIMARY	t3	ref	b	b	5	test.t0.a	1	
 set @save_ecp= @@engine_condition_pushdown;
-set engine_condition_pushdown=1;
+set engine_condition_pushdown=0;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);
 a	b	pk1	pk2
 0	0	0	0

=== modified file 'mysql-test/r/subselect_sj2_jcl6.result'
--- a/mysql-test/r/subselect_sj2_jcl6.result	2009-02-21 13:19:42 +0000
+++ b/mysql-test/r/subselect_sj2_jcl6.result	2009-02-24 20:44:01 +0000
@@ -80,7 +80,7 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	t0	ALL	NULL	NULL	NULL	NULL	10	Materialize; Scan
 1	PRIMARY	t3	ref	b	b	5	test.t0.a	1	Using join buffer
 set @save_ecp= @@engine_condition_pushdown;
-set engine_condition_pushdown=1;
+set engine_condition_pushdown=0;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);
 a	b	pk1	pk2
 0	0	0	0

=== modified file 'mysql-test/t/subselect_sj2.test'
--- a/mysql-test/t/subselect_sj2.test	2009-02-19 11:24:51 +0000
+++ b/mysql-test/t/subselect_sj2.test	2009-02-24 20:44:01 +0000
@@ -64,7 +64,7 @@ from t0 A, t0 B where B.a <5;
 explain select * from t3 where b in (select a from t0);
 # Because of BUG#40154, run the next select w/o index condition pushdown:
 set @save_ecp= @@engine_condition_pushdown;
-set engine_condition_pushdown=1;
+set engine_condition_pushdown=0;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);
 set engine_condition_pushdown=@save_ecp;
 

=== modified file 'sql/backup/backup_info.cc'
--- a/sql/backup/backup_info.cc	2009-02-13 12:40:13 +0000
+++ b/sql/backup/backup_info.cc	2009-02-24 09:50:47 +0000
@@ -171,16 +171,15 @@ Backup_info::find_backup_engine(const ba
 
 #ifndef DBUG_OFF
   backup_factory *saved_factory; // to save hton->get_backup_engine
+#ifndef WITH_MARIA_STORAGE_ENGINE
+  handlerton *maria_hton= (handlerton*) 1;  
+#endif
 
   DBUG_EXECUTE_IF("backup_test_dummy_be_factory", 
     {
       handlerton *hton= se_hton(se);
       saved_factory= hton->get_backup_engine;
-      if (hton == myisam_hton
-#ifdef WITH_MARIA_STORAGE_ENGINE
-          || hton == maria_hton
-#endif
-          ) 
+      if (hton == myisam_hton || hton == maria_hton) 
         hton->get_backup_engine= dummy_backup_engine_factory;
     });
 #endif

=== modified file 'storage/maria/ma_non_trans_log.c'
--- a/storage/maria/ma_non_trans_log.c	2009-02-13 12:40:13 +0000
+++ b/storage/maria/ma_non_trans_log.c	2009-02-24 09:50:47 +0000
@@ -244,10 +244,9 @@ void _maria_log_command(IO_CACHE *log, e
                          const uchar *buffert, uint length, int result)
 {
   uchar header[14];
-  int old_errno, headerlen;
   ulong pid=(ulong) GETPID();
   File file= share->kfile.file;
-  old_errno=my_errno;
+  int old_errno=my_errno, headerlen;
   DBUG_ENTER("_maria_log_command");
   DBUG_PRINT("enter", ("command: %u share->open_file_name.str '%s'",
                        command, share->open_file_name.str));