[Commits] 7597ddb: rename mysql-configh.sh to mysql-vars.sh to avoid naming confusion

Sergei Petrunia psergey at askmonty.org
Wed Apr 3 14:01:07 EEST 2019


revision-id: 7597ddb1713e3fbae44574ab925399c88f0f8dea ()
parent(s): 8f1e3889dc57153f6594fef29a110a2be87b2e2e
author: Sergei Petrunia
committer: Sergei Petrunia
timestamp: 2019-04-03 14:01:07 +0300
message:

rename mysql-configh.sh to mysql-vars.sh to avoid naming confusion

---
 mariadb-tpcds-tooling2/02-load-dataset.sh | 6 +++---
 mariadb-tpcds-tooling2/20-run-queries.sh  | 6 +++---
 setup-server/setup-mariadb-current.sh     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mariadb-tpcds-tooling2/02-load-dataset.sh b/mariadb-tpcds-tooling2/02-load-dataset.sh
index 8065ed0..79db23f 100755
--- a/mariadb-tpcds-tooling2/02-load-dataset.sh
+++ b/mariadb-tpcds-tooling2/02-load-dataset.sh
@@ -2,12 +2,12 @@
 
 set -e
 
-if [ ! -f mysql-config.sh ] ; then
-  echo "Cannot find mysql-config.sh - did you setup the db?"
+if [ ! -f mysql-vars.sh ] ; then
+  echo "Cannot find mysql-vars.sh - did you setup the db?"
   exit 1;
 fi
 
-source mysql-config.sh
+source mysql-vars.sh
 echo "Loading data using $MYSQL $MYSQL_ARGS";
 
 # This should fail if the database already exists, right?
diff --git a/mariadb-tpcds-tooling2/20-run-queries.sh b/mariadb-tpcds-tooling2/20-run-queries.sh
index 5cea382..60866bb 100755
--- a/mariadb-tpcds-tooling2/20-run-queries.sh
+++ b/mariadb-tpcds-tooling2/20-run-queries.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [ ! -f mysql-config.sh ] ; then
-  echo "Cannot find mysql-config.sh - did you setup the db?"
+if [ ! -f mysql-vars.sh ] ; then
+  echo "Cannot find mysql-vars.sh - did you setup the db?"
   exit 1;
 fi
 
-source mysql-config.sh
+source mysql-vars.sh
 echo "Running data using $MYSQL $MYSQL_ARGS";
 
 ls queries-for-mysql/*.sql | while read a ; do
diff --git a/setup-server/setup-mariadb-current.sh b/setup-server/setup-mariadb-current.sh
index cc2635d..2e5103a 100755
--- a/setup-server/setup-mariadb-current.sh
+++ b/setup-server/setup-mariadb-current.sh
@@ -72,7 +72,7 @@ innodb_buffer_pool_size=8G
 
 EOF
 
-cat > mysql-config.sh <<EOF
+cat > mysql-vars.sh <<EOF
 MYSQL="./mariadb-$BRANCH/client/mysql"
 MYSQL_SOCKET="--socket=$SOCKETNAME"
 MYSQL_USER="-uroot"


More information about the commits mailing list