Merge lp:~hingo/mariadb-tools/hingo into lp:mariadb-tools

Proposed by Henrik Ingo on 2010-10-19
Status: Merged
Approved by: Hakan Küçükyılmaz on 2010-10-19
Approved revision: 54
Merged at revision: 53
Proposed branch: lp:~hingo/mariadb-tools/hingo
Merge into: lp:mariadb-tools
Diff against target: 31 lines (+3/-3)
2 files modified
sysbench/run-sysbench-myisam.sh (+1/-1)
sysbench/run-sysbench.sh (+2/-2)
To merge this branch: bzr merge lp:~hingo/mariadb-tools/hingo
Reviewer Review Type Date Requested Status
Hakan Küçükyılmaz 2010-10-19 Approve on 2010-10-19
Review via email: mp+38814@code.launchpad.net

Description of the change

Hi Hakan

I fixed an error message in run-sysbench*.sh as it was confusing me.

To post a comment you must log in.

Hi Henrik,

thanks for your fixes.

All changes are OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sysbench/run-sysbench-myisam.sh'
2--- sysbench/run-sysbench-myisam.sh 2010-04-12 23:28:32 +0000
3+++ sysbench/run-sysbench-myisam.sh 2010-10-19 09:19:43 +0000
4@@ -57,7 +57,7 @@
5 # Read system dependent settings.
6 #
7 if [ ! -f conf/${HOSTNAME}.inc ]; then
8- echo "[ERROR]: Could not find config file: conf/${HOSTNAME}.conf."
9+ echo "[ERROR]: Could not find config file: conf/${HOSTNAME}.inc."
10 echo " Please create one."
11
12 exit 1
13
14=== modified file 'sysbench/run-sysbench.sh'
15--- sysbench/run-sysbench.sh 2010-04-12 23:28:32 +0000
16+++ sysbench/run-sysbench.sh 2010-10-19 09:19:43 +0000
17@@ -1,4 +1,4 @@
18-#!/bin/bash
19+/#!/bin/bash
20 #
21 # Run sysbench tests with MariaDB and MySQL
22 #
23@@ -45,7 +45,7 @@
24 # Read system dependent settings.
25 #
26 if [ ! -f conf/${HOSTNAME}.inc ]; then
27- echo "[ERROR]: Could not find config file: conf/${HOSTNAME}.conf."
28+ echo "[ERROR]: Could not find config file: conf/${HOSTNAME}.inc."
29 echo " Please create one."
30
31 exit 1

Subscribers

People subscribed via source and target branches