- merged from MYSQL_5_1 branch (1.144.2.1)

[packages/mysql.git] / mysql.init

diff --git a/mysql.init b/mysql.init
index f1b3e48d4840d9773902f955a08055b7748b93c2..b606ab668aa7603413ac0dd8b9984bdec431ae3f 100644 (file)
--- a/mysql.init
+++ b/mysql.init
@@ -196,8 +196,8 @@ mysqlgetconfig() {
                gsub(/\r$/, "");
 
                # trim spaces
-               gsub(/^[\t ]*|[\t ]*$/, "", $1);
-               gsub(/^[\t ]*|[\t ]*$/, "", $2);
+               gsub(/^[\t ]+|[\t ]+$/, "", $1);
+               gsub(/^[\t ]+|[\t ]+$/, "", $2);
        }
 
        # skip comments and empty lines
@@ -210,21 +210,21 @@ mysqlgetconfig() {
        }
 
        section == "mysqld" {
-               if ($1 ~ /^datadir[ \t]*$/) {
+               if ($1 == "datadir") {
                        printf("MYSQL_DATA_DIR=%s;", $2);
-               } else if ($1 ~ /^user[ \t]*$/) {
+               } else if ($1 == "user") {
                        printf("MYSQL_USER=%s;", $2);
-               } else if ($1 ~ /^pid-file[ \t]*$/) {
+               } else if ($1 == "pid-file") {
                        printf("MYSQL_PIDFILE=%s;", $2);
-               } else if ($1 ~ /^socket[ \t]*$/) {
+               } else if ($1 == "socket") {
                        printf("MYSQL_SOCKET=%s;", $2);
-               } else if ($1 ~ /^port[ \t]*$/) {
+               } else if ($1 == "port") {
                        printf("MYSQL_PORT=%s;", $2);
-               } else if ($1 ~ /^bind-address[ \t]*$/) {
+               } else if ($1 == "bind-address") {
                        printf("MYSQL_BIND_ADDRESS=%s;", $2);
-               } else if ($1 ~ /^skip-networking[ \t]*$/) {
+               } else if ($1 == "skip-networking") {
                        printf("MYSQL_SKIP_NETWORKING=1;");
-               } else if ($1 ~ /^log-error[ \t]*$/) {
+               } else if ($1 == "log-error") {
                        printf("MYSQL_LOG_ERROR=%s;", $2);
                }
        }