diff --git a/storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result b/storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result index d7e54cdae03..2ebc2693dc5 100644 --- a/storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result +++ b/storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result @@ -48,7 +48,7 @@ Bye connection child2_1; SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %'; argument -update `auto_test_remote`.`tbl_a` set `tm` = _utf8mb4'12:00:00' where (`skey` = 0) +update `auto_test_remote`.`tbl_a` set `tm` = _latin1'12:00:00' where (`skey` = 0) SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %' SELECT skey, dt, tm FROM tbl_a ORDER BY skey; skey dt tm diff --git a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test index 31f1d9c4c6c..9cf653e26b4 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test +++ b/storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test @@ -54,7 +54,7 @@ TRUNCATE TABLE mysql.general_log; --disable_query_log echo EXE_MYSQL -v -v -u root -h localhost -P MASTER_1_MYPORT -S MASTER_1_MYSOCK -e "UPDATE tbl_a SET tm = '12:00:00' WHERE skey = 0" auto_test_local; -exec $EXE_MYSQL -v -v -u root -h localhost -P $MASTER_1_MYPORT -S $MASTER_1_MYSOCK -e "UPDATE tbl_a SET tm = '12:00:00' WHERE skey = 0" auto_test_local; +exec $EXE_MYSQL -v -v -u root -h localhost --default-character-set=latin1 -P $MASTER_1_MYPORT -S $MASTER_1_MYSOCK -e "UPDATE tbl_a SET tm = '12:00:00' WHERE skey = 0" auto_test_local; --enable_query_log --connection child2_1 diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index ec638998ff2..e364c7b7f3a 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -1,5 +1,5 @@ /* Copyright (C) 2008-2019 Kentoku Shiba - Copyright (C) 2019, 2020, MariaDB corp + Copyright (C) 2019, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -5862,7 +5862,7 @@ int spider_db_simple_action( #endif default: DBUG_ASSERT(0); - error_num = 0; + error_num = HA_ERR_CRASHED; break; } DBUG_RETURN(error_num);