[arch-commits] Commit in mariadb/repos (22 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sat May 9 12:28:19 UTC 2015
Date: Saturday, May 9, 2015 @ 14:28:18
Author: bpiotrowski
Revision: 238754
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mariadb/repos/extra-i686/PKGBUILD
(from rev 238753, mariadb/trunk/PKGBUILD)
mariadb/repos/extra-i686/mariadb-10.0.18-MDEV-8115.patch
(from rev 238753, mariadb/trunk/mariadb-10.0.18-MDEV-8115.patch)
mariadb/repos/extra-i686/mariadb-post.sh
(from rev 238753, mariadb/trunk/mariadb-post.sh)
mariadb/repos/extra-i686/mariadb-tmpfile.conf
(from rev 238753, mariadb/trunk/mariadb-tmpfile.conf)
mariadb/repos/extra-i686/mariadb.install
(from rev 238753, mariadb/trunk/mariadb.install)
mariadb/repos/extra-i686/mariadb.service
(from rev 238753, mariadb/trunk/mariadb.service)
mariadb/repos/extra-x86_64/PKGBUILD
(from rev 238753, mariadb/trunk/PKGBUILD)
mariadb/repos/extra-x86_64/mariadb-10.0.18-MDEV-8115.patch
(from rev 238753, mariadb/trunk/mariadb-10.0.18-MDEV-8115.patch)
mariadb/repos/extra-x86_64/mariadb-post.sh
(from rev 238753, mariadb/trunk/mariadb-post.sh)
mariadb/repos/extra-x86_64/mariadb-tmpfile.conf
(from rev 238753, mariadb/trunk/mariadb-tmpfile.conf)
mariadb/repos/extra-x86_64/mariadb.install
(from rev 238753, mariadb/trunk/mariadb.install)
mariadb/repos/extra-x86_64/mariadb.service
(from rev 238753, mariadb/trunk/mariadb.service)
Deleted:
mariadb/repos/extra-i686/PKGBUILD
mariadb/repos/extra-i686/mariadb-post.sh
mariadb/repos/extra-i686/mariadb-tmpfile.conf
mariadb/repos/extra-i686/mariadb.install
mariadb/repos/extra-i686/mariadb.service
mariadb/repos/extra-x86_64/PKGBUILD
mariadb/repos/extra-x86_64/mariadb-post.sh
mariadb/repos/extra-x86_64/mariadb-tmpfile.conf
mariadb/repos/extra-x86_64/mariadb.install
mariadb/repos/extra-x86_64/mariadb.service
----------------------------------------------+
/PKGBUILD | 334 +++++++++++++++++++++++++
/mariadb-post.sh | 16 +
/mariadb-tmpfile.conf | 2
/mariadb.install | 66 ++++
/mariadb.service | 32 ++
extra-i686/PKGBUILD | 165 ------------
extra-i686/mariadb-10.0.18-MDEV-8115.patch | 61 ++++
extra-i686/mariadb-post.sh | 8
extra-i686/mariadb-tmpfile.conf | 1
extra-i686/mariadb.install | 33 --
extra-i686/mariadb.service | 16 -
extra-x86_64/PKGBUILD | 165 ------------
extra-x86_64/mariadb-10.0.18-MDEV-8115.patch | 61 ++++
extra-x86_64/mariadb-post.sh | 8
extra-x86_64/mariadb-tmpfile.conf | 1
extra-x86_64/mariadb.install | 33 --
extra-x86_64/mariadb.service | 16 -
17 files changed, 572 insertions(+), 446 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-i686/PKGBUILD 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,165 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.0.18
-_pkgver=${pkgver/.a/a}
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
- 'jemalloc' 'lz4')
-source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
- mariadb.service
- mariadb-post.sh
- mariadb-tmpfile.conf)
-md5sums=('eab4f9303883d33558c0059af9e30aa4'
- 'd488fffa9f62f9949c4aa1bb6e6db692'
- 'b79e65a5aa536e6b5bc60988eb0b78a2'
- '2fa6e456964d4ff5e6d4f9ff0126aed6')
-
-prepare() {
- sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
- $pkgbase-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
-}
-
-build() {
- mkdir build
- cd build
-
- cmake ../$pkgbase-$_pkgver \
- -DCMAKE_AR=/usr/bin/gcc-ar \
- -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_general_ci \
- -DENABLED_LOCAL_INFILE=ON \
- -DINSTALL_INFODIR=share/mysql/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_DOCREADMEDIR=share/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_DOCDIR=share/mysql/docs \
- -DINSTALL_SHAREDIR=share/mysql \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_PCRE=system \
- -DWITH_LIBWRAP=OFF \
- -DWITH_JEMALLOC=ON \
- -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITH_TOKUDB_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
- -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
- -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
- -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
-
- make
-}
-
-package_libmariadbclient() {
- pkgdesc='MariaDB client libraries'
- depends=('openssl' 'libaio' 'zlib' 'pcre')
- conflicts=('libmysqlclient')
- provides=("libmysqlclient=$pkgver")
- options=('staticlibs')
-
- cd build
- for dir in include libmysql libmysqld libservices; do
- make -C $dir DESTDIR="$pkgdir" install
- done
-
- install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
- install -d "$pkgdir"/usr/share/man/man1
- for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
- install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
- done
-
- rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
-}
-
-package_mariadb-clients() {
- pkgdesc='MariaDB client tools'
- depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
- conflicts=('mysql-clients')
- provides=("mysql-clients=$pkgver")
-
- cd build
- make -C client DESTDIR="$pkgdir" install
-
- # install man pages
- install -d "$pkgdir"/usr/share/man/man1
- for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
- install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
- done
-
- # provided by mariadb
- rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-
-}
-
-package_mytop() {
- pkgdesc='Top clone for MariaDB'
- depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
-
- cd build
- install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
-}
-
-package_mariadb() {
- pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
- backup=('etc/mysql/my.cnf')
- install=mariadb.install
- depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
- 'lz4')
- optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
- conflicts=('mysql')
- provides=("mysql=$pkgver")
- options=('emptydirs')
-
- cd build
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
- install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
- install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
- install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
-
- install -dm700 var/lib/mysql
- chown -R 89:89 var/lib/mysql &>/dev/null
-
- # provided by libmariadbclient
- cd "$pkgdir"
- rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm usr/lib/libmysql*
- rm -r usr/include/
- rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
- # provided by mariadb-clients
- rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
- rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
- # provided by mytop
- rm usr/bin/mytop
-
- # not needed
- rm -r usr/{data,mysql-test,sql-bench}
- rm usr/share/man/man1/mysql-test-run.pl.1
-}
Copied: mariadb/repos/extra-i686/PKGBUILD (from rev 238753, mariadb/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,167 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=10.0.18
+_pkgver=${pkgver/.a/a}
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
+ 'jemalloc' 'lz4')
+source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+ mariadb.service
+ mariadb-post.sh
+ mariadb-tmpfile.conf
+ mariadb-10.0.18-MDEV-8115.patch)
+md5sums=('eab4f9303883d33558c0059af9e30aa4'
+ 'd488fffa9f62f9949c4aa1bb6e6db692'
+ 'b79e65a5aa536e6b5bc60988eb0b78a2'
+ '2fa6e456964d4ff5e6d4f9ff0126aed6'
+ '4be445c305df3cca61aa9a40a1886964')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../mariadb-10.0.18-MDEV-8115.patch
+}
+
+build() {
+ mkdir build
+ cd build
+
+ cmake ../$pkgbase-$_pkgver \
+ -DCMAKE_AR=/usr/bin/gcc-ar \
+ -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/mysql/docs \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_PCRE=system \
+ -DWITH_LIBWRAP=OFF \
+ -DWITH_JEMALLOC=ON \
+ -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITH_TOKUDB_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+ -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
+ -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
+ -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+
+ make
+}
+
+package_libmariadbclient() {
+ pkgdesc='MariaDB client libraries'
+ depends=('openssl' 'libaio' 'zlib' 'pcre')
+ conflicts=('libmysqlclient')
+ provides=("libmysqlclient=$pkgver")
+ options=('staticlibs')
+
+ cd build
+ for dir in include libmysql libmysqld libservices; do
+ make -C $dir DESTDIR="$pkgdir" install
+ done
+
+ install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
+ install -d "$pkgdir"/usr/share/man/man1
+ for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+ install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+ done
+
+ rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
+}
+
+package_mariadb-clients() {
+ pkgdesc='MariaDB client tools'
+ depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
+ conflicts=('mysql-clients')
+ provides=("mysql-clients=$pkgver")
+
+ cd build
+ make -C client DESTDIR="$pkgdir" install
+
+ # install man pages
+ install -d "$pkgdir"/usr/share/man/man1
+ for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+ install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+ done
+
+ # provided by mariadb
+ rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+
+}
+
+package_mytop() {
+ pkgdesc='Top clone for MariaDB'
+ depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
+
+ cd build
+ install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
+}
+
+package_mariadb() {
+ pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
+ backup=('etc/mysql/my.cnf')
+ install=mariadb.install
+ depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
+ 'lz4')
+ optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
+ conflicts=('mysql')
+ provides=("mysql=$pkgver")
+ options=('emptydirs')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+ install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+ install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+ install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+ install -dm700 var/lib/mysql
+ chown -R 89:89 var/lib/mysql &>/dev/null
+
+ # provided by libmariadbclient
+ cd "$pkgdir"
+ rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm usr/lib/libmysql*
+ rm -r usr/include/
+ rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+ # provided by mariadb-clients
+ rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+ # provided by mytop
+ rm usr/bin/mytop
+
+ # not needed
+ rm -r usr/{data,mysql-test,sql-bench}
+ rm usr/share/man/man1/mysql-test-run.pl.1
+}
Copied: mariadb/repos/extra-i686/mariadb-10.0.18-MDEV-8115.patch (from rev 238753, mariadb/trunk/mariadb-10.0.18-MDEV-8115.patch)
===================================================================
--- extra-i686/mariadb-10.0.18-MDEV-8115.patch (rev 0)
+++ extra-i686/mariadb-10.0.18-MDEV-8115.patch 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,61 @@
+From 0014bdc7eef141dcd66930e853242b3be4960831 Mon Sep 17 00:00:00 2001
+From: Sergei Golubchik <serg at mariadb.org>
+Date: Thu, 7 May 2015 22:18:34 +0200
+Subject: [PATCH] MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
+
+on REPAIR don't do table-specific stuff for views
+(because even if the view has a temp table opened for it,
+it's not opened all the way down the engine. In particular,
+Aria crashes in maria_status() because MARIA_HA* info - that is
+table->table->file->file - is NULL)
+---
+ mysql-test/r/repair.result | 7 +++++++
+ mysql-test/t/repair.test | 9 +++++++++
+ sql/sql_admin.cc | 2 +-
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
+index 52ae9c3..51c3374 100644
+--- a/mysql-test/r/repair.result
++++ b/mysql-test/r/repair.result
+@@ -207,3 +207,10 @@ check table t1;
+ Table Op Msg_type Msg_text
+ test.t1 check status OK
+ drop table t1;
++create table t1 (a blob);
++create view v1 as select * from t1;
++repair view v1;
++Table Op Msg_type Msg_text
++test.v1 repair status OK
++drop view v1;
++drop table t1;
+diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
+index 337b73f..f625965 100644
+--- a/mysql-test/t/repair.test
++++ b/mysql-test/t/repair.test
+@@ -208,3 +208,12 @@ repair table t1 use_frm;
+ select count(*) from t1;
+ check table t1;
+ drop table t1;
++
++#
++# MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
++#
++create table t1 (a blob);
++create view v1 as select * from t1;
++repair view v1;
++drop view v1;
++drop table t1;
+diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
+index 44057b6..9827c67 100644
+--- a/sql/sql_admin.cc
++++ b/sql/sql_admin.cc
+@@ -901,7 +901,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
+ break;
+ }
+ }
+- if (table->table)
++ if (table->table && !table->view)
+ {
+ if (table->table->s->tmp_table)
+ {
Deleted: extra-i686/mariadb-post.sh
===================================================================
--- extra-i686/mariadb-post.sh 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-i686/mariadb-post.sh 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
- response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
- echo "$response" | grep -q "mysqld is alive" && break
- echo "$response" | grep -q "Access denied for user" && break
- sleep 1
-done
Copied: mariadb/repos/extra-i686/mariadb-post.sh (from rev 238753, mariadb/trunk/mariadb-post.sh)
===================================================================
--- extra-i686/mariadb-post.sh (rev 0)
+++ extra-i686/mariadb-post.sh 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+ response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+ echo "$response" | grep -q "mysqld is alive" && break
+ echo "$response" | grep -q "Access denied for user" && break
+ sleep 1
+done
Deleted: extra-i686/mariadb-tmpfile.conf
===================================================================
--- extra-i686/mariadb-tmpfile.conf 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-i686/mariadb-tmpfile.conf 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
Copied: mariadb/repos/extra-i686/mariadb-tmpfile.conf (from rev 238753, mariadb/trunk/mariadb-tmpfile.conf)
===================================================================
--- extra-i686/mariadb-tmpfile.conf (rev 0)
+++ extra-i686/mariadb-tmpfile.conf 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
Deleted: extra-i686/mariadb.install
===================================================================
--- extra-i686/mariadb.install 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-i686/mariadb.install 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,33 +0,0 @@
-post_install(){
- groupadd -g 89 mysql &>/dev/null
- useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
- echo ":: You need to initialize the MariaDB data directory prior to starting"
- echo " the service. This can be done with mysql_install_db command, e.g.:"
- echo " mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
-
- usr/bin/systemd-tmpfiles --create mysql.conf
-}
-
-post_upgrade(){
- getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
- getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
- -s /bin/false mysql &>/dev/null
-
- if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
- for x in data/*; do
- cp -r $x var/lib/mysql
- done
- rm -rf data
- fi
-
- if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
- echo ":: mysql.service has been renamed to mysqld.service to keep"
- echo " consistency with MySQL package."
- fi
-
- if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
- echo ":: Major version update. Consider restarting mysqld.service and"
- echo " running mysql_upgrade afterwards."
- fi
-}
Copied: mariadb/repos/extra-i686/mariadb.install (from rev 238753, mariadb/trunk/mariadb.install)
===================================================================
--- extra-i686/mariadb.install (rev 0)
+++ extra-i686/mariadb.install 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,33 @@
+post_install(){
+ groupadd -g 89 mysql &>/dev/null
+ useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+ echo ":: You need to initialize the MariaDB data directory prior to starting"
+ echo " the service. This can be done with mysql_install_db command, e.g.:"
+ echo " mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
+
+ usr/bin/systemd-tmpfiles --create mysql.conf
+}
+
+post_upgrade(){
+ getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+ getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
+ -s /bin/false mysql &>/dev/null
+
+ if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+ for x in data/*; do
+ cp -r $x var/lib/mysql
+ done
+ rm -rf data
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+ echo ":: mysql.service has been renamed to mysqld.service to keep"
+ echo " consistency with MySQL package."
+ fi
+
+ if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
+ echo ":: Major version update. Consider restarting mysqld.service and"
+ echo " running mysql_upgrade afterwards."
+ fi
+}
Deleted: extra-i686/mariadb.service
===================================================================
--- extra-i686/mariadb.service 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-i686/mariadb.service 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,16 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
Copied: mariadb/repos/extra-i686/mariadb.service (from rev 238753, mariadb/trunk/mariadb.service)
===================================================================
--- extra-i686/mariadb.service (rev 0)
+++ extra-i686/mariadb.service 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-x86_64/PKGBUILD 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,165 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.0.18
-_pkgver=${pkgver/.a/a}
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
- 'jemalloc' 'lz4')
-source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
- mariadb.service
- mariadb-post.sh
- mariadb-tmpfile.conf)
-md5sums=('eab4f9303883d33558c0059af9e30aa4'
- 'd488fffa9f62f9949c4aa1bb6e6db692'
- 'b79e65a5aa536e6b5bc60988eb0b78a2'
- '2fa6e456964d4ff5e6d4f9ff0126aed6')
-
-prepare() {
- sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
- $pkgbase-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
-}
-
-build() {
- mkdir build
- cd build
-
- cmake ../$pkgbase-$_pkgver \
- -DCMAKE_AR=/usr/bin/gcc-ar \
- -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/mysql \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_general_ci \
- -DENABLED_LOCAL_INFILE=ON \
- -DINSTALL_INFODIR=share/mysql/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_DOCREADMEDIR=share/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_DOCDIR=share/mysql/docs \
- -DINSTALL_SHAREDIR=share/mysql \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_PCRE=system \
- -DWITH_LIBWRAP=OFF \
- -DWITH_JEMALLOC=ON \
- -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITH_TOKUDB_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
- -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
- -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
- -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
-
- make
-}
-
-package_libmariadbclient() {
- pkgdesc='MariaDB client libraries'
- depends=('openssl' 'libaio' 'zlib' 'pcre')
- conflicts=('libmysqlclient')
- provides=("libmysqlclient=$pkgver")
- options=('staticlibs')
-
- cd build
- for dir in include libmysql libmysqld libservices; do
- make -C $dir DESTDIR="$pkgdir" install
- done
-
- install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
- install -d "$pkgdir"/usr/share/man/man1
- for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
- install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
- done
-
- rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
-}
-
-package_mariadb-clients() {
- pkgdesc='MariaDB client tools'
- depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
- conflicts=('mysql-clients')
- provides=("mysql-clients=$pkgver")
-
- cd build
- make -C client DESTDIR="$pkgdir" install
-
- # install man pages
- install -d "$pkgdir"/usr/share/man/man1
- for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
- install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
- done
-
- # provided by mariadb
- rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-
-}
-
-package_mytop() {
- pkgdesc='Top clone for MariaDB'
- depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
-
- cd build
- install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
-}
-
-package_mariadb() {
- pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
- backup=('etc/mysql/my.cnf')
- install=mariadb.install
- depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
- 'lz4')
- optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
- conflicts=('mysql')
- provides=("mysql=$pkgver")
- options=('emptydirs')
-
- cd build
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
- install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
- install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
- install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
-
- install -dm700 var/lib/mysql
- chown -R 89:89 var/lib/mysql &>/dev/null
-
- # provided by libmariadbclient
- cd "$pkgdir"
- rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm usr/lib/libmysql*
- rm -r usr/include/
- rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
- # provided by mariadb-clients
- rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
- rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
- # provided by mytop
- rm usr/bin/mytop
-
- # not needed
- rm -r usr/{data,mysql-test,sql-bench}
- rm usr/share/man/man1/mysql-test-run.pl.1
-}
Copied: mariadb/repos/extra-x86_64/PKGBUILD (from rev 238753, mariadb/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,167 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=10.0.18
+_pkgver=${pkgver/.a/a}
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre'
+ 'jemalloc' 'lz4')
+source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+ mariadb.service
+ mariadb-post.sh
+ mariadb-tmpfile.conf
+ mariadb-10.0.18-MDEV-8115.patch)
+md5sums=('eab4f9303883d33558c0059af9e30aa4'
+ 'd488fffa9f62f9949c4aa1bb6e6db692'
+ 'b79e65a5aa536e6b5bc60988eb0b78a2'
+ '2fa6e456964d4ff5e6d4f9ff0126aed6'
+ '4be445c305df3cca61aa9a40a1886964')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../mariadb-10.0.18-MDEV-8115.patch
+}
+
+build() {
+ mkdir build
+ cd build
+
+ cmake ../$pkgbase-$_pkgver \
+ -DCMAKE_AR=/usr/bin/gcc-ar \
+ -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/mysql/docs \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_PCRE=system \
+ -DWITH_LIBWRAP=OFF \
+ -DWITH_JEMALLOC=ON \
+ -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITH_TOKUDB_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+ -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
+ -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
+ -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+
+ make
+}
+
+package_libmariadbclient() {
+ pkgdesc='MariaDB client libraries'
+ depends=('openssl' 'libaio' 'zlib' 'pcre')
+ conflicts=('libmysqlclient')
+ provides=("libmysqlclient=$pkgver")
+ options=('staticlibs')
+
+ cd build
+ for dir in include libmysql libmysqld libservices; do
+ make -C $dir DESTDIR="$pkgdir" install
+ done
+
+ install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
+ install -d "$pkgdir"/usr/share/man/man1
+ for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+ install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+ done
+
+ rm "$pkgdir"/usr/lib/libmysql{client,client_r,d}.a
+}
+
+package_mariadb-clients() {
+ pkgdesc='MariaDB client tools'
+ depends=('libmariadbclient' 'zlib' 'openssl' 'jemalloc')
+ conflicts=('mysql-clients')
+ provides=("mysql-clients=$pkgver")
+
+ cd build
+ make -C client DESTDIR="$pkgdir" install
+
+ # install man pages
+ install -d "$pkgdir"/usr/share/man/man1
+ for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+ install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+ done
+
+ # provided by mariadb
+ rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+
+}
+
+package_mytop() {
+ pkgdesc='Top clone for MariaDB'
+ depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
+
+ cd build
+ install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
+}
+
+package_mariadb() {
+ pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
+ backup=('etc/mysql/my.cnf')
+ install=mariadb.install
+ depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'jemalloc'
+ 'lz4')
+ optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
+ conflicts=('mysql')
+ provides=("mysql=$pkgver")
+ options=('emptydirs')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+ install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+ install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+ install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+ install -dm700 var/lib/mysql
+ chown -R 89:89 var/lib/mysql &>/dev/null
+
+ # provided by libmariadbclient
+ cd "$pkgdir"
+ rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm usr/lib/libmysql*
+ rm -r usr/include/
+ rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+ # provided by mariadb-clients
+ rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+ # provided by mytop
+ rm usr/bin/mytop
+
+ # not needed
+ rm -r usr/{data,mysql-test,sql-bench}
+ rm usr/share/man/man1/mysql-test-run.pl.1
+}
Copied: mariadb/repos/extra-x86_64/mariadb-10.0.18-MDEV-8115.patch (from rev 238753, mariadb/trunk/mariadb-10.0.18-MDEV-8115.patch)
===================================================================
--- extra-x86_64/mariadb-10.0.18-MDEV-8115.patch (rev 0)
+++ extra-x86_64/mariadb-10.0.18-MDEV-8115.patch 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,61 @@
+From 0014bdc7eef141dcd66930e853242b3be4960831 Mon Sep 17 00:00:00 2001
+From: Sergei Golubchik <serg at mariadb.org>
+Date: Thu, 7 May 2015 22:18:34 +0200
+Subject: [PATCH] MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
+
+on REPAIR don't do table-specific stuff for views
+(because even if the view has a temp table opened for it,
+it's not opened all the way down the engine. In particular,
+Aria crashes in maria_status() because MARIA_HA* info - that is
+table->table->file->file - is NULL)
+---
+ mysql-test/r/repair.result | 7 +++++++
+ mysql-test/t/repair.test | 9 +++++++++
+ sql/sql_admin.cc | 2 +-
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
+index 52ae9c3..51c3374 100644
+--- a/mysql-test/r/repair.result
++++ b/mysql-test/r/repair.result
+@@ -207,3 +207,10 @@ check table t1;
+ Table Op Msg_type Msg_text
+ test.t1 check status OK
+ drop table t1;
++create table t1 (a blob);
++create view v1 as select * from t1;
++repair view v1;
++Table Op Msg_type Msg_text
++test.v1 repair status OK
++drop view v1;
++drop table t1;
+diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
+index 337b73f..f625965 100644
+--- a/mysql-test/t/repair.test
++++ b/mysql-test/t/repair.test
+@@ -208,3 +208,12 @@ repair table t1 use_frm;
+ select count(*) from t1;
+ check table t1;
+ drop table t1;
++
++#
++# MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
++#
++create table t1 (a blob);
++create view v1 as select * from t1;
++repair view v1;
++drop view v1;
++drop table t1;
+diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
+index 44057b6..9827c67 100644
+--- a/sql/sql_admin.cc
++++ b/sql/sql_admin.cc
+@@ -901,7 +901,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
+ break;
+ }
+ }
+- if (table->table)
++ if (table->table && !table->view)
+ {
+ if (table->table->s->tmp_table)
+ {
Deleted: extra-x86_64/mariadb-post.sh
===================================================================
--- extra-x86_64/mariadb-post.sh 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-x86_64/mariadb-post.sh 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
- response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
- echo "$response" | grep -q "mysqld is alive" && break
- echo "$response" | grep -q "Access denied for user" && break
- sleep 1
-done
Copied: mariadb/repos/extra-x86_64/mariadb-post.sh (from rev 238753, mariadb/trunk/mariadb-post.sh)
===================================================================
--- extra-x86_64/mariadb-post.sh (rev 0)
+++ extra-x86_64/mariadb-post.sh 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+ response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+ echo "$response" | grep -q "mysqld is alive" && break
+ echo "$response" | grep -q "Access denied for user" && break
+ sleep 1
+done
Deleted: extra-x86_64/mariadb-tmpfile.conf
===================================================================
--- extra-x86_64/mariadb-tmpfile.conf 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-x86_64/mariadb-tmpfile.conf 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
Copied: mariadb/repos/extra-x86_64/mariadb-tmpfile.conf (from rev 238753, mariadb/trunk/mariadb-tmpfile.conf)
===================================================================
--- extra-x86_64/mariadb-tmpfile.conf (rev 0)
+++ extra-x86_64/mariadb-tmpfile.conf 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
Deleted: extra-x86_64/mariadb.install
===================================================================
--- extra-x86_64/mariadb.install 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-x86_64/mariadb.install 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,33 +0,0 @@
-post_install(){
- groupadd -g 89 mysql &>/dev/null
- useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
- echo ":: You need to initialize the MariaDB data directory prior to starting"
- echo " the service. This can be done with mysql_install_db command, e.g.:"
- echo " mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
-
- usr/bin/systemd-tmpfiles --create mysql.conf
-}
-
-post_upgrade(){
- getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
- getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
- -s /bin/false mysql &>/dev/null
-
- if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
- for x in data/*; do
- cp -r $x var/lib/mysql
- done
- rm -rf data
- fi
-
- if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
- echo ":: mysql.service has been renamed to mysqld.service to keep"
- echo " consistency with MySQL package."
- fi
-
- if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
- echo ":: Major version update. Consider restarting mysqld.service and"
- echo " running mysql_upgrade afterwards."
- fi
-}
Copied: mariadb/repos/extra-x86_64/mariadb.install (from rev 238753, mariadb/trunk/mariadb.install)
===================================================================
--- extra-x86_64/mariadb.install (rev 0)
+++ extra-x86_64/mariadb.install 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,33 @@
+post_install(){
+ groupadd -g 89 mysql &>/dev/null
+ useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+ echo ":: You need to initialize the MariaDB data directory prior to starting"
+ echo " the service. This can be done with mysql_install_db command, e.g.:"
+ echo " mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
+
+ usr/bin/systemd-tmpfiles --create mysql.conf
+}
+
+post_upgrade(){
+ getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+ getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
+ -s /bin/false mysql &>/dev/null
+
+ if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+ for x in data/*; do
+ cp -r $x var/lib/mysql
+ done
+ rm -rf data
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+ echo ":: mysql.service has been renamed to mysqld.service to keep"
+ echo " consistency with MySQL package."
+ fi
+
+ if [[ "$(vercmp $2 10.0)" -lt 0 ]]; then
+ echo ":: Major version update. Consider restarting mysqld.service and"
+ echo " running mysql_upgrade afterwards."
+ fi
+}
Deleted: extra-x86_64/mariadb.service
===================================================================
--- extra-x86_64/mariadb.service 2015-05-09 12:28:00 UTC (rev 238753)
+++ extra-x86_64/mariadb.service 2015-05-09 12:28:18 UTC (rev 238754)
@@ -1,16 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
Copied: mariadb/repos/extra-x86_64/mariadb.service (from rev 238753, mariadb/trunk/mariadb.service)
===================================================================
--- extra-x86_64/mariadb.service (rev 0)
+++ extra-x86_64/mariadb.service 2015-05-09 12:28:18 UTC (rev 238754)
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list