diff options
| author | evgen@moonbone.local <> | 2005-11-01 17:34:19 +0300 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2005-11-01 17:34:19 +0300 |
| commit | 47059b89f5b78b22c5333be8dab7d8c871105d9a (patch) | |
| tree | e4fa11fd449f07a0ad374fccdf48f662aefd2cdc /sql/sql_select.cc | |
| parent | 19502e8eb5a79f04611458ec3784373b756a7948 (diff) | |
| parent | 77723c2438f0fba7cd19e6b746391ede7e3135da (diff) | |
| download | mariadb-git-47059b89f5b78b22c5333be8dab7d8c871105d9a.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14186-bug-4.1-mysql
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 f057e30b6eb..5ef3f4d9fda 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -69,8 +69,6 @@ static int return_zero_rows(JOIN *join, select_result *res,TABLE_LIST *tables, SELECT_LEX_UNIT *unit); static COND *optimize_cond(THD *thd, COND *conds, Item::cond_result *cond_value); -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, @@ -4615,7 +4613,7 @@ optimize_cond(THD *thd, COND *conds, Item::cond_result *cond_value) 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) |