diff options
author | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
---|---|---|
committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
commit | 5be4c3822691f8bca4c8444ccc77b4b01bc996c1 (patch) | |
tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /sql/item_cmpfunc.cc | |
parent | 169f7da04c4ffc43355d5a632a8013bc4caea39b (diff) | |
parent | 1ba25ae47caace207cda0be2b7994a1a845e6cce (diff) | |
download | mariadb-git-5be4c3822691f8bca4c8444ccc77b4b01bc996c1.tar.gz |
Merge from 5.0 for 43414
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 53feb753844..d229453b795 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -395,11 +395,10 @@ static bool convert_constant_item(THD *thd, Item_field *field_item, ulong orig_sql_mode= thd->variables.sql_mode; enum_check_fields orig_count_cuted_fields= thd->count_cuted_fields; my_bitmap_map *old_maps[2]; - ulonglong orig_field_val; /* original field value if valid */ + ulonglong UNINIT_VAR(orig_field_val); /* original field value if valid */ LINT_INIT(old_maps[0]); LINT_INIT(old_maps[1]); - LINT_INIT(orig_field_val); if (table) dbug_tmp_use_all_columns(table, old_maps, |