diff options
| author | unknown <dlenev@mysql.com> | 2005-10-17 22:47:46 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-10-17 22:47:46 +0400 |
| commit | 5727309da8388315c73e8e69fe31ab8103c03a0d (patch) | |
| tree | af42c9eeb5bd2ead893bd004d47ce0e476fd237c /sql/mysql_priv.h | |
| parent | dddc50f255cbb9112f312a907d03754065b5c208 (diff) | |
| parent | dd02b98d14393e02442a4e7ad41a8b6c0b429d85 (diff) | |
| download | mariadb-git-5727309da8388315c73e8e69fe31ab8103c03a0d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg12739
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 19ebceab719..27eb6556d66 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -757,7 +757,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create); TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update); TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT* mem, bool *refresh, uint flags); -TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table); +bool reopen_name_locked_table(THD* thd, TABLE_LIST* table); TABLE *find_locked_table(THD *thd, const char *db,const char *table_name); bool reopen_table(TABLE *table,bool locked); bool reopen_tables(THD *thd,bool get_locks,bool in_refresh); |