diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-12-31 12:55:03 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-12-31 12:55:03 +0200 |
| commit | 53894481bfd2e7e1cf2a30706fd99ec67656dd5e (patch) | |
| tree | 9f351bd5a522793ebcd27a5acad3f1a97a9fa939 /sql/mysql_priv.h | |
| parent | a83a0d4b328b916cffaf8165fd3d9e377ec1a8f3 (diff) | |
| parent | 3ab0ddc294891f31b65f92fb7af265047db15d52 (diff) | |
| download | mariadb-git-53894481bfd2e7e1cf2a30706fd99ec67656dd5e.tar.gz | |
merging
mysql-test/r/subselect.result:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 1b0608e5f79..4d819ef6ae7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -466,7 +466,7 @@ 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); extern const Field *not_found_field; Field *find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, - bool report_error); + TABLE_LIST **where, 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 |