diff options
| author | unknown <igor@rurik.mysql.com> | 2003-12-23 02:24:12 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-12-23 02:24:12 -0800 |
| commit | b02b6c708eb56c890cbc9a08c73e9f88c4645fcb (patch) | |
| tree | 5e777a4d18231796e5654856dfb16db8d8a4cd75 /sql/sql_select.h | |
| parent | d4898d174c7e728a66831a299b8dddfd5ca6e802 (diff) | |
| parent | 9c264e4ad27731b17bddf6369792c78ecc91d626 (diff) | |
| download | mariadb-git-b02b6c708eb56c890cbc9a08c73e9f88c4645fcb.tar.gz | |
Auto Merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/opt_range.cc:
Merge
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 9bba4e9318e..086e181d523 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -196,6 +196,7 @@ class JOIN :public Sql_alloc ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select COND *conds; // ---"--- Item *conds_history; // store WHERE for explain + COND_EQUAL *cond_equal; TABLE_LIST *tables_list; //hold 'tables' parameter of mysql_selec SQL_SELECT *select; //created in optimisation phase Item **ref_pointer_array; //used pointer reference for this select @@ -255,6 +256,7 @@ class JOIN :public Sql_alloc ref_pointer_array_size= 0; zero_result_cause= 0; optimized= 0; + cond_equal= 0; fields_list= fields_arg; bzero((char*) &keyuse,sizeof(keyuse)); |