diff options
| -rwxr-xr-x | debian/dist/Debian/rules | 5 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 28071e6fb45..9802425363a 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -177,10 +177,11 @@ install: build $(TMP)/usr/share/mysql/mysql-log-rotate \ $(TMP)/usr/share/mysql/mysql.server \ $(TMP)/usr/share/mysql/binary-configure - nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.0/mysqld.sym.gz + nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ + install -m 0644 Docs/README-wsrep $(TMP)/usr/share/doc/mariadb-galera-server-10.0/README-wsrep install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN @@ -190,7 +191,9 @@ install: build # lintian overrides mkdir -p $(TMP)/usr/share/lintian/overrides/ + cp debian/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0 + cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0 # For 5.0 -> 10.0 transition d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index a76e821df48..31bbfe264ec 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -233,7 +233,7 @@ wsrep_recover_position() { log_notice "WSREP: Running position recovery with --log_error=$wr_logfile" - eval_log_error $mysqld_cmd --log_error=$wr_logfile --wsrep-recover + eval_log_error "$mysqld_cmd --log_error=$wr_logfile --wsrep-recover" local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)" if [ -z "$rp" ]; then |