diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-05 15:45:11 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-05 15:45:11 +0200 |
| commit | 5861dc5b8b39b3f822a8968963a4783541d59b77 (patch) | |
| tree | 00dc4e6cf99060c6edd1f3c1447875a1b72ca154 /sql/mysql_priv.h | |
| parent | a300406b4f599d1ab676d6fb1cbca93be466926e (diff) | |
| parent | 4016096bac76b0dd6e1980900b2ddc62d1fe6287 (diff) | |
| download | mariadb-git-5861dc5b8b39b3f822a8968963a4783541d59b77.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
sql/mysql_priv.h:
Auto merged
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 63f3069ef63..833a816233e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -594,6 +594,9 @@ MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); 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 */ |