* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.

* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.

15 files changed, 127 insertions, 44 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 236e5540c0d..7ac06093410 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
 Standards-Version: 3.8.3
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -182,23 +182,27 @@ Description: MariaDB database regression test suite
  .
  This package includes the regression test suite.
 
-Package: mariadb-server-10.0
+Package: mariadb-galera-server-10.0
 Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version})
-Provides: mariadb-server, mysql-server, virtual-mysql-server
-Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), galera (>=25.2)
+Provides: mariadb-server-core, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
+Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5, 
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Description: MariaDB database server binaries
+Description: MariaDB database server with Galera cluster binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
@@ -206,14 +210,14 @@ Description: MariaDB database server binaries
  .
  This package includes the server binaries.
 
-Package: mariadb-server
+Package: mariadb-galera-server
 Section: database
 Architecture: all
-Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database server (metapackage depending on the latest version)
+Depends: mariadb-galera-server-10.0 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.0), as determined by the MariaDB
- maintainers. Install this package if in doubt about which MariaDB
+ mariadb-galera-server (currently mariadb-galera-server-10.0), as determined by the MariaDB
+ maintainers. Install this package if in doubt about which MariaDB-Galera
  version you need. That will install the version recommended by the
  package maintainers.
  .
diff --git a/debian/dist/Debian/mariadb-server-10.0.README.Debian b/debian/dist/Debian/mariadb-galera-server-10.0.README.Debian
index f398f2fa236..f398f2fa236 100644
--- a/debian/dist/Debian/mariadb-server-10.0.README.Debian
+++ b/debian/dist/Debian/mariadb-galera-server-10.0.README.Debian
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.dirs b/debian/dist/Debian/mariadb-galera-server-10.0.dirs
index 4eef28f62e1..5379d2b713f 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.dirs
+++ b/debian/dist/Debian/mariadb-galera-server-10.0.dirs
@@ -5,7 +5,7 @@ usr/bin
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-usr/share/doc/mariadb-server-10.0
+usr/share/doc/mariadb-galera-server-10.0
 usr/support-files
 var/run/mysqld
 var/lib/mysql-upgrade
diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-galera-server-10.0.files.in
index 5002204e75d..28a64355c48 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files.in
+++ b/debian/dist/Debian/mariadb-galera-server-10.0.files.in
@@ -1,7 +1,9 @@
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
+usr/sbin/mysqld
+usr/lib/mysql/plugin/ha_innodb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/ha_sequence.so
-usr/lib/mysql/plugin/ha_sphinx.so
 usr/lib/mysql/plugin/ha_xtradb.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
@@ -42,9 +44,14 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mysqldump
+usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_xtrabackup
 usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
 usr/share/doc/mariadb-server-10.0/INFO_SRC
 usr/share/doc/mariadb-server-10.0/INFO_BIN
+usr/share/doc/mariadb-galera-server-10.0/README-wsrep
 usr/share/lintian/overrides/mariadb-server-10.0
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
@@ -68,6 +75,31 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
@@ -79,3 +111,5 @@ usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
 @SPIDER_DEB_FILES@
 @TOKUDB_DEB_FILES@
+usr/share/mysql/wsrep.cnf
+usr/share/mysql/wsrep_notify
diff --git a/debian/dist/Debian/mariadb-server-10.0.postinst b/debian/dist/Debian/mariadb-galera-server-10.0.postinst
index 9f79b61fd05..fb1f710eb89 100644
--- a/debian/dist/Debian/mariadb-server-10.0.postinst
+++ b/debian/dist/Debian/mariadb-galera-server-10.0.postinst
@@ -21,7 +21,7 @@ invoke() {
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --default-storage-engine=myisam"
 
 test_mysql_access() {
        mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
diff --git a/debian/dist/Debian/mariadb-server-10.0.postrm b/debian/dist/Debian/mariadb-galera-server-10.0.postrm
index 469b1627aff..469b1627aff 100644
--- a/debian/dist/Debian/mariadb-server-10.0.postrm
+++ b/debian/dist/Debian/mariadb-galera-server-10.0.postrm
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 04f3426e464..28071e6fb45 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -166,11 +166,11 @@ install: build
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
 	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
 
-	# mariadb-server
+	# mariadb-galera-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.0/examples
+	mkdir -p $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples
 	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
-	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.0/examples/
+	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples/
 	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
 	       $(TMP)/usr/share/mysql/config-*.cnf \
 	       $(TMP)/usr/share/mysql/mi_test_all* \
@@ -182,15 +182,15 @@ install: build
 	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 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN
+	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
 
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
 
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
-	cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0
+	cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0
 
 	# For 5.0 -> 10.0 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 410e992429c..844e857fba4 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -145,10 +145,16 @@ Package: mariadb-server-core-10.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
-Conflicts: mysql-server-5.0,
+Conflicts: mariadb-server-5.1 (<< 5.1.60),
+    mariadb-server-5.2 (<< 5.2.10),
+    mariadb-server-5.3 (<< 5.3.3),
+    mysql-server-5.0,
     mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
     mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
-Replaces: mysql-server-5.0,
+Replaces: mariadb-server-5.1 (<< 5.1.60),
+    mariadb-server-5.2 (<< 5.2.10),
+    mariadb-server-5.3 (<< 5.3.3),
+    mysql-server-5.0,
     mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
     mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
 Description: MariaDB database core server files
@@ -176,23 +182,27 @@ Description: MariaDB database regression test suite
  .
  This package includes the regression test suite.
 
-Package: mariadb-server-10.0
+Package: mariadb-galera-server-10.0
 Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version})
