mysql: fixed va_list type compilation error in client_plugin.

diff --git a/mysql/.footprint b/mysql/.footprint
new file mode 100644 (file)
index 0000000..e74db7c
--- /dev/null
+++ b/mysql/.footprint
@@ -0,0 +1,238 @@
+drwxr-xr-x     root/root       etc/
+-rw-------     root/root       etc/my.cnf
+drwxr-xr-x     root/root       etc/rc.d/
+-rwxr-xr-x     root/root       etc/rc.d/mysqld
+drwxr-xr-x     root/root       usr/
+drwxr-xr-x     root/root       usr/bin/
+-rwxr-xr-x     root/root       usr/bin/innochecksum
+-rwxr-xr-x     root/root       usr/bin/msql2mysql
+-rwxr-xr-x     root/root       usr/bin/my_print_defaults
+-rwxr-xr-x     root/root       usr/bin/myisam_ftdump
+-rwxr-xr-x     root/root       usr/bin/myisamchk
+-rwxr-xr-x     root/root       usr/bin/myisamlog
+-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_embedded
+-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_install_db
+-rwxr-xr-x     root/root       usr/bin/mysql_plugin
+-rwxr-xr-x     root/root       usr/bin/mysql_secure_installation
+-rwxr-xr-x     root/root       usr/bin/mysql_setpermission
+-rwxr-xr-x     root/root       usr/bin/mysql_tzinfo_to_sql
+-rwxr-xr-x     root/root       usr/bin/mysql_upgrade
+-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
+-rwxr-xr-x     root/root       usr/bin/mysqlcheck
+-rwxr-xr-x     root/root       usr/bin/mysqld_multi
+-rwxr-xr-x     root/root       usr/bin/mysqld_safe
+-rwxr-xr-x     root/root       usr/bin/mysqldump
+-rwxr-xr-x     root/root       usr/bin/mysqldumpslow
+-rwxr-xr-x     root/root       usr/bin/mysqlhotcopy
+-rwxr-xr-x     root/root       usr/bin/mysqlimport
+-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
+-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/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/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_compiler.h
+-rw-r--r--     root/root       usr/include/mysql/my_config.h
+-rw-r--r--     root/root       usr/include/mysql/my_dbug.h
+-rw-r--r--     root/root       usr/include/mysql/my_dir.h
+-rw-r--r--     root/root       usr/include/mysql/my_getopt.h
+-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_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/thread_pool_priv.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
+-rw-r--r--     root/root       usr/include/mysql/mysql_version.h
+-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
+-rw-r--r--     root/root       usr/include/mysql/sslopt-longopts.h
+-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.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_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
+lrwxrwxrwx     root/root       usr/lib/libmysqlclient_r.so.18.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/
+drwxr-xr-x     root/root       usr/lib/mysql/plugin/
+-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
+-rw-r--r--     root/root       usr/lib/mysql/plugin/daemon_example.ini
+-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
+-rw-r--r--     root/root       usr/man/man1/innochecksum.1.gz
+-rw-r--r--     root/root       usr/man/man1/msql2mysql.1.gz
+-rw-r--r--     root/root       usr/man/man1/my_print_defaults.1.gz
+-rw-r--r--     root/root       usr/man/man1/myisam_ftdump.1.gz
+-rw-r--r--     root/root       usr/man/man1/myisamchk.1.gz
+-rw-r--r--     root/root       usr/man/man1/myisamlog.1.gz
+-rw-r--r--     root/root       usr/man/man1/myisampack.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysql-stress-test.pl.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysql-test-run.pl.1.gz
+-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_install_db.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysql_plugin.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
+-rw-r--r--     root/root       usr/man/man1/mysql_tzinfo_to_sql.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysql_upgrade.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysql_waitpid.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysql_zap.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlaccess.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqladmin.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlbinlog.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlbug.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlcheck.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqld_multi.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqld_safe.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqldump.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqldumpslow.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlhotcopy.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlimport.1.gz
+-rw-r--r--     root/root       usr/man/man1/mysqlman.1.gz
+-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
+drwxr-xr-x     root/root       usr/sbin/
+-rwxr-xr-x     root/root       usr/sbin/mysqld
+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/
+-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
+-rw-r--r--     root/root       usr/share/mysql/charsets/ascii.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp1250.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp1251.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp1256.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp1257.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp850.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp852.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/cp866.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/dec8.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/geostd8.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/greek.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/hebrew.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/hp8.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/keybcs2.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/koi8r.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/koi8u.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/latin1.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/latin2.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/latin5.xml
+-rw-r--r--     root/root       usr/share/mysql/charsets/latin7.xml
+-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
+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/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
+-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_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/
+drwxr-xr-x     root/root       var/log/
+-rw-------     mysql/mysql     var/log/mysqld.log (EMPTY)

diff --git a/mysql/.md5sum b/mysql/.md5sum
new file mode 100644 (file)
index 0000000..d242a3b
--- /dev/null
+++ b/mysql/.md5sum
@@ -0,0 +1,4 @@
+6de62cde6cc212b5cd1f87e0df848b1d  my.cnf
+462ab3752dd666ec06ca32f92673b59e  mysql-5.5.16.tar.gz
+6ca8f727d4e04fbdbe200cb5abfffee5  mysql-5.5.16_valist.patch
+642a596f13ebd7e459c5ff2fd382f06b  mysqld

