mysql: update to 5.6.14.

This commit is contained in:
Juan RP 2013-09-23 17:13:46 +02:00
parent 7830078150
commit 7546eaf15d
3 changed files with 12 additions and 61 deletions

View file

@ -1,11 +1,14 @@
[Unit] [Unit]
Description=MySQL Server Description=MySQL Server
After=syslog.target
[Service] [Service]
User=mysql User=mysql
ExecStart=/usr/bin/mysqld --user=mysql Group=mysql
ExecStartPost=/usr/lib/systemd/scripts/mysqld-post ExecStart=/usr/bin/mysqld --user=mysql --pid-file=/run/mysqld/mysqld.pid
ExecStartPost=/usr/bin/mysqld-post
Restart=always Restart=always
PrivateTmp=yes
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View file

@ -1,48 +0,0 @@
--- sql-common/client_plugin.c.orig 2013-02-25 13:12:01.921468152 +0100
+++ sql-common/client_plugin.c 2013-02-25 13:15:50.765466978 +0100
@@ -233,11 +233,13 @@
{
MYSQL mysql;
struct st_mysql_client_plugin **builtin;
+ va_list unused;
if (initialized)
return 0;
memset(&mysql, 0, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
+ memset(&unused, 0, sizeof(unused)); /* suppress uninitialized-value warnings */
mysql_mutex_init(0, &LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
init_alloc_root(&mem_root, 128, 128);
@@ -249,7 +251,7 @@
mysql_mutex_lock(&LOCK_load_client_plugin);
for (builtin= mysql_client_builtins; *builtin; builtin++)
- add_plugin(&mysql, *builtin, 0, 0, 0);
+ add_plugin(&mysql, *builtin, 0, 0, unused);
mysql_mutex_unlock(&LOCK_load_client_plugin);
@@ -293,9 +295,13 @@
mysql_client_register_plugin(MYSQL *mysql,
struct st_mysql_client_plugin *plugin)
{
+ va_list unused;
+
if (is_not_initialized(mysql, plugin->name))
return NULL;
+ memset(&unused, 0, sizeof(unused)); /* suppress uninitialized-value warnings */
+
mysql_mutex_lock(&LOCK_load_client_plugin);
/* make sure the plugin wasn't loaded meanwhile */
@@ -307,7 +313,7 @@
plugin= NULL;
}
else
- plugin= add_plugin(mysql, plugin, 0, 0, 0);
+ plugin= add_plugin(mysql, plugin, 0, 0, unused);
mysql_mutex_unlock(&LOCK_load_client_plugin);
return plugin;

View file

@ -1,6 +1,6 @@
# Template file for 'mysql' # Template file for 'mysql'
pkgname=mysql pkgname=mysql
version=5.6.12 version=5.6.14
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
@ -17,14 +17,14 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-DSTACK_DIRECTION=1" -DSTACK_DIRECTION=1"
hostmakedepends="perl cmake bison" hostmakedepends="perl cmake bison ncurses-devel"
makedepends="zlib-devel ncurses-devel openssl-devel readline-devel" makedepends="zlib-devel ncurses-devel openssl-devel readline-devel"
short_desc="The world's most popular open source database" short_desc="The world's most popular open source database"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://www.mysql.com/products/community/" homepage="https://www.mysql.com/products/community/"
license="GPL-2" license="GPL-2"
distfiles="http://mirror.cogentco.com/pub/mysql/MySQL-5.6/mysql-${version}.tar.gz" distfiles="http://mirror.cogentco.com/pub/mysql/MySQL-5.6/mysql-${version}.tar.gz"
checksum=7911af0180c8014b9193bde42b6b705460fa70bf75681b62c64d1cf2580686bc checksum=7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7
long_desc=" long_desc="
MySQL is the world's most popular open source database software, with over MySQL is the world's most popular open source database software, with over
100 million copies of its software downloaded or distributed throughout 100 million copies of its software downloaded or distributed throughout
@ -34,10 +34,6 @@ long_desc="
the major problems associated with downtime, maintenance and administration the major problems associated with downtime, maintenance and administration
for modern, online applications." for modern, online applications."
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" ncurses-devel"
fi
pre_configure() { pre_configure() {
# We need some host binaries before starting cross compilation. # We need some host binaries before starting cross compilation.
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
@ -73,12 +69,12 @@ post_install() {
# systemd service. # systemd service.
vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/mysqld-post 755 usr/lib/systemd/scripts vinstall ${FILESDIR}/mysqld-post 755 usr/bin
vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf
} }
libmysqlclient_package() { libmysqlclient_package() {
short_desc="MySQL database client library" short_desc+=" - client library"
pkg_install() { pkg_install() {
vmove "usr/lib/libmysqlclient*.so.*" vmove "usr/lib/libmysqlclient*.so.*"
} }
@ -86,7 +82,7 @@ libmysqlclient_package() {
libmysqlclient-devel_package() { libmysqlclient-devel_package() {
depends="libmysqlclient>=${version}_${revision}" depends="libmysqlclient>=${version}_${revision}"
short_desc="MySQL database development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/bin/mysql_config vmove usr/bin/mysql_config
vmove usr/share/man/man1/mysql_config.1 vmove usr/share/man/man1/mysql_config.1
@ -98,7 +94,7 @@ libmysqlclient-devel_package() {
mysql-client_package() { mysql-client_package() {
depends="perl" depends="perl"
short_desc="MySQL database client binaries" short_desc+=" - database client binaries"
pkg_install() { pkg_install() {
for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \ for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
mysql_client_test_embedded mysqldumpslow mysqlbinlog \ mysql_client_test_embedded mysqldumpslow mysqlbinlog \