From e41262f8d70662c7af271fe7d5afaa7523a5c79d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 2 Apr 2015 18:55:05 +0200 Subject: [PATCH] mysql: updated to 5.6.23 --- mysql/.footprint | 46 ++++++++++++++++++++++++++++++++-------------- mysql/.md5sum | 6 +++--- mysql/Pkgfile | 7 +++++-- mysql/README | 8 ++++---- mysql/my.cnf | 2 +- mysql/valist.patch | 28 +++++++++++++--------------- 6 files changed, 58 insertions(+), 39 deletions(-) diff --git a/mysql/.footprint b/mysql/.footprint index af0d04c..fe631ed 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -15,6 +15,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mysql_client_test -rwxr-xr-x root/root usr/bin/mysql_client_test_embedded -rwxr-xr-x root/root usr/bin/mysql_config +-rwxr-xr-x root/root usr/bin/mysql_config_editor -rwxr-xr-x root/root usr/bin/mysql_convert_table_format -rwxr-xr-x root/root usr/bin/mysql_embedded -rwxr-xr-x root/root usr/bin/mysql_find_rows @@ -49,13 +50,19 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/resolveip drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/mysql/ +-rw-r--r-- root/root usr/include/mysql/big_endian.h +-rw-r--r-- root/root usr/include/mysql/byte_order_generic.h +-rw-r--r-- root/root usr/include/mysql/byte_order_generic_x86.h +-rw-r--r-- root/root usr/include/mysql/byte_order_generic_x86_64.h -rw-r--r-- root/root usr/include/mysql/decimal.h -rw-r--r-- root/root usr/include/mysql/errmsg.h -rw-r--r-- root/root usr/include/mysql/keycache.h +-rw-r--r-- root/root usr/include/mysql/little_endian.h -rw-r--r-- root/root usr/include/mysql/m_ctype.h -rw-r--r-- root/root usr/include/mysql/m_string.h -rw-r--r-- root/root usr/include/mysql/my_alloc.h -rw-r--r-- root/root usr/include/mysql/my_attribute.h +-rw-r--r-- root/root usr/include/mysql/my_byteorder.h -rw-r--r-- root/root usr/include/mysql/my_compiler.h -rw-r--r-- root/root usr/include/mysql/my_config.h -rw-r--r-- root/root usr/include/mysql/my_dbug.h @@ -69,26 +76,39 @@ drwxr-xr-x root/root usr/include/mysql/ -rw-r--r-- root/root usr/include/mysql/my_xml.h -rw-r--r-- root/root usr/include/mysql/mysql.h drwxr-xr-x root/root usr/include/mysql/mysql/ +-rw-r--r-- root/root usr/include/mysql/mysql/client_authentication.h -rw-r--r-- root/root usr/include/mysql/mysql/client_plugin.h +-rw-r--r-- root/root usr/include/mysql/mysql/client_plugin.h.pp +-rw-r--r-- root/root usr/include/mysql/mysql/get_password.h -rw-r--r-- root/root usr/include/mysql/mysql/innodb_priv.h -rw-r--r-- root/root usr/include/mysql/mysql/plugin.h -rw-r--r-- root/root usr/include/mysql/mysql/plugin_audit.h +-rw-r--r-- root/root usr/include/mysql/mysql/plugin_audit.h.pp -rw-r--r-- root/root usr/include/mysql/mysql/plugin_auth.h +-rw-r--r-- root/root usr/include/mysql/mysql/plugin_auth.h.pp -rw-r--r-- root/root usr/include/mysql/mysql/plugin_auth_common.h -rw-r--r-- root/root usr/include/mysql/mysql/plugin_ftparser.h +-rw-r--r-- root/root usr/include/mysql/mysql/plugin_ftparser.h.pp +-rw-r--r-- root/root usr/include/mysql/mysql/plugin_validate_password.h drwxr-xr-x root/root usr/include/mysql/mysql/psi/ -rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_file.h +-rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_idle.h +-rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_socket.h +-rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_stage.h +-rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_statement.h +-rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_table.h -rw-r--r-- root/root usr/include/mysql/mysql/psi/mysql_thread.h -rw-r--r-- root/root usr/include/mysql/mysql/psi/psi.h --rw-r--r-- root/root usr/include/mysql/mysql/psi/psi_abi_v1.h --rw-r--r-- root/root usr/include/mysql/mysql/psi/psi_abi_v2.h +-rw-r--r-- root/root usr/include/mysql/mysql/service_my_plugin_log.h -rw-r--r-- root/root usr/include/mysql/mysql/service_my_snprintf.h +-rw-r--r-- root/root usr/include/mysql/mysql/service_mysql_string.h -rw-r--r-- root/root usr/include/mysql/mysql/service_thd_alloc.h -rw-r--r-- root/root usr/include/mysql/mysql/service_thd_wait.h -rw-r--r-- root/root usr/include/mysql/mysql/service_thread_scheduler.h -rw-r--r-- root/root usr/include/mysql/mysql/services.h -rw-r--r-- root/root usr/include/mysql/mysql/thread_pool_priv.h -rw-r--r-- root/root usr/include/mysql/mysql_com.h +-rw-r--r-- root/root usr/include/mysql/mysql_com_server.h -rw-r--r-- root/root usr/include/mysql/mysql_embed.h -rw-r--r-- root/root usr/include/mysql/mysql_time.h -rw-r--r-- root/root usr/include/mysql/mysql_version.h @@ -97,6 +117,7 @@ drwxr-xr-x root/root usr/include/mysql/mysql/psi/ -rw-r--r-- root/root usr/include/mysql/plugin.h -rw-r--r-- root/root usr/include/mysql/plugin_audit.h -rw-r--r-- root/root usr/include/mysql/plugin_ftparser.h +-rw-r--r-- root/root usr/include/mysql/plugin_validate_password.h -rw-r--r-- root/root usr/include/mysql/sql_common.h -rw-r--r-- root/root usr/include/mysql/sql_state.h -rw-r--r-- root/root usr/include/mysql/sslopt-case.h @@ -106,12 +127,12 @@ drwxr-xr-x root/root usr/include/mysql/mysql/psi/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libmysqlclient.a lrwxrwxrwx root/root usr/lib/libmysqlclient.so -> libmysqlclient.so.18 -lrwxrwxrwx root/root usr/lib/libmysqlclient.so.18 -> libmysqlclient.so.18.0.0 --rwxr-xr-x root/root usr/lib/libmysqlclient.so.18.0.0 +lrwxrwxrwx root/root usr/lib/libmysqlclient.so.18 -> libmysqlclient.so.18.1.0 +-rwxr-xr-x root/root usr/lib/libmysqlclient.so.18.1.0 lrwxrwxrwx root/root usr/lib/libmysqlclient_r.a -> libmysqlclient.a lrwxrwxrwx root/root usr/lib/libmysqlclient_r.so -> libmysqlclient.so lrwxrwxrwx root/root usr/lib/libmysqlclient_r.so.18 -> libmysqlclient.so.18 -lrwxrwxrwx root/root usr/lib/libmysqlclient_r.so.18.0.0 -> libmysqlclient.so.18.0.0 +lrwxrwxrwx root/root usr/lib/libmysqlclient_r.so.18.1.0 -> libmysqlclient.so.18.1.0 -rw-r--r-- root/root usr/lib/libmysqld.a -rw-r--r-- root/root usr/lib/libmysqlservices.a drwxr-xr-x root/root usr/lib/mysql/ @@ -128,6 +149,7 @@ drwxr-xr-x root/root usr/lib/mysql/plugin/ -rwxr-xr-x root/root usr/lib/mysql/plugin/qa_auth_server.so -rwxr-xr-x root/root usr/lib/mysql/plugin/semisync_master.so -rwxr-xr-x root/root usr/lib/mysql/plugin/semisync_slave.so +-rwxr-xr-x root/root usr/lib/mysql/plugin/validate_password.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/comp_err.1.gz @@ -145,6 +167,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysql_client_test.1.gz -rw-r--r-- root/root usr/man/man1/mysql_client_test_embedded.1.gz -rw-r--r-- root/root usr/man/man1/mysql_config.1.gz +-rw-r--r-- root/root usr/man/man1/mysql_config_editor.1.gz -rw-r--r-- root/root usr/man/man1/mysql_convert_table_format.1.gz -rw-r--r-- root/root usr/man/man1/mysql_find_rows.1.gz -rw-r--r-- root/root usr/man/man1/mysql_fix_extensions.1.gz @@ -211,26 +234,21 @@ drwxr-xr-x root/root usr/share/mysql/charsets/ -rw-r--r-- root/root usr/share/mysql/charsets/macce.xml -rw-r--r-- root/root usr/share/mysql/charsets/macroman.xml -rw-r--r-- root/root usr/share/mysql/charsets/swe7.xml --rwxr-xr-x root/root usr/share/mysql/config.huge.ini --rwxr-xr-x root/root usr/share/mysql/config.medium.ini --rwxr-xr-x root/root usr/share/mysql/config.small.ini +-rw-r--r-- root/root usr/share/mysql/dictionary.txt drwxr-xr-x root/root usr/share/mysql/english/ -rw-r--r-- root/root usr/share/mysql/english/errmsg.sys -rw-r--r-- root/root usr/share/mysql/errmsg-utf8.txt -rw-r--r-- root/root usr/share/mysql/fill_help_tables.sql +-rw-r--r-- root/root usr/share/mysql/innodb_memcached_config.sql -rw-r--r-- root/root usr/share/mysql/magic --rw-r--r-- root/root usr/share/mysql/my-huge.cnf --rw-r--r-- root/root usr/share/mysql/my-innodb-heavy-4G.cnf --rw-r--r-- root/root usr/share/mysql/my-large.cnf --rw-r--r-- root/root usr/share/mysql/my-medium.cnf --rw-r--r-- root/root usr/share/mysql/my-small.cnf +-rw-r--r-- root/root usr/share/mysql/my-default.cnf -rwxr-xr-x root/root usr/share/mysql/mysql-log-rotate -rwxr-xr-x root/root usr/share/mysql/mysql.server +-rw-r--r-- root/root usr/share/mysql/mysql_security_commands.sql -rw-r--r-- root/root usr/share/mysql/mysql_system_tables.sql -rw-r--r-- root/root usr/share/mysql/mysql_system_tables_data.sql -rw-r--r-- root/root usr/share/mysql/mysql_test_data_timezone.sql -rwxr-xr-x root/root usr/share/mysql/mysqld_multi.server --rwxr-xr-x root/root usr/share/mysql/ndb-config-2-node.ini drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwx------ mysql/mysql var/lib/mysql/ diff --git a/mysql/.md5sum b/mysql/.md5sum index 7cff89a..290e265 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,4 +1,4 @@ -6de62cde6cc212b5cd1f87e0df848b1d my.cnf -df5071c49764c3ad65df04ff20866a86 mysql-5.5.38.tar.gz +0bf963dec6788c90f82ab7b104b8f427 my.cnf +60344f26eae136a267a0277407926e79 mysql-5.6.23.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld -6ca8f727d4e04fbdbe200cb5abfffee5 valist.patch +53b421ec605c7d3c437daf10e70e9498 valist.patch diff --git a/mysql/Pkgfile b/mysql/Pkgfile index 22ce4c1..34592fc 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -5,15 +5,18 @@ # Depends on: tcp_wrappers ncurses zlib openssl cmake libaio name=mysql -version=5.5.38 +version=5.6.23 release=1 -source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \ +source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \ my.cnf mysqld valist.patch) build () { cd $name-$version patch -p1 -i $SRC/valist.patch + + # fix for openssl 1.0.2 + sed -i 's/REGEX "^#define/REGEX "^# *define/' cmake/ssl.cmake cmake . \ -DBUILD_CONFIG=mysql_release \ diff --git a/mysql/README b/mysql/README index 222ad89..4a9a4f5 100644 --- a/mysql/README +++ b/mysql/README @@ -1,4 +1,4 @@ -README for mysql 5.1.xx +README for mysql 5.x.xx REQUIREMENTS @@ -14,12 +14,12 @@ POST-INSTALL 2. run 'mysql_install_db' to build the system database in /var/lib/mysql 3. run 'mysql_upgrade' to add new privileges and features - to the MySQL privilege tables if you have 4.x or 3.x - databases + to the MySQL privilege tables if you have databases + created with older versions of mysql 4. Set a password for the mysql root user: mysqladmin -u root password -PRECAUTION +PRECAUTION 1. With the default configuration networking support for mysql is disabled, meaning the mysql daemon is accessable from localhost only. diff --git a/mysql/my.cnf b/mysql/my.cnf index 3aeae2a..db6f0d3 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -14,7 +14,7 @@ general_log_file = /var/log/mysqld.log skip-networking skip-innodb default-storage-engine = MYISAM - +default-tmp-storage-engine = MYISAM [client] socket = /tmp/mysql.sock diff --git a/mysql/valist.patch b/mysql/valist.patch index c0b6d71..0762220 100644 --- a/mysql/valist.patch +++ b/mysql/valist.patch @@ -1,8 +1,6 @@ -Based on Arnaud Patard patch for mysql 5.5.8 -=================================================================== ---- mysql-5.5.16/sql-common/client_plugin.c 2011-09-30 13:09:10.709154000 +0200 -+++ mysql-5.5.16/sql-common/client_plugin_new.c 2011-09-30 13:11:53.753154000 +0200 -@@ -228,6 +228,7 @@ +--- mysql-5.6.23/sql-common/client_plugin.c.orig 2015-04-02 13:08:28.255818357 +0200 ++++ mysql-5.6.23/sql-common/client_plugin.c 2015-04-02 13:11:57.325709613 +0200 +@@ -259,6 +259,7 @@ { MYSQL mysql; struct st_mysql_client_plugin **builtin; @@ -10,16 +8,16 @@ Based on Arnaud Patard patch for mysql 5.5.8 if (initialized) return 0; -@@ -244,7 +245,7 @@ - pthread_mutex_lock(&LOCK_load_client_plugin); +@@ -275,7 +276,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, dummy); +- add_plugin_noargs(&mysql, *builtin, 0, 0); ++ add_plugin_noargs(&mysql, *builtin, 0, 0, dummy); - pthread_mutex_unlock(&LOCK_load_client_plugin); + mysql_mutex_unlock(&LOCK_load_client_plugin); -@@ -288,6 +289,7 @@ +@@ -319,6 +320,7 @@ mysql_client_register_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin) { @@ -27,12 +25,12 @@ Based on Arnaud Patard patch for mysql 5.5.8 if (is_not_initialized(mysql, plugin->name)) return NULL; -@@ -302,7 +304,7 @@ +@@ -333,7 +335,7 @@ plugin= NULL; } else -- plugin= add_plugin(mysql, plugin, 0, 0, 0); -+ plugin= add_plugin(mysql, plugin, 0, 0, dummy); +- plugin= add_plugin_noargs(mysql, plugin, 0, 0); ++ plugin= add_plugin_noargs(mysql, plugin, 0, 0, dummy); - pthread_mutex_unlock(&LOCK_load_client_plugin); + mysql_mutex_unlock(&LOCK_load_client_plugin); return plugin; -- 2.26.2