diff options
| author | unknown <ingo@mysql.com> | 2005-05-31 19:37:24 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-05-31 19:37:24 +0200 |
| commit | 57d4adf60c7b4c0d341903a29d64f96359e78adb (patch) | |
| tree | 3a0071aee0fc84c8565299dbf4136b73fbea5c29 /sql/mysql_priv.h | |
| parent | 7b4385f4725f99ed5115b0f89174fc358498cfe0 (diff) | |
| parent | cf2188ca398e12d4a10c50b069c2243825f9dced (diff) | |
| download | mariadb-git-57d4adf60c7b4c0d341903a29d64f96359e78adb.tar.gz | |
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Hand merged from 4.0.
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ca282ee2444..5b9e81620ce 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -978,8 +978,11 @@ 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, - bool ignore_global_read_lock= FALSE); +MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, uint flags); +/* mysql_lock_tables() flags bits */ +#define MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK 0x0001 +#define MYSQL_LOCK_IGNORE_FLUSH 0x0002 + 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); |