diff options
| author | unknown <ingo@mysql.com> | 2005-12-06 17:48:31 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-12-06 17:48:31 +0100 |
| commit | a73c263386d5982bcdec70ea407013a3f4c91ea7 (patch) | |
| tree | f731241c8b5e21c507287765a07eca69dad51d27 /sql/mysql_priv.h | |
| parent | 60f2e7a9a4518c0ff271ccb2153060bb68f658a7 (diff) | |
| parent | 38b7ede9c6146884c17fe9290a0913d2a95fc548 (diff) | |
| download | mariadb-git-a73c263386d5982bcdec70ea407013a3f4c91ea7.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug5390
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 62e65ea95da..3972a01f7ba 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -788,6 +788,7 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table); void mysql_lock_abort(THD *thd, TABLE *table); bool mysql_lock_abort_for_thread(THD *thd, TABLE *table); MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); +int mysql_lock_have_duplicate(THD *thd, TABLE *table, TABLE_LIST *tables); bool lock_global_read_lock(THD *thd); void unlock_global_read_lock(THD *thd); bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh, bool is_not_commit); |