summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-05-13 18:58:26 +0300
committermonty@narttu.mysql.fi <>2003-05-13 18:58:26 +0300
commit13530887cb09194adbe89d65277c59ffb71fdd15 (patch)
treeb0c44d624533c05fb3586c52901c5d00fe1f3186 /sql/mysql_priv.h
parentaa9bc9d0a031cd7bff7ffcff54049717787441f8 (diff)
downloadmariadb-git-13530887cb09194adbe89d65277c59ffb71fdd15.tar.gz
Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 956fdf8cd45..d02202cd7c6 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -560,8 +560,8 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table,
bool return_if_owned_by_thd=0);
bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables);
void copy_field_from_tmp_record(Field *field,int offset);
-int fill_record(List<Item> &fields,List<Item> &values);
-int fill_record(Field **field,List<Item> &values);
+int fill_record(List<Item> &fields,List<Item> &values, bool ignore_errors);
+int fill_record(Field **field,List<Item> &values, bool ignore_errors);
OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild);
/* sql_calc.cc */