diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
| commit | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (patch) | |
| tree | 0777df9a8dc587b70851c1edc0cfe96895928717 /storage/rocksdb/mysql-test/rocksdb/t | |
| parent | 6053eb1ce278ac1f566cd74498506bf457d6d048 (diff) | |
| parent | f35d1721039f8f115fc55e8f4b4d2bb4012161d1 (diff) | |
| download | mariadb-git-66ec3a770f7854f500ece66c78f3c87c9cd6da15.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb/t')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test b/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test index 3ebdd67a1a6..aee653830e2 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test @@ -30,7 +30,7 @@ $MYSQL_SLAP --silent --delimiter=";" --query="select * from a1 where b=1" --conc wait EOF ---exec bash $MYSQL_TMP_DIR/concurrent_alter.sh +--exec sh $MYSQL_TMP_DIR/concurrent_alter.sh let $server_charset=`select @@character_set_server`; --replace_result $server_charset DEFAULT_CHARSET |