revision-id: c04d43a9833865607a2529c29801b52ef2a8c729 () parent(s): 5d0e4ce291ae940feaa8398435158dc56a3db3c4 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2020-03-12 10:32:42 +0300 message: Add MySQL 8 support, part 2 --- .gitignore | 4 ++++ 22-collect-results-mysql.sh | 18 ++++++++++++++++++ 22-run-varchar-mysql.sh | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/.gitignore b/.gitignore index 3bccc18..dc2b0c7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ mysql-boost mysql-8.0 mysql8-data mysql-8.0-data.clean/ +my-mariadb-10.4.cnf +my-mysql-8.0.cnf +mysql-8.0-data +mysql-8.0-vars.sh diff --git a/22-collect-results-mysql.sh b/22-collect-results-mysql.sh new file mode 100644 index 0000000..30a7efb --- /dev/null +++ b/22-collect-results-mysql.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +RES='result-varchars' + +#mkdir $RES + +bash filesort-bench1/06-make-collect-results.sh > $RES/collect-results.sql + +for SERVER in 10.5-old 10.5-new mysql-8.0 ; do + + bash prepare-server.sh -r -m $SERVER + source $SERVER-vars.sh + + $MYSQL $MYSQL_ARGS test < $RES/collect-results.sql | tee $RES/results-$SERVER.txt + +done diff --git a/22-run-varchar-mysql.sh b/22-run-varchar-mysql.sh new file mode 100644 index 0000000..0a73c84 --- /dev/null +++ b/22-run-varchar-mysql.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +RES='result-varchars' + +mkdir $RES + +bash filesort-bench1/06-make-varchar-bench.sh > $RES/varchar-bench.sql + + +for SERVER in 10.5-old 10.5-new mysql-8.0 ; do + + (cd $SERVER; git log -1) > $RES/tree-$SERVER.txt + + bash prepare-server.sh -m $SERVER + source $SERVER-vars.sh + echo $SERVER + $MYSQL $MYSQL_ARGS test < $RES/varchar-bench.sql | tee $RES/varchar-$SERVER.txt + +done