mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/MAX, UNION
When we create temporary result table for UNION incorrect max_length for YEAR field is used and it leads to incorrect field value and incorrect result string length as YEAR field value calculation depends on field length. The fix is to use underlying item max_length for Item_sum_hybrid::max_length intialization. mysql-test/r/func_group.result: test case mysql-test/t/func_group.test: test case sql/field.cc: added assert sql/item_sum.cc: init Item_sum_hybrid::max_length with use underlying item max_length for INT result type.
This commit is contained in:
@ -5467,6 +5467,7 @@ double Field_year::val_real(void)
|
||||
longlong Field_year::val_int(void)
|
||||
{
|
||||
ASSERT_COLUMN_MARKED_FOR_READ;
|
||||
DBUG_ASSERT(field_length == 2 || field_length == 4);
|
||||
int tmp= (int) ptr[0];
|
||||
if (field_length != 4)
|
||||
tmp%=100; // Return last 2 char
|
||||
@ -5479,6 +5480,7 @@ longlong Field_year::val_int(void)
|
||||
String *Field_year::val_str(String *val_buffer,
|
||||
String *val_ptr __attribute__((unused)))
|
||||
{
|
||||
DBUG_ASSERT(field_length < 5);
|
||||
val_buffer->alloc(5);
|
||||
val_buffer->length(field_length);
|
||||
char *to=(char*) val_buffer->ptr();
|
||||
|
Reference in New Issue
Block a user