summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-24 09:27:09 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-24 09:35:36 +0200
commit8b647d6960a04acb8bbfb3de11fea88ae822544d (patch)
treea4e77fa347bc26e325aeb11d992e6fabbcad7f53
parentf7599f47999bb197dba36e54d0d5677b3b15f12a (diff)
downloadmariadb-git-8b647d6960a04acb8bbfb3de11fea88ae822544d.tar.gz
MDEV-22020: Fix spider/bugfix.return_found_rows_update
The test failed to specify default-character-set when invoking the client. The compile-time default parameters of the client could be overridden by configuration files in /etc/mysql. Let us explicitly specify --default-character-set.
-rw-r--r--storage/spider/mysql-test/spider/bugfix/t/return_found_rows_update.test2
1 files changed, 1 insertions, 1 deletions
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