diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-14 17:03:44 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-14 17:03:44 -0500 |
commit | e6a7a3804d05570d061c05756f3262dab364ce02 (patch) | |
tree | c5293b9ffe7baa9ce42b96d98fd158910501ad5b /debian | |
parent | 9564537cb1a4bfeabd073705fa9359e98fb69145 (diff) | |
download | mariadb-git-e6a7a3804d05570d061c05756f3262dab364ce02.tar.gz |
* mysqld_safe could not start server as it failedmariadb-galera-10.0.7
trying to perform wsrep position recovery.
Fixed by correcting the erroneous mysqld command
by properly quoting it.
* Merged the changes made to Ubuntu rules in previous
revision to Debian rules.
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/dist/Debian/rules | 5 |
1 files changed, 4 insertions, 1 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/; \ |