diff options
| author | msvensson@neptunus.(none) <> | 2007-02-06 14:45:08 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2007-02-06 14:45:08 +0100 |
| commit | ede3afe470a88bf1d4bc96d8ee5bce069569d10f (patch) | |
| tree | 431e053716f1d6cf66bf0eaeec8d5024b1b1b24e /sql/mysql_priv.h | |
| parent | 47ae650a57951cb72d3d405e66421f65d05f0ccf (diff) | |
| parent | b4445664121219789c994d01fe9adf277404b245 (diff) | |
| download | mariadb-git-ede3afe470a88bf1d4bc96d8ee5bce069569d10f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 899227fb0a6..1bde8306072 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -992,7 +992,8 @@ bool push_new_name_resolution_context(THD *thd, TABLE_LIST *left_op, TABLE_LIST *right_op); void add_join_on(TABLE_LIST *b,Item *expr); -void add_join_natural(TABLE_LIST *a,TABLE_LIST *b,List<String> *using_fields); +void add_join_natural(TABLE_LIST *a,TABLE_LIST *b,List<String> *using_fields, + SELECT_LEX *lex); bool add_proc_to_list(THD *thd, Item *item); TABLE *unlink_open_table(THD *thd,TABLE *list,TABLE *find); void update_non_unique_table_error(TABLE_LIST *update, |