diff --git a/mysql/Pkgfile b/mysql/Pkgfile
new file mode 100644 (file)
index 0000000..9fae8dd
--- /dev/null
+++ b/mysql/Pkgfile
@@ -0,0 +1,40 @@
+# Description: SQL database server
+# URL:         http://www.mysql.com
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Depends on:  tcp_wrappers ncurses zlib openssl cmake libaio
+
+name=mysql
+version=5.5.16
+release=1
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \
+        my.cnf mysqld $name-${version}_valist.patch)
+
+build () {
+    cd $name-$version
+    patch -p1 -i $SRC/$name-${version}_valist.patch
+    cmake . \
+        -DBUILD_CONFIG=mysql_release \
+        -DINSTALL_LAYOUT=RPM \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSYSCONFDIR=/etc \
+        -DINSTALL_LIBDIR=lib \
+        -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+        -DINSTALL_MANDIR=man \
+        -DWITH_LIBWRAP=1 \
+        -DWITH_SSL=system \
+        -DWITH_ZLIB=system
+
+    make
+    make DESTDIR=$PKG install
+
+    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 {} \;
+
+    install -d  $PKG/var/{lib,log}
+    touch mysqld.log
+    install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log
+    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
+}

diff --git a/mysql/README b/mysql/README
new file mode 100644 (file)
index 0000000..222ad89
--- /dev/null
+++ b/mysql/README
@@ -0,0 +1,38 @@
+README for mysql 5.1.xx
+
+REQUIREMENTS
+
+PRE-INSTALL
+   Run the included pre-install script to create a new
+   user/group mysql.
+
+POST-INSTALL
+1. Fix user/group of your mysql databases and the log file
+   if you are upgrading mysql from 5.0.x:
+   chown -R mysql:mysql /var/lib/mysql
+   chown mysql:mysql /var/log/mysqld.log
+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
+4. Set a password for the mysql root user:
+   mysqladmin -u root password <mysql_root_password>
+
+PRECAUTION
+1. With the default configuration networking support for 
+   mysql is disabled, meaning the mysql daemon is accessable 
+   from localhost only. 
+   To add networking support comment out the 'skip-networking' 
+   line in /etc/my.cnf. 
+2. If you upgrade from mysql 4.0.x you must recompile the 
+   other packages on your system that are linked against the 
+   mysql client libraries (libmysqlclient). 
+   To obtain such a list of packages for your system, you 
+   may use the command 'prt-get dependent mysql' or use yapo 
+   to list the packages.
+
+INNODB
+  InnoDB table type support is compiled in but disabled by
+  default. Comment out the skip-innodb line in /etc/my.cnf
+  to fully enable InnoDB support.

diff --git a/mysql/my.cnf b/mysql/my.cnf
new file mode 100644 (file)
index 0000000..3aeae2a
--- /dev/null
+++ b/mysql/my.cnf
@@ -0,0 +1,23 @@
+#
+# /etc/my.cnf
+#
+
+[mysqld]
+datadir          = /var/lib/mysql
+user             = mysql
+pid-file         = /var/run/mysqld.pid
+socket           = /tmp/mysql.sock
+port             = 3306
+general_log      = 1
+general_log_file = /var/log/mysqld.log
+
+skip-networking
+skip-innodb
+default-storage-engine = MYISAM
+
+
+[client]
+socket = /tmp/mysql.sock
+port   = 3306
+
+# End of file

diff --git a/mysql/mysql-5.5.16_valist.patch b/mysql/mysql-5.5.16_valist.patch
new file mode 100644 (file)
index 0000000..c0b6d71
--- /dev/null
+++ b/mysql/mysql-5.5.16_valist.patch
@@ -0,0 +1,38 @@
+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 mysql;
+   struct st_mysql_client_plugin **builtin;
++  va_list dummy;
+ 
+   if (initialized)
+     return 0;
+@@ -244,7 +245,7 @@
+   pthread_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);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+ 
+@@ -288,6 +289,7 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+                              struct st_mysql_client_plugin *plugin)
+ {
++  va_list dummy;
+   if (is_not_initialized(mysql, plugin->name))
+     return NULL;
+ 
+@@ -302,7 +304,7 @@
+     plugin= NULL;
+   }
+   else
+-    plugin= add_plugin(mysql, plugin, 0, 0, 0);
++    plugin= add_plugin(mysql, plugin, 0, 0, dummy);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+   return plugin;

diff --git a/mysql/mysqld b/mysql/mysqld
new file mode 100644 (file)
index 0000000..4775f33
--- /dev/null
+++ b/mysql/mysqld
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# /etc/rc.d/mysqld: start/stop mysqld daemon
+#
+
+MYSQL_CFG=/etc/my.cnf
+
+MYSQL_PID=`sed -n 's/^pid-file[ \t]*=[ \t]*//p' $MYSQL_CFG`
+MYSQL_USR=`sed -n 's/^user[ \t]*=[ \t]*//p' $MYSQL_CFG`
+
+case $1 in
+start)
+       touch $MYSQL_PID
+       chown $MYSQL_USR $MYSQL_PID
+       /usr/sbin/mysqld &
+       ;;
+stop)
+       killall -q /usr/sbin/mysqld 
+       rm $MYSQL_PID
+       ;;
+restart)
+       $0 stop
+       sleep 2
+       $0 start
+       ;;
+*)
+       echo "usage: $0 [start|stop|restart]"
+       ;;
+esac
+
+# End of file

diff --git a/mysql/pre-install b/mysql/pre-install
new file mode 100644 (file)
index 0000000..f856e40
--- /dev/null
+++ b/mysql/pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+getent group mysql || /usr/sbin/groupadd -g 46 mysql
+getent passwd mysql || /usr/sbin/useradd -g mysql -u 46 -d /var/lib/mysql -s /bin/false mysql
+/usr/bin/passwd -l mysql
+