summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorlars/lthalmann@dl145j.mysql.com <>2007-06-18 09:42:22 +0200
committerlars/lthalmann@dl145j.mysql.com <>2007-06-18 09:42:22 +0200
commitae52876fd04e17bb922759b09ce45e2ecc0e0df0 (patch)
tree5d72c9e47c88d4643b3354241a81f22fda24a3ad /sql/mysql_priv.h
parent7013c96fdf097fa9dc283936b832b3c66df6ac15 (diff)
parent43d419e9a917b316cf1773d82cfaa6dc380574db (diff)
downloadmariadb-git-ae52876fd04e17bb922759b09ce45e2ecc0e0df0.tar.gz
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index bd786ed81ca..595a61f2d69 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1273,6 +1273,7 @@ int simple_open_n_lock_tables(THD *thd,TABLE_LIST *tables);
bool open_and_lock_tables(THD *thd,TABLE_LIST *tables);
bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags);
int lock_tables(THD *thd, TABLE_LIST *tables, uint counter, bool *need_reopen);
+int decide_logging_format(THD *thd, TABLE_LIST *tables);
TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
const char *table_name, bool link_in_list);
bool rm_temporary_table(handlerton *base, char *path);