diff options
| author | unknown <evgen@moonbone.local> | 2007-03-02 00:10:25 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-02 00:10:25 +0300 |
| commit | b72e3110da881f0bd94efd0e3b2a88b42138a478 (patch) | |
| tree | 21050e48fa1c5ce00614620b5107994fdb4d6cb5 /sql/mysql_priv.h | |
| parent | a0684ef25f7b2a1f6f02abf3fe4d1f3d7ebb7298 (diff) | |
| parent | 1437a9c532df2ff1f7dc5d72fdc50cdb89014c90 (diff) | |
| download | mariadb-git-b72e3110da881f0bd94efd0e3b2a88b42138a478.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 59bae191230..7c9b43f23b9 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1066,7 +1066,8 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table, st_table_list *TABLE_LIST::*link, const char *db_name, const char *table_name); -TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list); +TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list, + bool check_alias); TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name); bool close_temporary_table(THD *thd, const char *db, const char *table_name); void close_temporary(TABLE *table, bool delete_table); |