Commit b722aebd authored by Michael Widenius's avatar Michael Widenius

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
parent 2f7d7c9f
...@@ -212,7 +212,7 @@ EOF ...@@ -212,7 +212,7 @@ EOF
# admin might already have chosen to remove one or more plugins. Newlines are necessary. # admin might already have chosen to remove one or more plugins. Newlines are necessary.
install_plugins=`/bin/echo -e \ install_plugins=`/bin/echo -e \
"USE mysql;\n" \ "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 '', " \ " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
" PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" `
......
...@@ -109,7 +109,7 @@ case "${1:-''}" in ...@@ -109,7 +109,7 @@ case "${1:-''}" in
/usr/bin/mysqld_safe > /dev/null 2>&1 & /usr/bin/mysqld_safe > /dev/null 2>&1 &
# 6s was reported in #352070 to be too few when using ndbcluster # 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 sleep 1
if mysqld_status check_alive nowarn ; then break; fi if mysqld_status check_alive nowarn ; then break; fi
log_progress_msg "." log_progress_msg "."
...@@ -142,7 +142,7 @@ case "${1:-''}" in ...@@ -142,7 +142,7 @@ case "${1:-''}" in
log_daemon_msg "Killing MariaDB database server by signal" "mysqld" log_daemon_msg "Killing MariaDB database server by signal" "mysqld"
killall -15 mysqld killall -15 mysqld
server_down= 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 sleep 1
if mysqld_status check_dead nowarn; then server_down=1; break; fi if mysqld_status check_dead nowarn; then server_down=1; break; fi
done done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment