summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authoringo@mysql.com <>2005-05-31 19:37:24 +0200
committeringo@mysql.com <>2005-05-31 19:37:24 +0200
commitc4205995817014bb233459cc392769895de0b809 (patch)
tree3a0071aee0fc84c8565299dbf4136b73fbea5c29 /sql/mysql_priv.h
parentcc0061a122336a74b439d14d1d3d1a4528af0f0b (diff)
parent51d80960ea52e1c3c99bf6287f331a58e1c2b11c (diff)
downloadmariadb-git-c4205995817014bb233459cc392769895de0b809.tar.gz
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Hand merged from 4.0.
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h7
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);