diff options
| author | unknown <serg@janus.mylan> | 2007-03-06 13:44:57 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-06 13:44:57 +0100 |
| commit | b64a40601310a5e7614aaab6ef4e735b3a7bb3c1 (patch) | |
| tree | 6633aa27d1875e982ecf73b0f605752dcadbc94f /sql/mysql_priv.h | |
| parent | 39622e126775b6b7de3b727aa4dd0da5fdab5d74 (diff) | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| download | mariadb-git-b64a40601310a5e7614aaab6ef4e735b3a7bb3c1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e3815c2b235..c215c8c9fdc 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -915,6 +915,8 @@ int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, List<Item> &fields, List<Item> &all_fields, ORDER *order, bool *hidden_group_fields); +bool fix_inner_refs(THD *thd, List<Item> &all_fields, SELECT_LEX *select, + Item **ref_pointer_array); bool handle_select(THD *thd, LEX *lex, select_result *result, ulong setup_tables_done_option); |