From 6ead860060ebeae29f46d6c89f0bf7a45e748819 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 15 Jan 2005 17:38:43 +0200 Subject: After merge fixes Fix for BIT(X) field as string mysql-test/r/func_gconcat.result: Fix wrong merge mysql-test/r/func_sapdb.result: Use results so that dimitry can fix them properly mysql-test/r/innodb.result: Update test after fast TRUNCATE in InnoDB mysql-test/r/ps_1general.result: After megre fixes mysql-test/r/type_bit.result: New test to verify patch for Bit fields mysql-test/t/ps_1general.test: After merge fixes mysql-test/t/type_bit.test: New test to verify patch for Bit fields sql/field.cc: Fix for new my_strntod() Fix for BIT(X) field as string sql/item.h: Fix for new my_strntod() sql/item_func.h: Fix for new my_strntod() sql/item_sum.h: Fix for new my_strntod() sql/procedure.h: Fix for new my_strntod() sql/sql_base.cc: Port fix for INSERT DELAYED with prepared statements to 5.0 --- sql/item_func.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'sql/item_func.h') diff --git a/sql/item_func.h b/sql/item_func.h index 4657ee81dfb..fb8d77d5b83 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -834,15 +834,19 @@ public: String *val_str(String *); double val_real() { - int err; - String *res; res=val_str(&str_value); - return res ? my_strntod(res->charset(),(char*) res->ptr(),res->length(),0,&err) : 0.0; + int err_not_used; + char *end_not_used; + String *res; + res= val_str(&str_value); + return res ? my_strntod(res->charset(),(char*) res->ptr(), + res->length(), &end_not_used, &err_not_used) : 0.0; } longlong val_int() { - int err; + int err_not_used; String *res; res=val_str(&str_value); - return res ? my_strntoll(res->charset(),res->ptr(),res->length(),10,(char**) 0,&err) : (longlong) 0; + return res ? my_strntoll(res->charset(),res->ptr(),res->length(),10, + (char**) 0, &err_not_used) : (longlong) 0; } enum Item_result result_type () const { return STRING_RESULT; } void fix_length_and_dec(); -- cgit v1.2.1