summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2004-11-27 14:48:24 +0100
committerunknown <kent@mysql.com>2004-11-27 14:48:24 +0100
commitcf1de7d9da102d11c3ac81efc5dbb51077dc235f (patch)
tree72c9cbbe7bdee0fcf579dd482bcf5018118e4fe8
parentdf1f7cab7076d1299a61a53e366dc5b86eb85437 (diff)
parent4a9e7d384ee39ddd9f614688833ad832a100f8e9 (diff)
downloadmariadb-git-cf1de7d9da102d11c3ac81efc5dbb51077dc235f.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
-rw-r--r--sql/mysql_priv.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index eb53394b96b..b7518c2c96d 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -809,8 +809,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
bool insert_fields(THD *thd,TABLE_LIST *tables,
const char *db_name, const char *table_name,
List_iterator<Item> *it, bool any_privileges,
- bool allocate_view_names,
- bool select_insert);
+ bool allocate_view_names);
bool setup_tables(THD *thd, TABLE_LIST *tables, Item **conds,
TABLE_LIST **leaves, bool refresh_only,
bool select_insert);