mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2020-03-24 09:54:08 +02:00
commit 5f5c63e0fe
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result
View file

@ -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

2
storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test
View file

@ -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

4
storage/spider/spd_db_conn.cc
View file

@ -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);