Attachment #217213 for bug #247413

Lines 123-128 Link Here

(-)Makefile (working copy) (+1 lines)
123	GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF	123	GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
124	OPTIONS_SUB= yes	124	OPTIONS_SUB= yes
125	SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \	125	SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \
		126	MARIADB_GROUP="${MARIADB_GROUP}" \
126	MARIADB_RUNDIR="${MARIADB_RUNDIR}" \	127	MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
127	MARIADB_SOCK="${MARIADB_SOCK}"	128	MARIADB_SOCK="${MARIADB_SOCK}"
128	PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \	129	PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \




: ${mysql_enable="NO"}
%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
: ${mysql_user="%%MARIADB_USER%%"}
: ${mysql_group="%%MARIADB_GROUP%%"}
%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${mysql_dbdir="/var/db/mysql"}
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}

                       return 1
               fi
       done
       [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
       if [ ! -d "${mysql_rundir}" ]; then
               install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}" ||
                       return 1
       fi
       if [ ! -d "${mysql_dbdir}/mysql/." ]; then
               mysql_create_auth_tables || return 1
       fi
       [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
       if [ ! -d "${mysql_rundir}" ]; then
               install -d -o ${mysql_user} -g %%MARIADB_GROUP%% "${mysql_rundir}"

       fi
%%LEGACY_LIMITS%%      if checkyesno mysql_limits; then
%%LEGACY_LIMITS%%              eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
%%LEGACY_LIMITS%%      else

Return to bug 247413

Lines 38-43 Link Here

(-)files/mysql-server.in (working copy) (-5 / +6 lines)
38	: ${mysql_enable="NO"}	38	: ${mysql_enable="NO"}
39	%%LEGACY_LIMITS%%: ${mysql_limits="NO"}	39	%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
40	: ${mysql_user="%%MARIADB_USER%%"}	40	: ${mysql_user="%%MARIADB_USER%%"}
		41	: ${mysql_group="%%MARIADB_GROUP%%"}
41	%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"	42	%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
42	: ${mysql_dbdir="/var/db/mysql"}	43	: ${mysql_dbdir="/var/db/mysql"}
43	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}	44	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
Lines 120-133 Link Here
120	return 1	121	return 1
121	fi	122	fi
122	done	123	done
		124	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" \|\| mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
		125	if [ ! -d "${mysql_rundir}" ]; then
		126	install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}" \|\|
		127	return 1
		128	fi
123	if [ ! -d "${mysql_dbdir}/mysql/." ]; then	129	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
124	mysql_create_auth_tables \|\| return 1	130	mysql_create_auth_tables \|\| return 1
125	fi	131	fi
126	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" \|\| mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
127	if [ ! -d "${mysql_rundir}" ]; then
128	install -d -o ${mysql_user} -g %%MARIADB_GROUP%% "${mysql_rundir}"
129
130	fi
131	%%LEGACY_LIMITS%% if checkyesno mysql_limits; then	132	%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
132	%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null	133	%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
133	%%LEGACY_LIMITS%% else	134	%%LEGACY_LIMITS%% else