bzr push into mysql-5.5-runtime branch (kostja:3173 to 3174)

[Konstantin Osipov]

 3174 Konstantin Osipov	2010-10-27
      Remove a dead declaration.

    modified:
      sql/sql_base.h
 3173 Jon Olav Hauglid	2010-10-25 [merge]
      Merge from mysql-5.5-bugteam to mysql-5.5-runtime
      No conflicts

    modified:
      mysql-test/r/plugin_auth_qa_2.result
      mysql-test/r/plugin_auth_qa_3.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/t/plugin_auth_qa_1.test
      mysql-test/t/plugin_auth_qa_2.test
      mysql-test/t/plugin_auth_qa_3.test
      sql/log_event.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_parse.cc
=== modified file 'sql/sql_base.h'
--- a/sql/sql_base.h	2010-09-30 13:29:12 +0000
+++ b/sql/sql_base.h	2010-10-27 18:57:44 +0000
@@ -243,7 +243,6 @@ bool open_tables(THD *thd, TABLE_LIST **
 bool open_and_lock_tables(THD *thd, TABLE_LIST *tables,
                           bool derived, uint flags,
                           Prelocking_strategy *prelocking_strategy);
-int open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived);
 /* simple open_and_lock_tables without derived handling for single table */
 TABLE *open_n_lock_single_table(THD *thd, TABLE_LIST *table_l,
                                 thr_lock_type lock_type, uint flags,

No bundle (reason: useless for push emails).