ports/opt (2.7): [notify] mysql: update to 5.5.9

crux at crux.nu crux at crux.nu
Mon Feb 7 17:51:54 UTC 2011


commit cec62971549f1aef39a5cdd01d2880c81a2ad88d
Author: Juergen Daubert <jue at jue.li>
Date:   Mon Feb 7 18:34:05 2011 +0100

    [notify] mysql: update to 5.5.9
    
    even though we have a major new version with this release the
    update is mostly backwards compatible, but please note:
    
    - new runtime dependency opt/libaio
    - new buildtime dependency cmake
    - ImmoDB is now the default database engine, the supplied
      /etc/my.conf still sets MyISAM as the default and skips
      InnoDB. Don't reject /etc/my.cnf without inspection.
    - after the upgrade fix or rejmerge /etc/my.cnf, start
      the server and run mysql_upgrade to adjust the mysql
      system database tables.

diff --git a/mysql/.footprint b/mysql/.footprint
index a3e745b..22e82bd 100644
--- a/mysql/.footprint
+++ b/mysql/.footprint
@@ -1,6 +1,4 @@
 drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/ld.so.conf.d/
--rw-r--r--	root/root	etc/ld.so.conf.d/mysql.conf
 -rw-------	root/root	etc/my.cnf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/mysqld
@@ -15,11 +13,11 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/myisampack
 -rwxr-xr-x	root/root	usr/bin/mysql
 -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_convert_table_format
 -rwxr-xr-x	root/root	usr/bin/mysql_find_rows
 -rwxr-xr-x	root/root	usr/bin/mysql_fix_extensions
--rwxr-xr-x	root/root	usr/bin/mysql_fix_privilege_tables
 -rwxr-xr-x	root/root	usr/bin/mysql_install_db
 -rwxr-xr-x	root/root	usr/bin/mysql_secure_installation
 -rwxr-xr-x	root/root	usr/bin/mysql_setpermission
@@ -28,6 +26,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mysql_waitpid
 -rwxr-xr-x	root/root	usr/bin/mysql_zap
 -rwxr-xr-x	root/root	usr/bin/mysqlaccess
+-rwxr-xr-x	root/root	usr/bin/mysqlaccess.conf
 -rwxr-xr-x	root/root	usr/bin/mysqladmin
 -rwxr-xr-x	root/root	usr/bin/mysqlbinlog
 -rwxr-xr-x	root/root	usr/bin/mysqlbug
@@ -41,6 +40,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mysqlshow
 -rwxr-xr-x	root/root	usr/bin/mysqlslap
 -rwxr-xr-x	root/root	usr/bin/mysqltest
+-rwxr-xr-x	root/root	usr/bin/mysqltest_embedded
 -rwxr-xr-x	root/root	usr/bin/perror
 -rwxr-xr-x	root/root	usr/bin/replace
 -rwxr-xr-x	root/root	usr/bin/resolve_stack_dump
@@ -62,11 +62,29 @@ drwxr-xr-x	root/root	usr/include/mysql/
 -rw-r--r--	root/root	usr/include/mysql/my_global.h
 -rw-r--r--	root/root	usr/include/mysql/my_list.h
 -rw-r--r--	root/root	usr/include/mysql/my_net.h
--rw-r--r--	root/root	usr/include/mysql/my_no_pthread.h
 -rw-r--r--	root/root	usr/include/mysql/my_pthread.h
 -rw-r--r--	root/root	usr/include/mysql/my_sys.h
 -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_plugin.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_auth.h
+-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
+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_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_snprintf.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_com.h
 -rw-r--r--	root/root	usr/include/mysql/mysql_embed.h
 -rw-r--r--	root/root	usr/include/mysql/mysql_time.h
@@ -74,6 +92,8 @@ drwxr-xr-x	root/root	usr/include/mysql/
 -rw-r--r--	root/root	usr/include/mysql/mysqld_ername.h
 -rw-r--r--	root/root	usr/include/mysql/mysqld_error.h
 -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/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
