maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 7
revision-id: hakan@xxxxxxxxxxxx-20100204011810-rqj1ikb41773p0au
parent: hakan@xxxxxxxxxxxx-20100115142922-bgc032k180y2i29r
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: mariadb-tools
timestamp: Thu 2010-02-04 02:18:10 +0100
message:
  Added make install and enabled system tables.

=== modified file 'sql-bench/run-sql-bench.sh'
--- a/sql-bench/run-sql-bench.sh	2010-01-12 12:42:59 +0000
+++ b/sql-bench/run-sql-bench.sh	2010-02-04 01:18:10 +0000
@@ -50,8 +50,9 @@
 #
 # Binaries.
 #
-BZR='/usr/local/bin/bzr'
-MYSQLADMIN='client/mysqladmin'
+#BZR='/usr/local/bin/bzr'
+BZR='/usr/bin/bzr'
+MYSQLADMIN='bin/mysqladmin'
 
 #
 # Check system.
@@ -139,7 +140,9 @@
         exit 1
     fi
 
-    ./configure $MARIADB_CONFIG
+    # We need --prefix for running make install. Otherwise
+    # mysql_install_db does not work properly.
+    ./configure $MARIADB_CONFIG --prefix=${TEMP_DIR}/install
     if [ $? != 0 ]; then
         echo "[ERROR]: ./configure $MARIADB_CONFIG failed."
         echo "  Please check your MARIADB_CONFIG in $i."
@@ -157,10 +160,24 @@
         exit 1
     fi
 
+    make install
+    if [ $? != 0 ]; then
+        echo '[ERROR]: make install.'
+        echo '  Please check your build logs.'
+        echo 'Exiting.'
+
+        exit 1
+    fi
+
+    cd ${TEMP_DIR}/install
+
+    # Install system tables.
+    bin/mysql_install_db --no-defaults --basedir=${TEMP_DIR}/install --datadir=${TEMP_DIR}/data
+
     # Start mysqld.
     MARIADB_SOCKET="${TEMP_DIR}/mysql.sock"
     MARIADB_OPTIONS="$MARIADB_OPTIONS \
-      --datadir=$TEMP_DIR \
+      --datadir=${TEMP_DIR}/data \
       --tmpdir=$TEMP_DIR \
       --socket=$MARIADB_SOCKET"
 
@@ -168,10 +185,10 @@
       --socket=$MARIADB_SOCKET"
  
     # Determine mysqld version for result file naming.
-    MARIADB_VERSION=$(sql/mysqld --version | awk '{ print $3 }')
+    MARIADB_VERSION=$(libexec/mysqld --version | awk '{ print $3 }')
     SUFFIX="$SUFFIX"-"$MARIADB_VERSION"
 
-    sql/mysqld $MARIADB_OPTIONS &
+    libexec/mysqld $MARIADB_OPTIONS &
 
     j=0
     STARTED=-1
@@ -196,15 +213,6 @@
         exit 1
     fi
 
-    $MYSQLADMIN $MYSQLADMIN_OPTIONS create test
-    if [ $? != 0 ]; then
-        echo '[ERROR]: Create schema test failed.'
-        echo '  Please check your mysqld error log.'
-        echo 'Exiting.'
-
-        exit 1
-    fi
-
     # Run sql-bench.
     cd sql-bench
     COMMENTS="Revision used: $REVISION_ID \

=== modified file 'sql-bench/sql-bench-configurations/sql-bench-default-config.inc'
--- a/sql-bench/sql-bench-configurations/sql-bench-default-config.inc	2009-12-29 13:42:53 +0000
+++ b/sql-bench/sql-bench-configurations/sql-bench-default-config.inc	2010-02-04 01:18:10 +0000
@@ -16,11 +16,9 @@
 #
 # Options for starting mysqld.
 #
-# Attention: Do not set --datadir, --tmpdir, and --socket.
+# Attention: Do not set --datadir, --tmpdir, nor --socket.
 #
-export MARIADB_OPTIONS="--no-defaults \
-  --skip-grant-tables \
-  --language=./sql/share/english"
+export MARIADB_OPTIONS="--no-defaults"
 
 #
 # Options for sql-bench.