bzr push into mysql-6.0 branch (konstantin:2679 to 2680) Bug#36777

[Konstantin Osipov]

 2680 Konstantin Osipov	2008-07-16
      Code cleanup.
modified:
  sql/item_subselect.cc
  sql/sql_select.cc

 2679 Davi Arnaut	2008-07-14
      Bug#36777: Warnings are raised as errors
      
      Post-merge fixes: update more test case results.
modified:
  mysql-test/r/func_encrypt_nossl.result
  mysql-test/suite/falcon/r/falcon_bug_22972.result
  mysql-test/suite/funcs_1/r/falcon_func_view.result
  mysql-test/suite/funcs_1/r/innodb_func_view.result
  mysql-test/suite/funcs_1/r/memory_func_view.result
  mysql-test/suite/funcs_1/r/myisam_func_view.result
  mysql-test/suite/funcs_1/r/ndb_func_view.result
  mysql-test/suite/ndb/r/ndb_bitfield.result
  mysql-test/suite/ndb/r/ndb_dd_ddl.result
  mysql-test/suite/ndb/r/ndb_gis.result
  mysql-test/suite/ndb/r/ndb_multi_row.result
  mysql-test/suite/ndb/r/ndb_partition_error.result
  mysql-test/suite/ndb/r/ndb_single_user.result

=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2008-06-26 20:13:19 +0000
+++ b/sql/item_subselect.cc	2008-07-16 19:03:00 +0000
@@ -2176,7 +2176,8 @@ void subselect_uniquesubquery_engine::fi
   DBUG_ASSERT(0);
 }
 
-int  init_read_record_seq(JOIN_TAB *tab);
+int  read_first_record_seq(JOIN_TAB *tab);
+int rr_sequential(READ_RECORD *info);
 int join_read_always_key_or_null(JOIN_TAB *tab);
 int join_read_next_same_or_null(READ_RECORD *info);
 
@@ -2262,7 +2263,8 @@ int subselect_single_select_engine::exec
               /* Change the access method to full table scan */
               tab->save_read_first_record= tab->read_first_record;
               tab->save_read_record= tab->read_record.read_record;
-              tab->read_first_record= init_read_record_seq;
+              tab->read_record.read_record= rr_sequential;
+              tab->read_first_record= read_first_record_seq;
               tab->read_record.record= tab->table->record[0];
               tab->read_record.thd= join->thd;
               tab->read_record.ref_length= tab->table->file->ref_length;

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-07-11 16:22:44 +0000
+++ b/sql/sql_select.cc	2008-07-16 19:03:00 +0000
@@ -14454,10 +14454,8 @@ join_init_quick_read_record(JOIN_TAB *ta
 }
 
 
-int rr_sequential(READ_RECORD *info);
-int init_read_record_seq(JOIN_TAB *tab)
+int read_first_record_seq(JOIN_TAB *tab)
 {
-  tab->read_record.read_record= rr_sequential;
   if (tab->read_record.file->ha_rnd_init(1))
     return 1;
   return (*tab->read_record.read_record)(&tab->read_record);