# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1343981219 0
# Node ID 96e4513829cdd23865cf317232df4d5c8aa035a7
# Parent  a8fcb4e54df07a56fe8ab12fb37381215bd98b92
Up: mysql to 5.5.27.

diff -r a8fcb4e54df0 -r 96e4513829cd libmysqlclient/receipt
--- a/libmysqlclient/receipt	Fri Aug 03 13:19:54 2012 +0200
+++ b/libmysqlclient/receipt	Fri Aug 03 08:06:59 2012 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libmysqlclient"
-VERSION="5.1.54"
+VERSION="5.5.27"
 CATEGORY="misc"
 SHORT_DESC="SQL database system client libraries."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,13 +12,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/mysql
-	cp -a $_pkg/usr/lib/mysql/libmysqlclient*so* $fs/usr/lib/mysql
-	cd $fs/usr/lib
-	ln -s mysql/libmysqlclient.so .
-    ln -s mysql/libmysqlclient.so.16 .
-	ln -s mysql/libmysqlclient.so.16.0.0 .
-	ln -s mysql/libmysqlclient_r.so .
-    ln -s mysql/libmysqlclient_r.so.16 .
-	ln -s mysql/libmysqlclient_r.so.16.0.0 .
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/lib/libmysqlclient*so* $fs/usr/lib
 }
+
diff -r a8fcb4e54df0 -r 96e4513829cd mysql-client/receipt
--- a/mysql-client/receipt	Fri Aug 03 13:19:54 2012 +0200
+++ b/mysql-client/receipt	Fri Aug 03 08:06:59 2012 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="mysql-client"
-VERSION="5.1.54"
+VERSION="5.5.27"
 CATEGORY="office"
 SHORT_DESC="SQL database system client files."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -16,6 +16,6 @@
 	while read file; do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $_pkg$file $fs$file
+		cp -a $install$file $fs$file
 	done < $wanted_stuff/$PACKAGE.files-list
 }
diff -r a8fcb4e54df0 -r 96e4513829cd mysql-dev/receipt
--- a/mysql-dev/receipt	Fri Aug 03 13:19:54 2012 +0200
+++ b/mysql-dev/receipt	Fri Aug 03 08:06:59 2012 +0000
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="mysql-dev"
-VERSION="5.1.54"
+VERSION="5.5.27"
 CATEGORY="development"
 SHORT_DESC="SQL database system devel files."
 MAINTAINER="pascal.bellard@slitaz.org"
-DEPENDS="zlib"
+DEPENDS="libmysqlclient zlib"
 WEB_SITE="http://www.mysql.com/"
 WANTED="mysql"
 
