diff options
| author | Elisamuel Resto | 2010-04-29 13:24:15 -0400 |
|---|---|---|
| committer | Elisamuel Resto | 2010-04-29 20:33:54 -0400 |
| commit | 216d8e8d18ad63bbd00bc3f96e199d04470d9d11 (patch) | |
| tree | c2f02abb28a1cf82d6b7664b0a52641750725a5e | |
| parent | e9b9a2be493f2ba3b6f471607729a283eb3980a1 (diff) | |
database/mysql: move sql-bench and mysql-test to shared; prompt, remove if no
| -rw-r--r-- | database/mysql/HISTORY | 3 | ||||
| -rwxr-xr-x | database/mysql/INSTALL | 15 | ||||
| -rwxr-xr-x | database/mysql/PREPARE | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY index 32773b0173..6865ff4e41 100644 --- a/database/mysql/HISTORY +++ b/database/mysql/HISTORY @@ -1,3 +1,6 @@ +2010-04-29 Elisamuel Resto <ryuji@sourcemage.org> + * PREPARE, INSTALL: move sql-bench and mysql-test to shared; prompt, remove if no + 2010-04-23 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated stable to version 5.1.46 diff --git a/database/mysql/INSTALL b/database/mysql/INSTALL index a99d737807..a571c9881d 100755 --- a/database/mysql/INSTALL +++ b/database/mysql/INSTALL @@ -1,3 +1,14 @@ -make pkglibdir=${TRACK_ROOT}/usr/lib install && -rm -rf ${INSTALL_ROOT}/usr/mysql-test && +make pkglibdir="${TRACK_ROOT}/usr/lib" \ + benchdir_root="${TRACK_ROOT}/usr/share/mysql" \ + testroot="${TRACK_ROOT}/usr/share/mysql" \ + install && + +if [[ $MYSQL_TESTS == n ]]; then + rm -rf "${INSTALL_ROOT}/usr/share/mysql/mysql-test" +fi && + +if [[ $MYSQL_BENCH == n ]]; then + rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench" +fi && + install-info ${INSTALL_ROOT}/usr/share/info/mysql.info --info-dir ${INSTALL_ROOT}/usr/share/info diff --git a/database/mysql/PREPARE b/database/mysql/PREPARE index aecd36e328..49c92408bd 100755 --- a/database/mysql/PREPARE +++ b/database/mysql/PREPARE @@ -1 +1,3 @@ -config_query OLD "Build old 5.0.X series?" n +config_query OLD "Build old 5.0.X series?" n && +config_query MYSQL_TESTS "Install MySQL testing utilities?" n && +config_query MYSQL_BENCH "Install MySQL benchmarking utilities?" n |