diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-09-03 10:06:10 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-09-03 10:06:10 +0300 |
| commit | 9dea4a4cd1ac246004dc9d223cfc606a7dea5567 (patch) | |
| tree | 47d958e5060fcfc773f2874d7abccdd221a738cf /sql/mysql_priv.h | |
| parent | 3a9dabd6765e7dad0cbd6949ac275487f72696d2 (diff) | |
| parent | 3fbcafea9c5e85dc6315f0b89872ac5e273195c8 (diff) | |
| download | mariadb-git-9dea4a4cd1ac246004dc9d223cfc606a7dea5567.tar.gz | |
merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
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
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 9fff4880573..d3901770230 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -373,7 +373,7 @@ int handle_select(THD *thd, LEX *lex, select_result *result); int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, ORDER *order, ORDER *group,Item *having,ORDER *proc_param, ulong select_type,select_result *result, - SELECT_LEX_UNIT *unit); + SELECT_LEX_UNIT *unit, bool fake_select_lex); int mysql_union(THD *thd, LEX *lex,select_result *result); int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *s, TABLE_LIST *t); Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, @@ -442,7 +442,8 @@ bool wait_for_tables(THD *thd); bool table_is_used(TABLE *table, bool wait_for_name_lock); bool drop_locked_tables(THD *thd,const char *db, const char *table_name); void abort_locked_tables(THD *thd,const char *db, const char *table_name); -Field *find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables); +Field *find_field_in_tables(THD *thd, Item_field *item, TABLE_LIST *tables, + bool report_error); Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length, bool check_grant,bool allow_rowid); #ifdef HAVE_OPENSSL @@ -530,7 +531,7 @@ TABLE *unlink_open_table(THD *thd,TABLE *list,TABLE *find); SQL_SELECT *make_select(TABLE *head, table_map const_tables, table_map read_tables, COND *conds, int *error); -Item ** find_item_in_list(Item *item,List<Item> &items); +Item ** find_item_in_list(Item *item, List<Item> &items, bool report_error); bool insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, const char *table_name, List_iterator<Item> *it); |