diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-07-17 11:32:50 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-07-17 11:32:50 -0600 |
| commit | 91301448e9e5bb29a64e2e3dda4c45d1060f2dd9 (patch) | |
| tree | 43a41cb3648ea2712526c9846b73c01b207fe17e /sql/mysql_priv.h | |
| parent | 60e70c692007e06f55003cd18dd8ea73a7b382b5 (diff) | |
| parent | cff1088d03b16e59627d1c598d6202a55b940c2b (diff) | |
| download | mariadb-git-91301448e9e5bb29a64e2e3dda4c45d1060f2dd9.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 0d0f8852e65..d14aab57489 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -455,9 +455,9 @@ void debug_sync_point(const char* lock_name, uint lock_timeout); #define SHOW_LOG_STATUS_FREE "FREE" #define SHOW_LOG_STATUS_INUSE "IN USE" -struct st_table_list; +struct TABLE_LIST; class String; -void view_store_options(THD *thd, st_table_list *table, String *buff); +void view_store_options(THD *thd, TABLE_LIST *table, String *buff); /* Options to add_table_to_list() */ #define TL_OPTION_UPDATING 1 @@ -1114,7 +1114,7 @@ bool close_thread_table(THD *thd, TABLE **table_ptr); void close_temporary_tables(THD *thd); void close_tables_for_reopen(THD *thd, TABLE_LIST **tables); TABLE_LIST *find_table_in_list(TABLE_LIST *table, - st_table_list *TABLE_LIST::*link, + 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, |