diff options
author | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
---|---|---|
committer | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
commit | dfd59e296e2c267a21f1ea8b3b937e07730dad0d (patch) | |
tree | e5ac1517ff3dccc42352b7bac39ecd1c093d0ae6 /sql/sql_select.h | |
parent | 1541f2e7949416d6e172ef6406ecf140d3b26659 (diff) | |
parent | 61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff) | |
download | mariadb-git-dfd59e296e2c267a21f1ea8b3b937e07730dad0d.tar.gz |
Merge 4.1 -> 5.0.
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index e1fc5d1c1fe..07b94b0afed 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -436,4 +436,4 @@ bool cp_buffer_from_ref(TABLE_REF *ref); bool error_if_full_join(JOIN *join); int report_error(TABLE *table, int error); int safe_index_read(JOIN_TAB *tab); -COND *eliminate_not_funcs(COND *cond); +COND *eliminate_not_funcs(THD *thd, COND *cond); |