Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
parents 45ea756c 0b5696b8
This diff is collapsed.
...@@ -406,8 +406,8 @@ select count(*) from t1 where x = 18446744073709551601; ...@@ -406,8 +406,8 @@ select count(*) from t1 where x = 18446744073709551601;
create table t2 (x bigint not null); create table t2 (x bigint not null);
insert into t2(x) values (cast(0xfffffffffffffff0+0 as signed)); insert into t2(x) values (-16);
insert into t2(x) values (cast(0xfffffffffffffff1+0 as signed)); insert into t2(x) values (-15);
select * from t2; select * from t2;
select count(*) from t2 where x>0; select count(*) from t2 where x>0;
select count(*) from t2 where x=0; select count(*) from t2 where x=0;
......
...@@ -2349,7 +2349,18 @@ select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5; ...@@ -2349,7 +2349,18 @@ select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
DROP TABLE t1,t2; DROP TABLE t1,t2;
--enable_ps_protocol --enable_ps_protocol
# End of 4.1 tests #
# Bug #22533: storing large hex strings
#
create table t1(a bigint unsigned, b bigint);
insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
(0x10000000000000000, 0x10000000000000000),
(0x8fffffffffffffff, 0x8fffffffffffffff);
select hex(a), hex(b) from t1;
drop table t1;
--echo End of 4.1 tests
# #
# Test for bug #6474 # Test for bug #6474
......
...@@ -4460,18 +4460,31 @@ my_decimal *Item_hex_string::val_decimal(my_decimal *decimal_value) ...@@ -4460,18 +4460,31 @@ my_decimal *Item_hex_string::val_decimal(my_decimal *decimal_value)
int Item_hex_string::save_in_field(Field *field, bool no_conversions) int Item_hex_string::save_in_field(Field *field, bool no_conversions)
{ {
int error;
field->set_notnull(); field->set_notnull();
if (field->result_type() == STRING_RESULT) if (field->result_type() == STRING_RESULT)
return field->store(str_value.ptr(), str_value.length(),
collation.collation);
ulonglong nr;
uint32 length= str_value.length();
if (length > 8)
{ {
error=field->store(str_value.ptr(),str_value.length(),collation.collation); nr= field->flags & UNSIGNED_FLAG ? ULONGLONG_MAX : LONGLONG_MAX;
goto warn;
} }
else nr= (ulonglong) val_int();
if ((length == 8) && !(field->flags & UNSIGNED_FLAG) && (nr > LONGLONG_MAX))
{ {
longlong nr=val_int(); nr= LONGLONG_MAX;
error=field->store(nr, TRUE); // Assume hex numbers are unsigned goto warn;
} }
return error; return field->store((longlong) nr);
warn:
if (!field->store((longlong) nr))
field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE,
1);
return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment