From: Jon Olav Hauglid
Date: April 12 2011 11:40am
Subject: bzr commit into mysql-trunk branch (jon.hauglid:3354)
List-Archive: http://lists.mysql.com/commits/135263
Message-Id: <201104121140.p3CBeV7s015548@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8814813250668280613=="

--===============8814813250668280613==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/x/mysql-trunk-test/ based on revid:jon.hauglid@stripped

 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
=== 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);


--===============8814813250668280613==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-trunk-test/
# testament_sha1: f55b483b704e7603d11b0c0c6d11cbc9d8721297
# timestamp: 2011-04-12 13:40:23 +0200
# source_branch: file:///export/home/x/mysql-5.5-test/
# base_revision_id: jon.hauglid@stripped\
#   2h5bs6nps46pakeq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR+Z5CwAAYnfgAAQUGP/91JQ
mAC////wUAN6XuZbd0OO89uGSIGlNo2hNT9NKep5PVM0mjTEZMgZQEYjINEnlNPRPUaDQGho0GRE
wCajJNqaYTTQ0NAAAZFT1PI0jQaeiGgAABoGgSU1NTTaTap+qeCTT0mmJmo9QABkdbmHnXMMb7Bl
YSLcGMInH20Nc1Ywt10REA9OQ+GuTJFIGo5YUG7+0/Dmrwvl0X2icy+yqJXVB1QTStuotrdZuKkI
yweJhpBDy7CcG8PtmureySNGseSVkilGLqsjBsiJzIgYQUsD747Q2ocpA2EIUm7Q+NkLzeDdJl4o
knGZmfhOYzCJK404QziLZVlAoFEOJWgtp+Xq5SeF4JBaeITIb65kbawY6DvdrYGKFcatjcMKqXBG
y/EArWQES7Mryx0LVAVhwSwPMKohjMggPhEJYLnq6DNLZMmGA5IXkCV7DneOgUpwNWB4DiNYk9U0
D6qLMUwEbLn+05xsAwjAQg19xiVUDgcyty0sByxqcmDhVZ1iUi3nh1HMUlF0I2JQ4lalZX6yzhnP
ROJnNSORBu3e3WW3UWyGn0TxwE14UDWGDnqRmKsBWdhM1FRYagdK2uqlGDC9HAyUtUo5GiADnp3i
vHbHjaFo7jmskRMQoOap70iVrAn0SEbILD1AVCDg/+37yRCCQFHhOMaG3b7XEbgHWoUijkskNRrt
mNKxeMdwPcDGW64PQ3gziyFEBAZeBIBwzGOOWKUKJGXuSKpRJINdULJZK5jIWqiBLxoFEBFw5bKU
JGoBI7fnNKsV5s9XIqdgG1WQrGtKc3u1NTTxZc2tu5Pbood9QpKHaDoNtDtT/S9oinAQqxywFNwC
hEJgzcOt8GSvWfJESPAQIjxBRyxCc7k68LnpGiqaocoEOi8jw78kyQ3CGspTEdgRf99XS/PY5ycb
glsfKzEUA9T2HNVqpdTrWkNGRUEQmYJgz/29khw7iCgW7dVPmkcBO5bVQ66gw1v34QeIJBxahJot
Q0BqJvVl3I54vEiHoUMaUMBlcJgDXEfJIQ8YKGyhJKyRpAU0KbttBMtOB5nVCjA2n2C+Oy6AEDIC
2+HsnQqSarFSER5bgdniPlXxng2VNLEGgLMSuxsQInR+QCKD58Gc7leCIF5EBZE1C9irSchuQbH4
7pjqxuWYFQJvUu24wAORc+HC4qpVgMXn0KZPgtYtu4hbWUcz/F3JFOFCQH5nkLA=


--===============8814813250668280613==--