diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-01 15:31:30 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-01 15:31:30 +0200 |
| commit | 00b2168b8c4f41f48e6de8e2fec46ace253810f9 (patch) | |
| tree | d88bc19990e4debcc53c5c3eb87966c9fe9d6f67 /sql/mysql_priv.h | |
| parent | 150c99dffe2737ef4de7534bf297ff6943612cd0 (diff) | |
| parent | 68c0a299876b01dbf72cd948708afef4a2c27b47 (diff) | |
| download | mariadb-git-00b2168b8c4f41f48e6de8e2fec46ace253810f9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 35740ff8bf1..7e1923b1825 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -481,14 +481,13 @@ int mysql_select(THD *thd, Item ***rref_pointer_array, SELECT_LEX *select_lex); void free_underlaid_joins(THD *thd, SELECT_LEX *select); void fix_tables_pointers(SELECT_LEX *select_lex); -void fix_tables_pointers(SELECT_LEX_UNIT *select_lex); int mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, select_result *result); int mysql_explain_select(THD *thd, SELECT_LEX *sl, char const *type, select_result *result); int mysql_union(THD *thd, LEX *lex, select_result *result, SELECT_LEX_UNIT *unit); -int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *s, TABLE_LIST *t); +int mysql_handle_derived(LEX *lex); Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, Item ***copy_func, Field **from_field, bool group,bool modify_item); @@ -675,6 +674,7 @@ int setup_ftfuncs(SELECT_LEX* select); int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order); void wait_for_refresh(THD *thd); int open_tables(THD *thd,TABLE_LIST *tables); +int simple_open_n_lock_tables(THD *thd,TABLE_LIST *tables); int open_and_lock_tables(THD *thd,TABLE_LIST *tables); int lock_tables(THD *thd,TABLE_LIST *tables); TABLE *open_temporary_table(THD *thd, const char *path, const char *db, |