diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-10-02 16:26:22 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-10-02 16:26:22 +0300 |
| commit | b722aebdf4cd73be88e2ae6768dce05276f52076 (patch) | |
| tree | ef285295d685ce5f89ad049a88c0439176f28563 /debian | |
| parent | 2f7d7c9f7f7b8da68de4bed21f167e316c600a0e (diff) | |
| download | mariadb-git-b722aebdf4cd73be88e2ae6768dce05276f52076.tar.gz | |
Fixed installation issues on debian:
- Don't abort if plugin table exists
- Use longer timeout for start/stop of mysqld
debian/dist/Debian/mariadb-server-5.5.postinst:
Don't abort if plugin table exists
debian/mariadb-server-5.5.mysql.init:
Use longer timeout for start/stop of mysqld
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/mariadb-server-5.5.postinst | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-5.5.mysql.init | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/dist/Debian/mariadb-server-5.5.postinst b/debian/dist/Debian/mariadb-server-5.5.postinst index 2e15b121db9..4da8979fd03 100644 --- a/debian/dist/Debian/mariadb-server-5.5.postinst +++ b/debian/dist/Debian/mariadb-server-5.5.postinst @@ -212,7 +212,7 @@ EOF # admin might already have chosen to remove one or more plugins. Newlines are necessary. install_plugins=`/bin/echo -e \ "USE mysql;\n" \ - "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ + "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init index b83316aedea..01e1288525e 100644 --- a/debian/mariadb-server-5.5.mysql.init +++ b/debian/mariadb-server-5.5.mysql.init @@ -109,7 +109,7 @@ case "${1:-''}" in /usr/bin/mysqld_safe > /dev/null 2>&1 & # 6s was reported in #352070 to be too few when using ndbcluster - for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-14}"); do + for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do sleep 1 if mysqld_status check_alive nowarn ; then break; fi log_progress_msg "." @@ -142,7 +142,7 @@ case "${1:-''}" in log_daemon_msg "Killing MariaDB database server by signal" "mysqld" killall -15 mysqld server_down= - for i in 1 2 3 4 5 6 7 8 9 10; do + for i in 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10; do sleep 1 if mysqld_status check_dead nowarn; then server_down=1; break; fi done |