@@ -81,60 +101,29 @@ drwxr-xr-x	root/root	usr/include/mysql/
 -rw-r--r--	root/root	usr/include/mysql/sslopt-vars.h
 -rw-r--r--	root/root	usr/include/mysql/typelib.h
 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.16
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so.16 -> libmysqlclient.so.16.0.0
+-rwxr-xr-x	root/root	usr/lib/libmysqlclient.so.16.0.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.16 -> libmysqlclient.so
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so.16.0.0 -> libmysqlclient.so
+-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/
--rw-r--r--	root/root	usr/lib/mysql/libdbug.a
--rw-r--r--	root/root	usr/lib/mysql/libheap.a
--rw-r--r--	root/root	usr/lib/mysql/libmyisam.a
--rw-r--r--	root/root	usr/lib/mysql/libmyisammrg.a
--rw-r--r--	root/root	usr/lib/mysql/libmysqlclient.a
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient.la
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient.so -> libmysqlclient.so.16.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient.so.16 -> libmysqlclient.so.16.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient.so.16.0.0
--rw-r--r--	root/root	usr/lib/mysql/libmysqlclient_r.a
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient_r.la
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient_r.so -> libmysqlclient_r.so.16.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient_r.so.16 -> libmysqlclient_r.so.16.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient_r.so.16.0.0
--rw-r--r--	root/root	usr/lib/mysql/libmystrings.a
--rw-r--r--	root/root	usr/lib/mysql/libmysys.a
--rw-r--r--	root/root	usr/lib/mysql/libvio.a
 drwxr-xr-x	root/root	usr/lib/mysql/plugin/
--rw-r--r--	root/root	usr/lib/mysql/plugin/ha_archive.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_archive.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_archive.so -> ha_archive.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_archive.so.0 -> ha_archive.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_archive.so.0.0.0
--rw-r--r--	root/root	usr/lib/mysql/plugin/ha_blackhole.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_blackhole.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_blackhole.so -> ha_blackhole.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_blackhole.so.0 -> ha_blackhole.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_blackhole.so.0.0.0
--rw-r--r--	root/root	usr/lib/mysql/plugin/ha_example.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_example.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_example.so -> ha_example.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_example.so.0 -> ha_example.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_example.so.0.0.0
--rw-r--r--	root/root	usr/lib/mysql/plugin/ha_federated.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_federated.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_federated.so -> ha_federated.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_federated.so.0 -> ha_federated.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_federated.so.0.0.0
--rw-r--r--	root/root	usr/lib/mysql/plugin/ha_innodb_plugin.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_innodb_plugin.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_innodb_plugin.so -> ha_innodb_plugin.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/ha_innodb_plugin.so.0 -> ha_innodb_plugin.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/ha_innodb_plugin.so.0.0.0
--rw-r--r--	root/root	usr/lib/mysql/plugin/libdaemon_example.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/libdaemon_example.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/libdaemon_example.so -> libdaemon_example.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/libdaemon_example.so.0 -> libdaemon_example.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/libdaemon_example.so.0.0.0
--rw-r--r--	root/root	usr/lib/mysql/plugin/mypluglib.a
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/mypluglib.la
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/mypluglib.so -> mypluglib.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/plugin/mypluglib.so.0 -> mypluglib.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/plugin/mypluglib.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/adt_null.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/auth.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/auth_socket.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/auth_test_plugin.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/libdaemon_example.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/mypluglib.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/qa_auth_client.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/qa_auth_interface.so
+-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
 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
@@ -150,11 +139,11 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/mysql.1.gz
 -rw-r--r--	root/root	usr/man/man1/mysql.server.1.gz
 -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_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
--rw-r--r--	root/root	usr/man/man1/mysql_fix_privilege_tables.1.gz
 -rw-r--r--	root/root	usr/man/man1/mysql_install_db.1.gz
 -rw-r--r--	root/root	usr/man/man1/mysql_secure_installation.1.gz
 -rw-r--r--	root/root	usr/man/man1/mysql_setpermission.1.gz
@@ -177,21 +166,20 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/mysqlshow.1.gz
 -rw-r--r--	root/root	usr/man/man1/mysqlslap.1.gz
 -rw-r--r--	root/root	usr/man/man1/mysqltest.1.gz
