At file:///Users/hakan/work/monty_program/mariadb-tools/
------------------------------------------------------------
revno: 30
revision-id: hakan@askmonty.org-20100331181651-pxx2ep0u5658d6q1
parent: hakan@askmonty.org-20100329105306-6hthpbelo9xop3kw
committer: Hakan Kuecuekyilmaz
branch nick: mariadb-tools
timestamp: Wed 2010-03-31 20:16:51 +0200
message:
Added necessary options for mysql client calls.
=== modified file 'sysbench/run-sysbench-myisam.sh'
--- a/sysbench/run-sysbench-myisam.sh 2010-03-29 10:53:06 +0000
+++ b/sysbench/run-sysbench-myisam.sh 2010-03-31 18:16:51 +0000
@@ -70,6 +70,7 @@
# Variables.
#
MY_SOCKET="/tmp/mysql.sock"
+MYSQL_OPTIONS="-uroot --socket=$MY_SOCKET"
MYSQLADMIN_OPTIONS="--no-defaults -uroot --socket=$MY_SOCKET"
MYSQLD_OPTIONS="--no-defaults \
--datadir=$DATA_DIR \
@@ -334,10 +335,11 @@
start_mysqld
sync
+ echo ""
echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting warm up of $WARM_UP_TIME seconds."
$SYSBENCH $SYSBENCH_OPTIONS_WARM_UP run
sync
- echo 'FLUSH STATUS' | $MYSQL -uroot
+ echo 'FLUSH STATUS' | $MYSQL $MYSQL_OPTIONS
echo "[$(date "+%Y-%m-%d %H:%M:%S")] Finnished warm up."
echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting actual sysbench run."
@@ -345,7 +347,7 @@
grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt
- echo 'SELECT * FROM INFORMATION_SCHEMA.KEY_CACHES' | $MYSQL -uroot > ${THIS_RESULT_DIR}/key_cache_stats${k}.txt
+ echo 'SELECT * FROM INFORMATION_SCHEMA.KEY_CACHES' | $MYSQL $MYSQL_OPTIONS > ${THIS_RESULT_DIR}/key_cache_stats${k}.txt
k=$(($k + 1))
done
=== modified file 'sysbench/run-sysbench.sh'
--- a/sysbench/run-sysbench.sh 2010-03-25 01:42:05 +0000
+++ b/sysbench/run-sysbench.sh 2010-03-31 18:16:51 +0000
@@ -327,6 +327,7 @@
start_mysqld
sync
+ echo ""
echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting warm up of $WARM_UP_TIME seconds."
$SYSBENCH $SYSBENCH_OPTIONS_WARM_UP run
sync
