diff options
| author | Julien ROZO | 2009-02-01 22:44:34 +0100 |
|---|---|---|
| committer | Julien ROZO | 2009-02-01 22:44:34 +0100 |
| commit | 0f374a1bbb68431af80860eee62bd8f9286b32ec (patch) | |
| tree | 697bd79513fa9cf0bb04bb17902e5b100ee06b83 | |
| parent | edb4fd45f402994afacfa0bd4496fa7726f9a1ef (diff) | |
mysql: switched subdepends to uppercase in PRE_SUB_DEPENDS and SUB_DEPENDS
(fixed bug #15054)
added REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS
| -rw-r--r-- | database/mysql/HISTORY | 5 | ||||
| -rwxr-xr-x | database/mysql/PRE_SUB_DEPENDS | 4 | ||||
| -rwxr-xr-x | database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS | 5 | ||||
| -rwxr-xr-x | database/mysql/SUB_DEPENDS | 18 |
4 files changed, 21 insertions, 11 deletions
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY index dea62a19bb..bf99e838ff 100644 --- a/database/mysql/HISTORY +++ b/database/mysql/HISTORY @@ -1,3 +1,8 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org + * PRE_SUB_DEPENDS, SUB_DEPENDS: switched subdepends to uppercase + (fixed bug #15054) + * REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS: added + 2009-01-30 Julien "_kaze_" ROZO <julien@rozo.org * PRE_SUB_DEPENDS, SUB_DEPENDS: added forced InnoDB storage engine support diff --git a/database/mysql/PRE_SUB_DEPENDS b/database/mysql/PRE_SUB_DEPENDS index d9899846bd..b79f83d974 100755 --- a/database/mysql/PRE_SUB_DEPENDS +++ b/database/mysql/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in - embedded) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0; fi;; - innodb) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]]; then return 0; fi;; + embedded|EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0; fi;; + innodb|INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]]; then return 0; fi;; esac return 1 diff --git a/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS b/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..c8aeb071b9 --- /dev/null +++ b/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0; fi;; + INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]]; then return 0; fi;; +esac +return 1 diff --git a/database/mysql/SUB_DEPENDS b/database/mysql/SUB_DEPENDS index 857f695a30..b31384a1b6 100755 --- a/database/mysql/SUB_DEPENDS +++ b/database/mysql/SUB_DEPENDS @@ -1,11 +1,11 @@ case $THIS_SUB_DEPENDS in - embedded) echo "Embbeded mysql requested, forcing it." && - MSQL_EMBED="--with-embedded-server" ;; - innodb) echo "InnoDB storage engine support requested, forcing it." && - if [ "$MSQL_ENGINES" == "none" ]; then - MSQL_ENGINES="InnoDB" - else - MSQL_ENGINES="$MSQL_ENGINES InnoDB" - fi ;; - *) echo "unknown sub-depends!"; return 1 ;; + embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." && + MSQL_EMBED="--with-embedded-server" ;; + innodb|INNODB) echo "InnoDB storage engine support requested, forcing it." && + if [ "$MSQL_ENGINES" == "none" ]; then + MSQL_ENGINES="InnoDB" + else + MSQL_ENGINES="$MSQL_ENGINES InnoDB" + fi ;; + *) echo "unknown sub-depends!"; return 1 ;; esac |