revision-id: bcc677bb7264db08b22284998706b44c377ed8ec (mariadb-10.0.36-7-gbcc677bb726) parent(s): b62ac161856570e9a0e92d17de1e3dd31d54410f 1b797e9e6308913c2472f3e04ad253e95a35d59f author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-15 16:48:13 +0200 message: Merge branch '5.5' into 10.0 mysql-test/r/derived_view.result | 6 +++--- mysql-test/r/func_isnull.result | 20 ++++++++++++++++++++ mysql-test/r/func_time.result | 3 +++ mysql-test/r/subselect_mat.result | 6 +++--- mysql-test/r/subselect_sj_mat.result | 6 +++--- mysql-test/suite/rpl/r/rpl_row_spatial.result | 14 ++++++++++++++ mysql-test/suite/rpl/t/rpl_row_spatial.test | 17 +++++++++++++++++ mysql-test/t/func_isnull.test | 16 ++++++++++++++++ mysql-test/t/func_time.test | 4 ++++ sql/item.cc | 2 +- sql/item_cmpfunc.cc | 13 +++++++++++++ sql/item_cmpfunc.h | 1 + sql/key.cc | 3 ++- sql/mysqld.cc | 22 +++++++++++----------- sql/protocol.cc | 8 ++++---- sql/sql_lex.cc | 2 +- sql/sql_list.h | 5 ++++- sql/sql_show.cc | 2 +- sql/sql_time.cc | 2 +- 19 files changed, 122 insertions(+), 30 deletions(-) diff --cc mysql-test/t/func_time.test index 1baded9fef7,361eff170fb..949e5cada2a --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@@ -1695,8 -1626,13 +1695,12 @@@ DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(UUI --enable_warnings DO TO_DAYS(SEC_TO_TIME(MAKEDATE('',RAND(~(''))))); -SELECT TO_DAYS(SEC_TO_TIME(MAKEDATE(0,RAND(~0)))); SELECT SEC_TO_TIME(MAKEDATE(0,RAND(~0))); + # + # MDEV-16810 AddressSanitizer: stack-buffer-overflow in int10_to_str + # + SELECT PERIOD_DIFF(2018, AES_ENCRYPT('Rae Bareli', 'Rae Bareli')); --echo # --echo # End of 5.5 tests diff --cc sql/key.cc index 414c3392cff,7e5a3309b10..f900a1b4527 --- a/sql/key.cc +++ b/sql/key.cc @@@ -147,8 -144,9 +147,9 @@@ void key_copy(uchar *to_key, uchar *fro key_part->key_part_flag & HA_VAR_LENGTH_PART) { key_length-= HA_KEY_BLOB_LENGTH; - length= min(key_length, key_part->length); + length= min<uint>(key_length, key_part->length); - uint bytes= key_part->field->get_key_image(to_key, length, Field::itRAW); + uint bytes= key_part->field->get_key_image(to_key, length, + key_info->flags & HA_SPATIAL ? Field::itMBR : Field::itRAW); if (with_zerofill && bytes < length) bzero((char*) to_key + bytes, length - bytes); to_key+= HA_KEY_BLOB_LENGTH; diff --cc sql/mysqld.cc index 75d6cca7fda,aa749e5aaef..9643f0699d1 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@@ -6395,8 -5857,8 +6394,9 @@@ pthread_handler_t handle_connections_na /* Host is unknown */ thd->security_ctx->host= my_strdup(my_localhost, MYF(0)); create_new_thread(thd); + set_current_thd(0); } + LocalFree(saPipeSecurity.lpSecurityDescriptor); CloseHandle(connectOverlapped.hEvent); DBUG_LEAVE; decrement_handler_count();