Tools for MariaDB

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

  1. hingo
  2. Merge into trunk
Proposed by Henrik Ingo
Status: Merged
Approved by: Hakan Küçükyılmaz
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 Approve
Review via email: mp+39135@code.launchpad.net

Description of the change

More small fixes.

To post a comment you must log in.
Revision history for this message
Hakan Küçükyılmaz (hakan-askmonty) wrote :

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

Revision history for this message
Hakan Küçükyılmaz (hakan-askmonty) wrote :

Ok to push.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sysbench/conf/au0013.inc'
--- sysbench/conf/au0013.inc 2010-04-09 19:13:59 +0000
+++ sysbench/conf/au0013.inc 2010-10-22 11:57:45 +0000
@@ -10,6 +10,11 @@
10# Adjust the following paths according to your installation.10# Adjust the following paths according to your installation.
11#11#
1212
13# Base directory where sysbench files are found
14BASE="${HOME}/work"
15TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
16
17
13# We need sysbench >= v0.5.18# We need sysbench >= v0.5.
14SYSBENCH='/usr/local/bin/sysbench'19SYSBENCH='/usr/local/bin/sysbench'
1520
1621
=== modified file 'sysbench/conf/lu0012.inc'
--- sysbench/conf/lu0012.inc 2010-04-09 19:13:59 +0000
+++ sysbench/conf/lu0012.inc 2010-10-22 11:57:45 +0000
@@ -10,6 +10,11 @@
10# Adjust the following paths according to your installation.10# Adjust the following paths according to your installation.
11#11#
1212
13# Base directory where sysbench files are found
14BASE="${HOME}/work"
15TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
16
17
13# We need sysbench >= v0.5.18# We need sysbench >= v0.5.
14SYSBENCH='/usr/local/bin/sysbench'19SYSBENCH='/usr/local/bin/sysbench'
1520
1621
=== modified file 'sysbench/conf/perro.inc'
--- sysbench/conf/perro.inc 2010-04-09 19:13:59 +0000
+++ sysbench/conf/perro.inc 2010-10-22 11:57:45 +0000
@@ -10,6 +10,11 @@
10# Adjust the following paths according to your installation.10# Adjust the following paths according to your installation.
11#11#
1212
13# Base directory where sysbench files are found
14BASE="${HOME}/work"
15TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
16
17
13# We need sysbench >= v0.5.18# We need sysbench >= v0.5.
14SYSBENCH='/usr/local/bin/sysbench'19SYSBENCH='/usr/local/bin/sysbench'
1520
1621
=== modified file 'sysbench/conf/work.inc'
--- sysbench/conf/work.inc 2010-04-09 19:13:59 +0000
+++ sysbench/conf/work.inc 2010-10-22 11:57:45 +0000
@@ -10,6 +10,11 @@
10# Adjust the following paths according to your installation.10# Adjust the following paths according to your installation.
11#11#
1212
13# Base directory where sysbench files are found
14BASE="${HOME}/work"
15TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
16
17
13# We need sysbench >= v0.5.18# We need sysbench >= v0.5.
14SYSBENCH='/usr/local/bin/sysbench'19SYSBENCH='/usr/local/bin/sysbench'
1520
1621
=== modified file 'sysbench/run-sysbench-myisam.sh'
--- sysbench/run-sysbench-myisam.sh 2010-10-19 09:17:52 +0000
+++ sysbench/run-sysbench-myisam.sh 2010-10-22 11:57:45 +0000
@@ -132,9 +132,8 @@
132132
133#133#
134# Directories.134# Directories.
135# ${BASE} and ${TEMP_DIR} are defined in the $HOSTNAME.inc configuration file.
135#136#
136BASE="${HOME}/work"
137TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
138RESULT_DIR="${BASE}/sysbench-results"137RESULT_DIR="${BASE}/sysbench-results"
139SYSBENCH_DB_BACKUP="${TEMP_DIR}/sysbench_db"138SYSBENCH_DB_BACKUP="${TEMP_DIR}/sysbench_db"
140139
141140
=== modified file 'sysbench/run-sysbench.sh'
--- sysbench/run-sysbench.sh 2010-10-19 09:12:53 +0000
+++ sysbench/run-sysbench.sh 2010-10-22 11:57:45 +0000
@@ -1,4 +1,4 @@
1/#!/bin/bash1#!/bin/bash
2#2#
3# Run sysbench tests with MariaDB and MySQL3# Run sysbench tests with MariaDB and MySQL
4#4#
@@ -124,9 +124,8 @@
124124
125#125#
126# Directories.126# Directories.
127# ${BASE} and ${TEMP_DIR} are defined in the $HOSTNAME.inc configuration file.
127#128#
128BASE="${HOME}/work"
129TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db"
130RESULT_DIR="${BASE}/sysbench-results"129RESULT_DIR="${BASE}/sysbench-results"
131SYSBENCH_DB_BACKUP="${TEMP_DIR}/sysbench_db"130SYSBENCH_DB_BACKUP="${TEMP_DIR}/sysbench_db"
132131

Subscribers

People subscribed via source and target branches