-Provides: mariadb-server, mysql-server, virtual-mysql-server
-Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}), galera (>=25.2)
+Provides: mariadb-server-core, mysql-server-core-5.5, mariadb-galera-server, mysql-server, virtual-mysql-server
+Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5, 
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5,
     mariadb-tokudb-engine-5.5, mariadb-tokudb-engine-10.0
-Description: MariaDB database server binaries
+Description: MariaDB database server with Galera cluster binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
@@ -200,14 +210,14 @@ Description: MariaDB database server binaries
  .
  This package includes the server binaries.
 
-Package: mariadb-server
+Package: mariadb-galera-server
 Section: database
 Architecture: all
-Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database server (metapackage depending on the latest version)
+Depends: mariadb-galera-server-10.0 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.0), as determined by the MariaDB
- maintainers. Install this package if in doubt about which MariaDB
+ mariadb-galera-server (currently mariadb-galera-server-10.0), as determined by the MariaDB
+ maintainers. Install this package if in doubt about which MariaDB-Galera
  version you need. That will install the version recommended by the
  package maintainers.
  .
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian b/debian/dist/Ubuntu/mariadb-galera-server-10.0.README.Debian
index 741243f1ec3..741243f1ec3 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.README.Debian
diff --git a/debian/dist/Debian/mariadb-server-10.0.dirs b/debian/dist/Ubuntu/mariadb-galera-server-10.0.dirs
index 4eef28f62e1..5379d2b713f 100644
--- a/debian/dist/Debian/mariadb-server-10.0.dirs
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.dirs
@@ -5,7 +5,7 @@ usr/bin
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-usr/share/doc/mariadb-server-10.0
+usr/share/doc/mariadb-galera-server-10.0
 usr/support-files
 var/run/mysqld
 var/lib/mysql-upgrade
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in
index a5d25598aa2..f0b1a9a1349 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in
@@ -1,5 +1,8 @@
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
+usr/sbin/mysqld
+usr/lib/mysql/plugin/ha_innodb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_xtradb.so
 usr/lib/mysql/plugin/handlersocket.so
@@ -43,9 +46,14 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mysqldump
+usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_xtrabackup
 usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
 usr/share/doc/mariadb-server-10.0/INFO_SRC
 usr/share/doc/mariadb-server-10.0/INFO_BIN
+usr/share/doc/mariadb-galera-server-10.0/README-wsrep
 usr/share/lintian/overrides/mariadb-server-10.0
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
@@ -69,6 +77,31 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
@@ -80,3 +113,5 @@ usr/share/mysql/mysql_test_data_timezone.sql
 @CASSANDRA_DEB_FILES@
 @SPIDER_DEB_FILES@
 @TOKUDB_DEB_FILES@
+usr/share/mysql/wsrep.cnf
+usr/share/mysql/wsrep_notify
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postinst b/debian/dist/Ubuntu/mariadb-galera-server-10.0.postinst
index 6e81fdba7ce..a827f3c8356 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.postinst
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.postinst
@@ -21,7 +21,7 @@ invoke() {
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --default-storage-engine=myisam"
 
 test_mysql_access() {
        mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postrm b/debian/dist/Ubuntu/mariadb-galera-server-10.0.postrm
index 7cee5150ef9..7cee5150ef9 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.postrm
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.postrm
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.py b/debian/dist/Ubuntu/mariadb-galera-server-10.0.py
index b0537b4bd6b..b0537b4bd6b 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.py
+++ b/debian/dist/Ubuntu/mariadb-galera-server-10.0.py
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 9432b19697f..e0e562136c9 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -166,11 +166,11 @@ install: build
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
 	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
 
-	# mariadb-server
+	# mariadb-galera-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.0/examples
+	mkdir -p $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples
 	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
-	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-10.0/examples/
+	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples/
 	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
 	       $(TMP)/usr/share/mysql/config-*.cnf \
 	       $(TMP)/usr/share/mysql/mi_test_all* \
@@ -182,15 +182,15 @@ install: build
 	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 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN
+	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
 
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
 
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
-	cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0
+	cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0
 
 	# For 5.0 -> 10.0 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
@@ -202,7 +202,7 @@ install: build
 	# install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
 	# install Apport hook
-	install -D -m 644 debian/mariadb-server-10.0.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.0.py
+	install -D -m 644 debian/mariadb-galera-server-10.0.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.0.py
 
 	autorm=debian/autorm-file;                                      \
 	rm -f $$autorm;                                                 \