diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-01 12:47:25 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-01 12:47:25 +0300 |
| commit | 435f54fce072eab27d88ec2564de95e7327cc848 (patch) | |
| tree | 60bbb287461767b7a9cafa225bf108abe6eb1f65 /sql/mysql_priv.h | |
| parent | 749f8b3ec1fe144a5f510ecb2e9ab9b198185755 (diff) | |
| parent | f87973fe2c86d6cdca29aeaf8e67e2dfc5772efd (diff) | |
| download | mariadb-git-435f54fce072eab27d88ec2564de95e7327cc848.tar.gz | |
merged 5.1-5.1.29-rc -> 5.1-bugteam
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4e1f2ad6f60..f2b2806ea60 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1265,6 +1265,7 @@ bool fix_merge_after_open(TABLE_LIST *old_child_list, TABLE_LIST **old_last, TABLE_LIST *new_child_list, TABLE_LIST **new_last); bool reopen_table(TABLE *table); bool reopen_tables(THD *thd,bool get_locks,bool in_refresh); +thr_lock_type read_lock_type_for_table(THD *thd, TABLE *table); void close_data_files_and_morph_locks(THD *thd, const char *db, const char *table_name); void close_handle_and_leave_table_as_lock(TABLE *table); @@ -1938,7 +1939,7 @@ extern bool opt_using_transactions; extern bool mysqld_embedded; #endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */ #ifdef MYSQL_SERVER -extern bool using_update_log, opt_large_files, server_id_supplied; +extern bool opt_large_files, server_id_supplied; extern bool opt_update_log, opt_bin_log, opt_error_log; extern my_bool opt_log, opt_slow_log; extern ulong log_output_options; |