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 | f59ef9eafa076cd5d3ae3aedc609efa457492ebe (patch) | |
tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /sql/item_cmpfunc.cc | |
parent | a0e44ec1e8d2352df6dbf40c959e2115c9884c7e (diff) | |
parent | 2217de25139f5994fc1c5c71f897ff0788813db0 (diff) | |
download | mariadb-git-f59ef9eafa076cd5d3ae3aedc609efa457492ebe.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, |