diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
| commit | 3dadf9564cbfd6e584db282b9105b8f5fb38f99b (patch) | |
| tree | fb25bfc9b6c669b42e70afadf7790f0f8d7db7e3 /sql/mysql_priv.h | |
| parent | e852131f048df0c48d6779c40b23a347fbccc107 (diff) | |
| parent | e83c9f627377f05e093f092cee227da1b43d8e94 (diff) | |
| download | mariadb-git-3dadf9564cbfd6e584db282b9105b8f5fb38f99b.tar.gz | |
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index abd1d58d4e9..793fb3da4be 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -958,7 +958,8 @@ struct Query_cache_query_flags #endif /*HAVE_QUERY_CACHE*/ void write_bin_log(THD *thd, bool clear_error, - char const *query, ulong query_length); + char const *query, ulong query_length, + bool is_trans= FALSE); /* sql_connect.cc */ int check_user(THD *thd, enum enum_server_command command, @@ -1491,7 +1492,6 @@ TABLE *open_n_lock_single_table(THD *thd, TABLE_LIST *table_l, thr_lock_type lock_type); 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); |