diff options
| author | unknown <ingo@mysql.com> | 2005-04-27 18:59:31 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-04-27 18:59:31 +0200 |
| commit | f3a1bafa480e151df6b6268784770fe5ba988b7f (patch) | |
| tree | ab14ae1fc19f2e74a9f31b5fdccaed142d65ddaa /sql/mysql_priv.h | |
| parent | a43bfdd28924ad4c12fc70a3aa5ae3556b317b9f (diff) | |
| parent | f63c8f53b050016c6be6a152ea01b4e17e9ee071 (diff) | |
| download | mariadb-git-f3a1bafa480e151df6b6268784770fe5ba988b7f.tar.gz | |
Merge from 4.0 needs fixes
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e75a6f25957..f5d4464ce68 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -975,7 +975,8 @@ extern pthread_t signal_thread; extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd; #endif /* HAVE_OPENSSL */ -MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **table,uint count); +MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, + bool ignore_global_read_lock= FALSE); void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count); @@ -988,6 +989,8 @@ void unlock_global_read_lock(THD *thd); bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh, bool is_not_commit); void start_waiting_global_read_lock(THD *thd); void make_global_read_lock_block_commit(THD *thd); +my_bool set_protect_against_global_read_lock(void); +void unset_protect_against_global_read_lock(void); /* Lock based on name */ int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list); |