database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-29184 Assertion `0' in Item_row::illegal_method_call, Type_handler_row::Item_update_null_value, Item::update_null_value

Browse Source 
- Moving the check_cols(1) test from fix_fields() to fix_length_and_dec().
  So the test is now done before the code calling val_decimal()
  in fix_length_and_dec().

- Removing Item_func_interval::fix_fields(), as it become equal
  to the inherited one.
This commit is contained in:
Alexander Barkov
2024-11-01 12:40:43 +04:00
parent 3734ff7c7e
commit dd41be2a51
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/main/func_set.result
View File

@@ -224,3 +224,8 @@ SELECT INTERVAL(1,ROW(1,2));
ERROR 21000: Operand should contain 1 column(s) ERROR 21000: Operand should contain 1 column(s)
SELECT INTERVAL(ROW(1,2),1); SELECT INTERVAL(ROW(1,2),1);
ERROR 21000: Operand should contain 1 column(s) ERROR 21000: Operand should contain 1 column(s)
#
# MDEV-29184 Assertion `0' in Item_row::illegal_method_call, Type_handler_row::Item_update_null_value, Item::update_null_value
#
SELECT INTERVAL(0, ROW(1,1), 1, 1, 1, 1, 1, 1, 1) AS f;
ERROR 21000: Operand should contain 1 column(s)

8
mysql-test/main/func_set.test
View File

@@ -147,3 +147,11 @@ SELECT INTERVAL(ROW(1,1),ROW(1,2));
SELECT INTERVAL(1,ROW(1,2)); SELECT INTERVAL(1,ROW(1,2));
--error ER_OPERAND_COLUMNS --error ER_OPERAND_COLUMNS
SELECT INTERVAL(ROW(1,2),1); SELECT INTERVAL(ROW(1,2),1);
--echo #
--echo # MDEV-29184 Assertion `0' in Item_row::illegal_method_call, Type_handler_row::Item_update_null_value, Item::update_null_value
--echo #
--error ER_OPERAND_COLUMNS
SELECT INTERVAL(0, ROW(1,1), 1, 1, 1, 1, 1, 1, 1) AS f;

15
sql/item_cmpfunc.cc
View File

@@ -1951,22 +1951,15 @@ bool Item_func_opt_neg::eq(const Item *item, bool binary_cmp) const
} }
bool Item_func_interval::fix_fields(THD *thd, Item **ref) bool Item_func_interval::fix_length_and_dec()
{ {
if (Item_long_func::fix_fields(thd, ref)) uint rows= row->cols();
return true;
for (uint i= 0 ; i < row->cols(); i++) for (uint i= 0 ; i < rows; i++)
{ {
if (row->element_index(i)->check_cols(1)) if (row->element_index(i)->check_cols(1))
return true; return true;
} }
return false;
}
bool Item_func_interval::fix_length_and_dec()
{
uint rows= row->cols();
use_decimal_comparison= ((row->element_index(0)->result_type() == use_decimal_comparison= ((row->element_index(0)->result_type() ==
DECIMAL_RESULT) || DECIMAL_RESULT) ||

1
sql/item_cmpfunc.h
View File

@@ -1120,7 +1120,6 @@ public:
Item_func_interval(THD *thd, Item_row *a): Item_func_interval(THD *thd, Item_row *a):
Item_long_func(thd, a), row(a), intervals(0) Item_long_func(thd, a), row(a), intervals(0)
{ } { }
bool fix_fields(THD *, Item **) override;
longlong val_int() override; longlong val_int() override;
bool fix_length_and_dec() override; bool fix_length_and_dec() override;
LEX_CSTRING func_name_cstring() const override LEX_CSTRING func_name_cstring() const override