summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <evgen@sunlight.local>2007-04-28 00:04:50 +0400
committerunknown <evgen@sunlight.local>2007-04-28 00:04:50 +0400
commit51d19e32429255e95d6800fef904abfa1e5fc173 (patch)
treef402ee6944894d6eb86a4cea8d8fa9f17ace0708 /sql/item_cmpfunc.cc
parent17fbe3b209ef752f9338c94a204d144bafcc7e38 (diff)
downloadmariadb-git-51d19e32429255e95d6800fef904abfa1e5fc173.tar.gz
Additional fix for the bug#27590.
tests/mysql_client_test.c: Fixed failing build on the windows platform. mysql-test/r/ps_7ndb.result: The result of the adjusted test case after fix for bug#27590. mysql-test/r/ps_6bdb.result: The result of the adjusted test case after fix for bug#27590. sql/item_cmpfunc.cc: A warning is fixed.
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 8d38b71ca4d..169c017c914 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -544,7 +544,7 @@ static ulonglong
get_date_from_str(THD *thd, String *str, timestamp_type warn_type,
char *warn_name, bool *error_arg)
{
- ulonglong value;
+ ulonglong value= 0;
int error;
MYSQL_TIME l_time;
enum_mysql_timestamp_type ret;
@@ -748,7 +748,7 @@ static ulonglong
get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
Item *warn_item, bool *is_null)
{
- ulonglong value;
+ ulonglong value= 0;
String buf, *str= 0;
Item *item= **item_arg;