From 04dac63d71302e4f7140202732f395aa328ce986 Mon Sep 17 00:00:00 2001

From: root <root@localhost.localdomain>

Date: Wed, 27 Oct 2021 17:55:45 +0800

Subject: [PATCH] case2

---

 sql/my_decimal.cc | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc

index 338f78d8..c6a3f2d1 100644

--- a/sql/my_decimal.cc

+++ b/sql/my_decimal.cc

@@ -204,6 +204,10 @@ int my_decimal2binary(uint mask, const my_decimal *d, uchar *bin, int prec,

 {

   int err1= E_DEC_OK, err2;

   my_decimal rounded;

+  if ((void*)0 == d)

+  {

+    return check_result(mask, E_DEC_TRUNCATED);

+  }

   my_decimal2decimal(d, &rounded);

   rounded.frac= decimal_actual_fraction(&rounded);

   if (scale < rounded.frac)

--

2.27.0

Version: '10.2.42-MariaDB-debug-log'  

211118 13:50:03 [ERROR] mysqld got signal 11 ;

Server version: 10.2.42-MariaDB-debug-log

sigaction.c:0(__restore_rt)[0x7fc50ae233c0]

sql/my_decimal.h:106(my_decimal::operator=(my_decimal const&))[0x55c6258faec7]

sql/my_decimal.h:271(my_decimal2decimal(my_decimal const*, my_decimal*))[0x55c6258fb21c]

sql/my_decimal.cc:208(my_decimal2binary(unsigned int, my_decimal const*, unsigned char*, int, int))[0x55c625bac4f5]

sql/filesort.cc:1159(Type_handler_decimal_result::make_sort_key(unsigned char*, Item*, SORT_FIELD_ATTR const*, Sort_param*) const)[0x55c62585ef58]

sql/item.h:939(Item::make_sort_key(unsigned char*, Item*, SORT_FIELD_ATTR const*, Sort_param*) const)[0x55c62500fec0]

sql/filesort.cc:1206(make_sortkey(Sort_param*, unsigned char*, unsigned char*))[0x55c62585f39f]

sql/filesort.cc:885(find_all_keys(THD*, Sort_param*, SQL_SELECT*, SORT_INFO*, st_io_cache*, st_io_cache*, Bounded_queue<unsigned char, unsigned char>*, unsigned long long*))[0x55c62585cc4f]

sql/filesort.cc:275(filesort(THD*, TABLE*, Filesort*, Filesort_tracker*, JOIN*, unsigned long long))[0x55c625858820]

sql/sql_update.cc:572(mysql_update(THD*, TABLE_LIST*, List<Item>&, List<Item>&, Item*, unsigned int, st_order*, unsigned long long, enum_duplicates, bool, unsigned long long*, unsigned long long*))[0x55c6254af6ac]

sql/sql_parse.cc:4056(mysql_execute_command(THD*))[0x55c62522b742]

sql/sql_parse.cc:7793(mysql_parse(THD*, char*, unsigned int, Parser_state*, bool, bool))[0x55c625244e16]

sql/sql_parse.cc:1830(dispatch_command(enum_server_command, THD*, char*, unsigned int, bool, bool))[0x55c62521e01b]

sql/sql_parse.cc:1381(do_command(THD*))[0x55c62521ade6]

sql/sql_connect.cc:1336(do_handle_one_connection(CONNECT*))[0x55c6255a6e48]

sql/sql_connect.cc:1242(handle_one_connection)[0x55c6255a670b]

perfschema/pfs.cc:1871(pfs_spawn_thread)[0x55c6269461f2]

nptl/pthread_create.c:478(start_thread)[0x7fc50ae17609]

/lib/x86_64-linux-gnu/libc.so.6(clone+0x43)[0x7fc50a9f0293]

Query (0x62b000000290): update tb1 set col1= case 11 when 0 then 'x' when 'x' then 'x' end order by col1,(select 2555555555.5555555555 union select 0 union select -1),col2 desc,col2,col1

mysqltest: At line 3: query 'update tb1 set col1= case 11 when 0 then 'x' when 'x' then 'x' end order by col1,(select 2555555555.5555555555 union select 0 union select -1),col2 desc,col2,col1' failed: 1242: Subquery returns more than 1 row

create table tb1 ( col1 int unique,col2 int unique);

insert into tb1 (col1,col2) values (100,200);

update tb1 set col1= case 11 when 0 then 'x' when 'x' then 'x' end order by

col1,(select 2555555555.5555555555 union select 0 union select -1 limit 1),col2 desc,col2,col1;

mysqltest: At line 3: query 'update tb1 set col1= case 11 when 0 then 'x' when 'x' then 'x' end order by

col1,(select 2555555555.5555555555 union select 0 union select -1 limit 1),col2 desc,col2,col1' failed: 1292: Truncated incorrect DOUBLE value: 'x'

sanja@SanjasLaptop:~/maria/git/10.3/mysql-test$ vim log

sanja@SanjasLaptop:~/maria/git/10.3/mysql-test$ git diff

diff --git a/sql/filesort.cc b/sql/filesort.cc

index 8b019caf8f5..186700a1215 100644

--- a/sql/filesort.cc

+++ b/sql/filesort.cc

@@ -1147,13 +1147,13 @@ Type_handler_decimal_result::make_sort_key(uchar *to, Item *item,

                                            Sort_param *param) const

 {

   my_decimal dec_buf, *dec_val= item->val_decimal_result(&dec_buf);

-  if (item->maybe_null)

-  {

     if (item->null_value)

     {

       memset(to, 0, sort_field->length + 1);

       return;

     }

+  if (item->maybe_null)

+  {

     *to++= 1;

   }

   my_decimal2binary(E_DEC_FATAL_ERROR, dec_val, to,