bzr push into mysql-trunk branch (jon.hauglid:3353 to 3354)

[Jon Olav Hauglid]

 3354 Jon Olav Hauglid	2011-04-12
      Small clean-up patch.
      
      Removed three function declarations from sql_base.h for
      functions that no longer have any definition.

    modified:
      sql/sql_base.h
 3353 Jon Olav Hauglid	2011-04-12 [merge]
      Merge from mysql-5.5 to mysql-trunk
      Text conflict in mysql-test/r/xa.result
      Text conflict in mysql-test/t/xa.test

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
=== modified file 'sql/sql_base.h'
--- a/sql/sql_base.h	2011-03-07 09:23:36 +0000
+++ b/sql/sql_base.h	2011-04-12 11:40:17 +0000
@@ -149,16 +149,12 @@ bool open_new_frm(THD *thd, TABLE_SHARE
                   uint ha_open_flags, TABLE *outparam, TABLE_LIST *table_desc,
                   MEM_ROOT *mem_root);
 
-TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
-			    const char *table_name, bool link_in_list);
 bool get_key_map_from_key_list(key_map *map, TABLE *table,
                                List<String> *index_list);
 TABLE *open_table_uncached(THD *thd, const char *path, const char *db,
 			   const char *table_name,
                            bool add_to_temporary_tables_list);
 TABLE *find_locked_table(TABLE *list, const char *db, const char *table_name);
-TABLE *find_write_locked_table(TABLE *list, const char *db,
-                               const char *table_name);
 thr_lock_type read_lock_type_for_table(THD *thd,
                                        Query_tables_list *prelocking_ctx,
                                        TABLE_LIST *table_list);
@@ -256,7 +252,6 @@ TABLE *open_n_lock_single_table(THD *thd
                                 Prelocking_strategy *prelocking_strategy);
 bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags);
 bool lock_tables(THD *thd, TABLE_LIST *tables, uint counter, uint flags);
-int decide_logging_format(THD *thd, TABLE_LIST *tables);
 void free_io_cache(TABLE *entry);
 void intern_close_table(TABLE *entry);
 bool close_thread_table(THD *thd, TABLE **table_ptr);

No bundle (reason: useless for push emails).