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

Proposed by Henrik Ingo on 2010-10-22
Status: Merged
Approved by: Hakan Küçükyılmaz on 2010-10-22
Approved revision: 56
Merged at revision: 55
Proposed branch: lp:~hingo/mariadb-tools/hingo
Merge into: lp:mariadb-tools
Diff against target: 98 lines (+23/-5)
6 files modified
sysbench/conf/au0013.inc (+5/-0)
sysbench/conf/lu0012.inc (+5/-0)
sysbench/conf/perro.inc (+5/-0)
sysbench/conf/work.inc (+5/-0)
sysbench/run-sysbench-myisam.sh (+1/-2)
sysbench/run-sysbench.sh (+2/-3)
To merge this branch: bzr merge lp:~hingo/mariadb-tools/hingo
Reviewer Review Type Date Requested Status
Hakan Küçükyılmaz 2010-10-22 Approve on 2010-10-22
Review via email: mp+39135@code.launchpad.net

Description of the change

More small fixes.

To post a comment you must log in.

Your changes make sense. Thanks for your commitment to the details. I am merging in the changes right now.

Ok to push.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sysbench/conf/au0013.inc'
2--- sysbench/conf/au0013.inc 2010-04-09 19:13:59 +0000
3+++ sysbench/conf/au0013.inc 2010-10-22 11:57:45 +0000
4@@ -10,6 +10,11 @@
5 # Adjust the following paths according to your installation.
6 #
7
8+# Base directory where sysbench files are found
9+BASE="${HOME}/work"
10+TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
11+
12+
13 # We need sysbench >= v0.5.
14 SYSBENCH='/usr/local/bin/sysbench'
15
16
17=== modified file 'sysbench/conf/lu0012.inc'
18--- sysbench/conf/lu0012.inc 2010-04-09 19:13:59 +0000
19+++ sysbench/conf/lu0012.inc 2010-10-22 11:57:45 +0000
20@@ -10,6 +10,11 @@
21 # Adjust the following paths according to your installation.
22 #
23
24+# Base directory where sysbench files are found
25+BASE="${HOME}/work"
26+TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
27+
28+
29 # We need sysbench >= v0.5.
30 SYSBENCH='/usr/local/bin/sysbench'
31
32
33=== modified file 'sysbench/conf/perro.inc'
34--- sysbench/conf/perro.inc 2010-04-09 19:13:59 +0000
35+++ sysbench/conf/perro.inc 2010-10-22 11:57:45 +0000
36@@ -10,6 +10,11 @@
37 # Adjust the following paths according to your installation.
38 #
39
40+# Base directory where sysbench files are found
41+BASE="${HOME}/work"
42+TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
43+
44+
45 # We need sysbench >= v0.5.
46 SYSBENCH='/usr/local/bin/sysbench'
47
48
49=== modified file 'sysbench/conf/work.inc'
50--- sysbench/conf/work.inc 2010-04-09 19:13:59 +0000
51+++ sysbench/conf/work.inc 2010-10-22 11:57:45 +0000
52@@ -10,6 +10,11 @@
53 # Adjust the following paths according to your installation.
54 #
55
56+# Base directory where sysbench files are found
57+BASE="${HOME}/work"
58+TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
59+
60+
61 # We need sysbench >= v0.5.
62 SYSBENCH='/usr/local/bin/sysbench'
63
64
65=== modified file 'sysbench/run-sysbench-myisam.sh'
66--- sysbench/run-sysbench-myisam.sh 2010-10-19 09:17:52 +0000
67+++ sysbench/run-sysbench-myisam.sh 2010-10-22 11:57:45 +0000
68@@ -132,9 +132,8 @@
69
70 #
71 # Directories.
72+# ${BASE} and ${TEMP_DIR} are defined in the $HOSTNAME.inc configuration file.
73 #
74-BASE="${HOME}/work"
75-TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
76 RESULT_DIR="${BASE}/sysbench-results"
77 SYSBENCH_DB_BACKUP="${TEMP_DIR}/sysbench_db"
78
79
80=== modified file 'sysbench/run-sysbench.sh'
81--- sysbench/run-sysbench.sh 2010-10-19 09:12:53 +0000
82+++ sysbench/run-sysbench.sh 2010-10-22 11:57:45 +0000
83@@ -1,4 +1,4 @@
84-/#!/bin/bash
85+#!/bin/bash
86 #
87 # Run sysbench tests with MariaDB and MySQL
88 #
89@@ -124,9 +124,8 @@
90
91 #
92 # Directories.
93+# ${BASE} and ${TEMP_DIR} are defined in the $HOSTNAME.inc configuration file.
94 #
95-BASE="${HOME}/work"
96-TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
97 RESULT_DIR="${BASE}/sysbench-results"
98 SYSBENCH_DB_BACKUP="${TEMP_DIR}/sysbench_db"
99

Subscribers

People subscribed via source and target branches