diff options
author | jani@ua141d10.elisa.omakaista.fi <> | 2005-03-01 22:19:19 +0200 |
---|---|---|
committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-03-01 22:19:19 +0200 |
commit | 111e1cb29dded82943e5b562a6e9168dbeb1f19f (patch) | |
tree | 701e55a57172693eb5cc80b3d8c70b8a5e5305f2 /sql/sql_select.cc | |
parent | 62b9fc5da6dcf32a32aa375ab202ac0ffb15e7fe (diff) | |
download | mariadb-git-111e1cb29dded82943e5b562a6e9168dbeb1f19f.tar.gz |
Fix for Bug#5615 and merge from 4.1
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cbe7937355c..e886c658444 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7593,10 +7593,10 @@ const_expression_in_where(COND *cond, Item *comp_item, Item **const_item) new_created field */ -static Field* create_tmp_field_from_field(THD *thd, Field* org_field, - Item *item, TABLE *table, - bool modify_item, - uint convert_blob_length) +Field* create_tmp_field_from_field(THD *thd, Field* org_field, + Item *item, TABLE *table, + bool modify_item, + uint convert_blob_length) { Field *new_field; |