Attachment 868034 Details for Bug 1069586 – Proposed patch

[patch] Proposed patch

bug1069586-proposed.patch (text/plain), 3.49 KB, created by Honza Horak on 2014-02-26 14:06:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2014-02-26 14:06:13 UTC

Size: 3.49 KB

patch

obsolete

>diff --git a/README.mysql-cnf b/README.mysql-cnf
>new file mode 100644
>index 0000000..65bebb9
>--- /dev/null
>+++ b/README.mysql-cnf
>@@ -0,0 +1,13 @@
>+This directory contains prepared configuration files with .cnf extension,
>+which provide a configuration for some common MariaDB deployment scenarios.
>+These configuration files do not include the default configuration of datadir,
>+log-file and pid-file locations, as specified in the default my.cnf file,
>+provided in this distribution.
>+
>+Thus, it is recommended to use these configuration files as an addition to the
>+default my.cnf configuration file.
>+
>+Since default my.cnf contains `!includedir /etc/my.cnf.d` directive, it is
>+recommended to copy required configuration under /etc/my.cnf.d/ directory,
>+so the default my.cnf specifications will be extended.
>+
>diff --git a/mariadb-wait-ready b/mariadb-wait-ready
>index ead58e0..16f397c 100644
>--- a/mariadb-wait-ready
>+++ b/mariadb-wait-ready
>@@ -27,22 +27,17 @@ get_mysql_option mysqld datadir "/var/lib/mysql"
> datadir="$result"
> get_mysql_option mysqld socket "/var/lib/mysql/mysql.sock"
> socketfile="$result"
>-get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
>-mypidfile="$result"
> 
> # Wait for the server to come up or for the mysqld process to disappear
> ret=0
> while /bin/true; do
>-	MYSQLDRUNNING=0
>-	if [ -f "$mypidfile" ]; then
>-	    MYSQLPID=`cat "$mypidfile" 2>/dev/null`
>-	    if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then
>-		MYSQLDRUNNING=1
>-	    fi
>+	if ! [ -d "/proc/$daemon_pid" ] ; then
>+            ret=1
>+            break
> 	fi
> 	RESPONSE=`/usr/bin/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
> 	mret=$?
>-	if [ $mret -eq 0 ] && [ $MYSQLDRUNNING -eq 1 ]; then
>+	if [ $mret -eq 0 ]; then
> 	    break
> 	fi
> 	# exit codes 1, 11 (EXIT_CANNOT_CONNECT_TO_SERVICE) are expected,
>@@ -54,11 +49,6 @@ while /bin/true; do
> 	# "Access denied" also means the server is alive
> 	echo "$RESPONSE" | grep -q "Access denied for user" && break
> 
>-	# Check process still exists
>-	if ! /bin/kill -0 $daemon_pid 2>/dev/null; then
>-	    ret=1
>-	    break
>-	fi
> 	sleep 1
> done
> 
>diff --git a/mariadb.spec b/mariadb.spec
>index 8066843..d7a4a10 100644
>--- a/mariadb.spec
>+++ b/mariadb.spec
>@@ -35,6 +35,7 @@ Source12: mariadb-prepare-db-dir
> Source13: mariadb-wait-ready
> Source14: rh-skipped-tests-base.list
> Source15: rh-skipped-tests-arm.list
>+Source16: README.mysql-cnf
> # Working around perl dependency checking bug in rpm FTTB. Remove later.
> Source999: filter-requires-mysql.sh
> 
>@@ -463,6 +464,8 @@ echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
> # copy additional docs into build tree so %%doc will find them
> cp -p %{SOURCE6} README.mysql-docs
> cp -p %{SOURCE7} README.mysql-license
>+cp -p %{SOURCE7} README.mysql-cnf
>+install -p -m 0644 README.mysql-cnf ${RPM_BUILD_ROOT}%{_datadir}/mysql/README.mysql-cnf
> 
> # install the list of skipped tests to be available for user runs
> install -p -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test
>@@ -604,8 +607,6 @@ fi
> %{_datadir}/mysql/charsets
> 
> %files server
>-%doc support-files/*.cnf
>-
> %{_bindir}/myisamchk
> %{_bindir}/myisam_ftdump
> %{_bindir}/myisamlog
>@@ -681,7 +682,8 @@ fi
> %{_datadir}/mysql/mysql_system_tables_data.sql
> %{_datadir}/mysql/mysql_test_data_timezone.sql
> %{_datadir}/mysql/mysql_performance_tables.sql
>-%{_datadir}/mysql/my-*.cnf
>+%doc %{_datadir}/mysql/my-*.cnf
>+%doc %{_datadir}/mysql/README.mysql-cnf
> %{_datadir}/mysql/config.*.ini
> 
> %{_unitdir}/mariadb.service

Actions: View | Diff

Attachments on bug 1069586: 867958 | 868034 | 871131 | 871417 | 871494