diff options
| author | bell@sanja.is.com.ua <> | 2002-10-03 16:35:08 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2002-10-03 16:35:08 +0300 |
| commit | 48b2a76a48e0655285326b24889c0ece4bee9da7 (patch) | |
| tree | 9464842edb3e39b15290e6c4a253d6609a74897d /sql/mysql_priv.h | |
| parent | 4d705988d562cac60d44e22f8d6e76df63432c72 (diff) | |
| download | mariadb-git-48b2a76a48e0655285326b24889c0ece4bee9da7.tar.gz | |
after merging bugfix
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4532646b1c2..60505ec0712 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -450,7 +450,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 @@ -538,7 +539,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); |