From c40b7694d0dbb0781ee7578b5a44f412ce8dae64 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 12 Jun 2013 20:38:22 +0200 Subject: MDEV-4509 mysql init script should accept arguments fix the init script for .deb packages (rpm's were fine already) --- debian/mariadb-server-5.5.mysql.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init index 01e1288525e..ccafc9d0dfe 100644 --- a/debian/mariadb-server-5.5.mysql.init +++ b/debian/mariadb-server-5.5.mysql.init @@ -106,7 +106,7 @@ case "${1:-''}" in test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld # Start MariaDB! - /usr/bin/mysqld_safe > /dev/null 2>&1 & + /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & # 6s was reported in #352070 to be too few when using ndbcluster for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do -- cgit v1.2.1 From 5dee28b1c8f8239699191fbf205b4e8184c57535 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 13 Jun 2013 14:32:57 +0200 Subject: MDEV-703 LP:870310 - killall -9 in init-script --- debian/mariadb-server-5.5.mysql.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init index ccafc9d0dfe..07edda2f079 100644 --- a/debian/mariadb-server-5.5.mysql.init +++ b/debian/mariadb-server-5.5.mysql.init @@ -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 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10; do + for i in `seq 1 600`; do sleep 1 if mysqld_status check_dead nowarn; then server_down=1; break; fi done -- cgit v1.2.1 From e084a2b043137060b01957dd8071677b4d7250d8 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 25 Jul 2013 13:42:06 +0400 Subject: MDEV-4786 - merge 10.0-monty - 10.0 Fixed debian/ubuntu packages build failure. debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch: tmp_user has now extra column, updated patch accordingly. --- .../patches/33_scripts__mysql_create_system_tables__no_test.dpatch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch index 4c84e14bf06..88ed0347cfb 100755 --- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch @@ -20,9 +20,9 @@ DROP TABLE tmp_db; @@ -40,8 +38,6 @@ - REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost'; - REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'',''); - REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'',''); + REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','' FROM dual WHERE LOWER( @current_hostname) != 'localhost'; + REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','',''); + REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','',''); -INSERT INTO tmp_user (host,user) VALUES ('localhost',''); -INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost'; INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; -- cgit v1.2.1