diff options
| author | unknown <evgen@moonbone.local> | 2005-11-01 19:47:53 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-11-01 19:47:53 +0300 |
| commit | 70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e (patch) | |
| tree | 6c1605103b3513ebad088e2997385997cd4d354f /sql/sql_select.cc | |
| parent | ee380a077782f87d80aae7a8c9c9ead51dfd8e7b (diff) | |
| parent | 03ed0d1d244de2e97c1ca5749f1677d1dbb07f95 (diff) | |
| download | mariadb-git-70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e.tar.gz | |
Manually merged
client/mysqltest.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_select.h:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 61dc7772984..285a5c5696b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -102,8 +102,6 @@ static COND *optimize_cond(JOIN *join, COND *conds, List<TABLE_LIST> *join_list, Item::cond_result *cond_value); static bool resolve_nested_join (TABLE_LIST *table); -static COND *remove_eq_conds(THD *thd, COND *cond, - Item::cond_result *cond_value); static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item); static bool open_tmp_table(TABLE *table); static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param, @@ -7474,7 +7472,7 @@ optimize_cond(JOIN *join, COND *conds, List<TABLE_LIST> *join_list, COND_FALSE always false ( 1 = 2 ) */ -static COND * +COND * remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value) { if (cond->type() == Item::COND_ITEM) |