@@ -13,13 +13,10 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/mysql/plugin $fs/usr/share
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/share/aclocal $fs/usr/share
-	cp -a $_pkg/usr/lib/mysql/*.*a $fs/usr/lib/mysql
-	cp -a $_pkg/usr/lib/mysql/plugin/*.*a $fs/usr/lib/mysql/plugin
+	cp -a $install/usr/include $fs/usr
 	while read file; do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $_pkg$file $fs$file
+		cp -a $install$file $fs$file
 	done < $wanted_stuff/$PACKAGE.files-list
 }
diff -r a8fcb4e54df0 -r 96e4513829cd mysql-test/receipt
--- a/mysql-test/receipt	Fri Aug 03 13:19:54 2012 +0200
+++ b/mysql-test/receipt	Fri Aug 03 08:06:59 2012 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="mysql-test"
-VERSION="5.1.54"
+VERSION="5.5.27"
 CATEGORY="misc"
 SHORT_DESC="SQL database system tests and benchs."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -13,14 +13,12 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share
-	cp -a $_pkg/usr/mysql-test $fs/usr
-	cp -a $_pkg/usr/sql-bench $fs/usr
-	find $fs/usr/mysql-test $fs/usr/sql-bench -type d -exec chmod 2777 {} \;
+	cp -a $install/usr/mysql-test $fs/usr/share/mysql-test
+	cp -a $install/usr/sql-bench $fs/usr/share/sql-bench
+	find $fs/usr/share/mysql-test $fs/usr/share/sql-bench -type d -exec chmod 2777 {} \;
 	while read file; do
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
-		cp -a $_pkg$file $fs$file
+		cp -a $install$file $fs$file
 	done < $wanted_stuff/$PACKAGE.files-list
-	mv $fs/usr/mysql-test $fs/usr/share/mysql-test
-	mv $fs/usr/sql-bench $fs/usr/share/sql-bench
 }
diff -r a8fcb4e54df0 -r 96e4513829cd mysql/receipt
--- a/mysql/receipt	Fri Aug 03 13:19:54 2012 +0200
+++ b/mysql/receipt	Fri Aug 03 08:06:59 2012 +0000
@@ -1,43 +1,62 @@
 # SliTaz package receipt.
 
 PACKAGE="mysql"
-VERSION="5.1.54"
+VERSION="5.5.27"
 CATEGORY="office"
 SHORT_DESC="SQL database system."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.mysql.com/"
-WGET_URL="http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.1/$TARBALL"
+WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$TARBALL"
 CONFIG_FILES="/etc/mysql/my.cnf"
 DATABASE_FILES="/var/lib/mysql"
 CROSS="bug: can not run test programm"
 
 DEPENDS="busybox libmysqlclient mysql-client zlib slitaz-base-files \
-gcc-lib-base"
+gcc-lib-base openssl readline"
+BUILD_DEPENDS="cmake openssl-dev zlib-dev ncurses-dev readline-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-
-	cd $src
-	grep -q skip_do_abi_check Makefile.am ||
-	sed -i 's/^do_abi_check/&:\n\techo "Skipping &"\n\nreally_&/' Makefile.*
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--localstatedir=/var/lib/mysql \
-		--sysconfdir=/etc/mysql \
-		--libexecdir=/usr/sbin \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-mysqld-user=mysql \
-		--enable-thread-safe-client \
-		--with-plugins=innobase,innodb_plugin \
-		--mandir=/usr/share/man \
-		--build=$HOST_SYSTEM \
-		--host=$HOST_SYSTEM &&
-	make $MAKEFLAGS &&
-	make install
+	mkdir -p $WOK/$PACKAGE/source/build
+	cd $WOK/$PACKAGE/source/build
+	# CFLAGS/CXXFLAGS as suggested upstream
+	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+	cmake ../$PACKAGE-$VERSION \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_DATADIR=/var/lib/mysql \
+		-DMYSQL_UNIX_ADDR=/var/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=/usr/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_LIBWRAP=OFF \
+		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+		-DWITH_EXTRA_CHARSETS=complex \
+		-DWITH_EMBEDDED_SERVER=ON \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 &&
+	make && make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -52,14 +71,12 @@
 		$fs/var/run/mysqld
 
 	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/lib/mysql/plugin/*.so* $fs/usr/lib/mysql/plugin
 	cp -a $install/usr/share/mysql $fs/usr/share
 
 	# Configuration file
 	cp -a $stuff/etc/init.d $fs/etc
-	cp -a $src/support-files/my-medium.cnf $fs/etc/mysql/my.cnf
-	cp -a $src/support-files/my-small.cnf $fs/etc/mysql
+	cp -a $stuff/etc/mysql $fs/etc
 	grep -q "bind-address" $fs/etc/mysql/my.cnf || sed -i \
 		's/^\[mysqld\]/[mysqld]\nbind-address\t= 127.0.0.1/' \
 		$fs/etc/mysql/my.cnf
@@ -89,9 +106,16 @@
 		chroot $1/ adduser -s /bin/false -S -D -H -G $group $user
 		status
 	fi
-
-	chroot $1/ chown -R ${user}.${group} /var/lib/mysql /var/run/mysqld
-	
+	# adduser mysql if needed
+	if ! grep -q ${user} $1/etc/passwd; then
+		echo -n "Adding user MySQL..."
+		chroot $1/ /bin/adduser -s /bin/false -h /dev/null \
+			-g "MySQL Daemon user" -u 27 -H -D -S -G ${group} ${user}
+		status
+	fi
+	#chroot $1/ /bin/chown ${user}.${group} $(cat $1/$INSTALLED/$PACKAGE/files.list)
+	chroot "$1/" /bin/chown -R ${user}.${group} /var/lib/mysql /var/run/mysqld
+	chroot "$1/" mysql_install_db --user=${user} --basedir=/usr
 	cat <<EOF
 ----
 To start $PACKAGE server you can run :
@@ -113,6 +137,6 @@
 
 post_remove()
 {
-	echo "Removing user/group squid"
-	deluser mysql
+	echo "Removing user/group mysql"
+	chroot "$1/" deluser mysql
 }
diff -r a8fcb4e54df0 -r 96e4513829cd mysql/stuff/etc/mysql/my.cnf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mysql/stuff/etc/mysql/my.cnf	Fri Aug 03 08:06:59 2012 +0000
@@ -0,0 +1,145 @@
+# MySQL config file for medium systems.
+#
+# This is for a system with little memory (32M - 64M) where MySQL plays
+# an important part, or systems up to 128M where MySQL is used together with
+# other programs (such as a web server)
+#
+# MySQL programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, see:
+# http://dev.mysql.com/doc/mysql/en/option-files.html
+#
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
+
+# The following options will be passed to all MySQL clients
+[client]
+#password	= your_password
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+# Here follows entries for some specific programs
+
+# The MySQL server
+[mysqld]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+datadir		= /var/lib/mysql
+skip-external-locking
+key_buffer_size = 16M
+max_allowed_packet = 1M
+table_open_cache = 64
+sort_buffer_size = 512K
+net_buffer_length = 8K
+read_buffer_size = 256K
+read_rnd_buffer_size = 512K
+myisam_sort_buffer_size = 8M
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "enable-named-pipe" option) will render mysqld useless!
+# 
+skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
+log-bin=mysql-bin
+
+# binary logging format - mixed recommended
+binlog_format=mixed
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
+server-id	= 1
+
+# Replication Slave (comment out master section to use this)
+#
+# To configure this host as a replication slave, you can choose between
+# two methods :
+#
+# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
+#    the syntax is:
+#
+#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
+#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
+#
+#    where you replace <host>, <user>, <password> by quoted strings and
+#    <port> by the master's port number (3306 by default).
+#
+#    Example:
+#
+#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
+#    MASTER_USER='joe', MASTER_PASSWORD='secret';
+#
+# OR
+#
+# 2) Set the variables below. However, in case you choose this method, then
+#    start replication for the first time (even unsuccessfully, for example
+#    if you mistyped the password in master-password and the slave fails to
+#    connect), the slave will create a master.info file, and any later
+#    change in this file to the variables' values below will be ignored and
+#    overridden by the content of the master.info file, unless you shutdown
+#    the slave server, delete master.info and restart the slaver server.
+#    For that reason, you may want to leave the lines below untouched
+#    (commented) and instead use CHANGE MASTER TO (see above)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin=mysql-bin
+
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_home_dir = /var/lib/mysql
+#innodb_data_file_path = ibdata1:10M:autoextend
+#innodb_log_group_home_dir = /var/lib/mysql
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+#innodb_log_file_size = 5M
+#innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+#innodb_lock_wait_timeout = 50
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout
diff -r a8fcb4e54df0 -r 96e4513829cd mysql/stuff/mysql-client.files-list
--- a/mysql/stuff/mysql-client.files-list	Fri Aug 03 13:19:54 2012 +0200
+++ b/mysql/stuff/mysql-client.files-list	Fri Aug 03 08:06:59 2012 +0000
@@ -1,6 +1,25 @@
+/usr/bin/innochecksum
 /usr/bin/msql2mysql
 /usr/bin/mysql
+/usr/bin/myisamchk
+/usr/bin/myisamlog
+/usr/bin/myisampack
+/usr/bin/myisam_ftdump
+/usr/bin/mysqlaccess
+/usr/bin/mysqlbinlog
+/usr/bin/mysqlbug
+/usr/bin/mysqld
+/usr/bin/mysqldumpslow
+/usr/bin/mysqld_multi
+/usr/bin/mysqld_safe
+/usr/bin/mysqlhotcopy
+/usr/bin/mysql_convert_table_format
 /usr/bin/mysql_find_rows
+/usr/bin/mysql_fix_extensions
+/usr/bin/mysql_install_db
+/usr/bin/mysql_secure_installation
+/usr/bin/mysql_tzinfo_to_sql
+/usr/bin/mysql_upgrade
 /usr/bin/mysql_waitpid
 /usr/bin/mysqlaccess
 /usr/bin/mysqladmin
@@ -9,3 +28,9 @@
 /usr/bin/mysqldump
 /usr/bin/mysqlimport
 /usr/bin/mysqlshow
+/usr/bin/mysql_zap
+/usr/bin/my_print_defaults
+/usr/bin/perror
+/usr/bin/replace
+/usr/bin/resolveip
+/usr/bin/resolve_stack_dump