diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-07 01:20:56 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-07 01:20:56 +0200 |
| commit | 81f368cc549ebd0078ef64b61bd92332edb5d319 (patch) | |
| tree | 473a02ad21d3dcb150966988c72ab2d2a3dd7601 /sql/mysql_priv.h | |
| parent | 7ae420a4a17fab1b45ee56dc5cac2f8d9063baa5 (diff) | |
| parent | 5861dc5b8b39b3f822a8968963a4783541d59b77 (diff) | |
| download | mariadb-git-81f368cc549ebd0078ef64b61bd92332edb5d319.tar.gz | |
Merge to get fix for LOCK TABLES + DROP TABLE in another thread
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/type_datetime.result:
Update results after merge
sql/log_event.h:
Use local version
sql/mysql_priv.h:
Use local version
sql/mysqld.cc:
Use local version
sql/sql_repl.h:
Use local version
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7d830859fb2..c6e205f4729 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -723,6 +723,9 @@ int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list); int lock_table_name(THD *thd, TABLE_LIST *table_list); void unlock_table_name(THD *thd, TABLE_LIST *table_list); bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list); +bool lock_table_names(THD *thd, TABLE_LIST *table_list); +void unlock_table_names(THD *thd, TABLE_LIST *table_list, + TABLE_LIST *last_table= 0); /* old unireg functions */ |