+-rw-r--r--	root/root	usr/man/man1/mysqltest_embedded.1.gz
 -rw-r--r--	root/root	usr/man/man1/perror.1.gz
 -rw-r--r--	root/root	usr/man/man1/replace.1.gz
 -rw-r--r--	root/root	usr/man/man1/resolve_stack_dump.1.gz
 -rw-r--r--	root/root	usr/man/man1/resolveip.1.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/mysqld.8.gz
--rw-r--r--	root/root	usr/man/man8/mysqlmanager.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/mysqld
--rwxr-xr-x	root/root	usr/sbin/mysqlmanager
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/mysql.m4
 drwxr-xr-x	root/root	usr/share/mysql/
--rw-r--r--	root/root	usr/share/mysql/binary-configure
+-rwxr-xr-x	root/root	usr/share/mysql/binary-configure
 drwxr-xr-x	root/root	usr/share/mysql/charsets/
 -rw-r--r--	root/root	usr/share/mysql/charsets/Index.xml
 -rw-r--r--	root/root	usr/share/mysql/charsets/armscii8.xml
@@ -218,28 +206,26 @@ 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
--rw-r--r--	root/root	usr/share/mysql/config.huge.ini
--rw-r--r--	root/root	usr/share/mysql/config.medium.ini
--rw-r--r--	root/root	usr/share/mysql/config.small.ini
+-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
 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.txt
+-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/mi_test_all
--rw-r--r--	root/root	usr/share/mysql/mi_test_all.res
+-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/mysql-log-rotate
+-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_fix_privilege_tables.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
--rw-r--r--	root/root	usr/share/mysql/ndb-config-2-node.ini
+-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 24f762a..5174e31 100644
--- a/mysql/.md5sum
+++ b/mysql/.md5sum
@@ -1,3 +1,3 @@
-907c4ac28c33b2508750bca8a29ef9b9  my.cnf
-2a0f45a2f8b5a043b95ce7575796a30b  mysql-5.1.54.tar.gz
+6de62cde6cc212b5cd1f87e0df848b1d  my.cnf
+701c0c44b7f1c2300adc0dc45729f903  mysql-5.5.9.tar.gz
 642a596f13ebd7e459c5ff2fd382f06b  mysqld
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 8e88e26..e3eeae6 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -1,32 +1,31 @@
 # Description: SQL database server
 # URL:         http://www.mysql.com
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  ncurses readline zlib
+# Depends on:  tcp_wrappers ncurses zlib openssl cmake libaio
 
 name=mysql
-version=5.1.54
+version=5.5.9
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \
         my.cnf mysqld)
 
 build () {
     cd $name-$version
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --libexecdir=/usr/sbin \
-                --localstatedir=/var/lib \
-                --mandir=/usr/man \
-                --enable-assembler \
-                --enable-thread-safe-client \
-                --without-{readline,debug,docs} \
-                --with-ssl \
-                --with-plugins=myisam,innobase
+    
+    cmake . \
+        -DBUILD_CONFIG=mysql_release \
+        -DINSTALL_LAYOUT=RPM \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSYSCONFDIR=/etc \
+        -DINSTALL_MANDIR=man \
+        -DWITH_LIBWRAP=1 \
+        -DWITH_SSL=system \
+        -DWITH_ZLIB=system
 
     make
     make DESTDIR=$PKG install
 
-    rm -r $PKG/usr/{mysql-test,sql-bench}
+    rm -r $PKG/usr/share/{mysql-test,info}
     rm $PKG/usr/share/mysql/charsets/README
     find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \;
 
@@ -36,7 +35,4 @@ build () {
     install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql
     install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld
     install -m 600 $SRC/my.cnf $PKG/etc
-
-    install -d $PKG/etc/ld.so.conf.d
-    echo "/usr/lib/mysql" > $PKG/etc/ld.so.conf.d/mysql.conf
 }
diff --git a/mysql/my.cnf b/mysql/my.cnf
index 35da394..3aeae2a 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -12,10 +12,8 @@ general_log      = 1
 general_log_file = /var/log/mysqld.log
 
 skip-networking
-
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
 skip-innodb
+default-storage-engine = MYISAM
 
 
 [client]



More information about the CRUX mailing list