mysql, maj 5.5.11-1

5 files changed, 199 insertions, 88 deletions

diff --git a/extra/mysql/.footprint.i686 b/extra/mysql/.footprint.i686
index 7c9879898..3c547ea72 100644
--- a/extra/mysql/.footprint.i686
+++ b/extra/mysql/.footprint.i686
@@ -32,29 +32,48 @@ drwxr-xr-x	root/root	usr/bin/
 -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
 -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/mysqlbinlog
 -rwxr-xr-x	root/root	usr/bin/mysqlbug
+-rwxr-xr-x	root/root	usr/bin/mysqld
 -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/mysqldumpslow
 -rwxr-xr-x	root/root	usr/bin/mysqlhotcopy
+-rwxr-xr-x	root/root	usr/bin/mysqltest
 -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/sbin/
--rwxr-xr-x	root/root	usr/sbin/mysqld
--rwxr-xr-x	root/root	usr/sbin/mysqlmanager
+drwxr-xr-x	root/root	usr/data/
+drwxr-xr-x	root/root	usr/data/mysql/
+-rw-r--r--	root/root	usr/data/mysql/.empty (EMPTY)
+drwxr-xr-x	root/root	usr/data/test/
+-rw-r--r--	root/root	usr/data/test/.empty (EMPTY)
+drwxr-xr-x	root/root	usr/lib/
+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
+drwxr-xr-x	root/root	usr/lib/mysql/plugin/debug/
+-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/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/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/comp_err.1.gz
@@ -67,14 +86,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/myisampack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql-stress-test.pl.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql-test-run.pl.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysql.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql.server.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_client_test.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysql_config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_convert_table_format.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_find_rows.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_fix_extensions.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysql_fix_privilege_tables.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_install_db.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_secure_installation.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_setpermission.1.gz
@@ -83,19 +99,13 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/mysql_waitpid.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_zap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlaccess.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqladmin.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlbinlog.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlbug.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlcheck.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqld_multi.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqld_safe.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqldump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqldumpslow.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlhotcopy.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlimport.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlman.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlshow.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlslap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqltest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/perror.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/replace.1.gz
@@ -103,11 +113,16 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/resolveip.1.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/mysqld.8.gz
--rw-r--r--	root/root	usr/share/man/man8/mysqlmanager.8.gz
 drwxr-xr-x	root/root	usr/share/mysql/
--rw-r--r--	root/root	usr/share/mysql/binary-configure
+-rw-r--r--	root/root	usr/share/mysql/COPYING
+-rw-r--r--	root/root	usr/share/mysql/INSTALL-BINARY
+-rw-r--r--	root/root	usr/share/mysql/README
+drwxr-xr-x	root/root	usr/share/mysql/aclocal/
+-rw-r--r--	root/root	usr/share/mysql/aclocal/mysql.m4
+-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/README
 -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
@@ -132,18 +147,20 @@ 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/czech/
 -rw-r--r--	root/root	usr/share/mysql/czech/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/danish/
 -rw-r--r--	root/root	usr/share/mysql/danish/errmsg.sys
+drwxr-xr-x	root/root	usr/share/mysql/docs/
+-rw-r--r--	root/root	usr/share/mysql/docs/mysql.info
 drwxr-xr-x	root/root	usr/share/mysql/dutch/
 -rw-r--r--	root/root	usr/share/mysql/dutch/errmsg.sys
 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
 drwxr-xr-x	root/root	usr/share/mysql/estonian/
 -rw-r--r--	root/root	usr/share/mysql/estonian/errmsg.sys
 -rw-r--r--	root/root	usr/share/mysql/fill_help_tables.sql
@@ -161,21 +178,19 @@ drwxr-xr-x	root/root	usr/share/mysql/japanese/
 -rw-r--r--	root/root	usr/share/mysql/japanese/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/korean/
 -rw-r--r--	root/root	usr/share/mysql/korean/errmsg.sys
--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	usr/share/mysql/norwegian-ny/
 -rw-r--r--	root/root	usr/share/mysql/norwegian-ny/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/norwegian/
@@ -198,3 +213,10 @@ drwxr-xr-x	root/root	usr/share/mysql/swedish/
 -rw-r--r--	root/root	usr/share/mysql/swedish/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/ukrainian/
 -rw-r--r--	root/root	usr/share/mysql/ukrainian/errmsg.sys
+drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/lib/
+drwx------	root/root	var/lib/mysql/
+drwx------	root/root	var/lib/mysql/mysql/
+-rwx------	root/root	var/lib/mysql/mysql/.empty (EMPTY)
+drwx------	root/root	var/lib/mysql/test/
+-rwx------	root/root	var/lib/mysql/test/.empty (EMPTY)
diff --git a/extra/mysql/.footprint.x86_64 b/extra/mysql/.footprint.x86_64
index 7c9879898..3c547ea72 100644
--- a/extra/mysql/.footprint.x86_64
+++ b/extra/mysql/.footprint.x86_64
@@ -32,29 +32,48 @@ drwxr-xr-x	root/root	usr/bin/
 -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
 -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/mysqlbinlog
 -rwxr-xr-x	root/root	usr/bin/mysqlbug
+-rwxr-xr-x	root/root	usr/bin/mysqld
 -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/mysqldumpslow
 -rwxr-xr-x	root/root	usr/bin/mysqlhotcopy
+-rwxr-xr-x	root/root	usr/bin/mysqltest
 -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/sbin/
--rwxr-xr-x	root/root	usr/sbin/mysqld
--rwxr-xr-x	root/root	usr/sbin/mysqlmanager
+drwxr-xr-x	root/root	usr/data/
+drwxr-xr-x	root/root	usr/data/mysql/
+-rw-r--r--	root/root	usr/data/mysql/.empty (EMPTY)
+drwxr-xr-x	root/root	usr/data/test/
+-rw-r--r--	root/root	usr/data/test/.empty (EMPTY)
+drwxr-xr-x	root/root	usr/lib/
+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
+drwxr-xr-x	root/root	usr/lib/mysql/plugin/debug/
+-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/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/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/comp_err.1.gz
@@ -67,14 +86,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/myisampack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql-stress-test.pl.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql-test-run.pl.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysql.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql.server.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_client_test.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysql_config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_convert_table_format.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_find_rows.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_fix_extensions.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysql_fix_privilege_tables.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_install_db.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_secure_installation.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_setpermission.1.gz
@@ -83,19 +99,13 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/mysql_waitpid.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysql_zap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlaccess.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqladmin.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlbinlog.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlbug.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlcheck.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqld_multi.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqld_safe.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqldump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqldumpslow.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlhotcopy.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlimport.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqlman.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlshow.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mysqlslap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mysqltest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/perror.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/replace.1.gz
@@ -103,11 +113,16 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/resolveip.1.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/mysqld.8.gz
--rw-r--r--	root/root	usr/share/man/man8/mysqlmanager.8.gz
 drwxr-xr-x	root/root	usr/share/mysql/
--rw-r--r--	root/root	usr/share/mysql/binary-configure
+-rw-r--r--	root/root	usr/share/mysql/COPYING
+-rw-r--r--	root/root	usr/share/mysql/INSTALL-BINARY
+-rw-r--r--	root/root	usr/share/mysql/README
+drwxr-xr-x	root/root	usr/share/mysql/aclocal/
+-rw-r--r--	root/root	usr/share/mysql/aclocal/mysql.m4
+-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/README
 -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
@@ -132,18 +147,20 @@ 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/czech/
 -rw-r--r--	root/root	usr/share/mysql/czech/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/danish/
 -rw-r--r--	root/root	usr/share/mysql/danish/errmsg.sys
+drwxr-xr-x	root/root	usr/share/mysql/docs/
+-rw-r--r--	root/root	usr/share/mysql/docs/mysql.info
 drwxr-xr-x	root/root	usr/share/mysql/dutch/
 -rw-r--r--	root/root	usr/share/mysql/dutch/errmsg.sys
 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
 drwxr-xr-x	root/root	usr/share/mysql/estonian/
 -rw-r--r--	root/root	usr/share/mysql/estonian/errmsg.sys
 -rw-r--r--	root/root	usr/share/mysql/fill_help_tables.sql
@@ -161,21 +178,19 @@ drwxr-xr-x	root/root	usr/share/mysql/japanese/
 -rw-r--r--	root/root	usr/share/mysql/japanese/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/korean/
 -rw-r--r--	root/root	usr/share/mysql/korean/errmsg.sys
--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	usr/share/mysql/norwegian-ny/
 -rw-r--r--	root/root	usr/share/mysql/norwegian-ny/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/norwegian/
@@ -198,3 +213,10 @@ drwxr-xr-x	root/root	usr/share/mysql/swedish/
 -rw-r--r--	root/root	usr/share/mysql/swedish/errmsg.sys
 drwxr-xr-x	root/root	usr/share/mysql/ukrainian/
 -rw-r--r--	root/root	usr/share/mysql/ukrainian/errmsg.sys
+drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/lib/
+drwx------	root/root	var/lib/mysql/
+drwx------	root/root	var/lib/mysql/mysql/
+-rwx------	root/root	var/lib/mysql/mysql/.empty (EMPTY)
+drwx------	root/root	var/lib/mysql/test/
+-rwx------	root/root	var/lib/mysql/test/.empty (EMPTY)
diff --git a/extra/mysql/.md5sum.i686 b/extra/mysql/.md5sum.i686
index 985d9ace4..c2ff66857 100644
--- a/extra/mysql/.md5sum.i686
+++ b/extra/mysql/.md5sum.i686
@@ -1 +1 @@
-e07e79edad557874d0870c914c9c81e1  mysql-5.1.55.tar.gz
+befa4e0d0aa95be6c8f6f143ae3b0641  mysql-5.5.11.tar.gz
diff --git a/extra/mysql/.md5sum.x86_64 b/extra/mysql/.md5sum.x86_64
index 985d9ace4..c2ff66857 100644
--- a/extra/mysql/.md5sum.x86_64
+++ b/extra/mysql/.md5sum.x86_64
@@ -1 +1 @@
-e07e79edad557874d0870c914c9c81e1  mysql-5.1.55.tar.gz
+befa4e0d0aa95be6c8f6f143ae3b0641  mysql-5.5.11.tar.gz
diff --git a/extra/mysql/Pkgfile b/extra/mysql/Pkgfile
index 721cc494f..8500cabcd 100644
--- a/extra/mysql/Pkgfile
+++ b/extra/mysql/Pkgfile
@@ -2,47 +2,114 @@
 # URL: http://www.mysql.com
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: mysqlclient
+# Depends on: cmake, mysqlclient
 # Run on: mysqlclient
 
 name=mysql
-version=5.1.55
+version=5.5.11
+#5.1.55
 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)
 
 build () {
 	source /etc/blfs-bootscripts
         wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
-	cd $name-$version
-	libtoolize --force
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --libexecdir=/usr/sbin \
-                --localstatedir=/srv/mysql \
-                --enable-assembler \
-                --enable-thread-safe-client \
-                --enable-local-infile \
-                --with-unix-socket-path=/var/run/mysql/mysql.sock \
-                --with-extra-charsets=all \
-		--with-plugins=partition,innobase,innodb_plugin \
-                --without-debug \
-                --without-readline \
-                --without-docs \
-                --without-bench 
-	make
-	make DESTDIR=$PKG install
-	rm -r $PKG/usr/{mysql-test,sql-bench}
-	for i in mysql mysql_upgrade \
-	mysqladmin mysqlbinlog \
-	mysqlcheck mysqldump mysqlimport mysqlshow \
-	mysqlslap mysqltest mysql_config
-	do rm -r $PKG/usr/bin/$i
-	done
-	rm $PKG/usr/share/mysql/charsets/README
+
+ 	cd $SRC
+        mkdir build
+        cd build
+
+        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 ../mysql-$version \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DMYSQL_DATADIR=/var/lib/mysql \
+            -DSYSCONFDIR=/etc/mysql \
+            -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_SHAREDIR=share/mysql \
+            -DWITH_READLINE=ON \
+            -DWITH_ZLIB=system \
+            -DWITH_SSL=system \
+            -DWITH_LIBWRAP=ON \
+            -DDEFAULT_CHARSET=utf8 \
+            -DDEFAULT_COLLATION=utf8_general_ci \
+            -DWITH_EXTRA_CHARSETS=complex \
+            -DWITH_EMBEDDED_SERVER=ON \
+            -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+            -DENABLED_LOCAL_INFILE=ON \
+            -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 \
+            -DWITH_INNOBASE_STORAGE_ENGINE=1
+
+        make
+
+	cd $SRC/build
+  	make DESTDIR=$PKG install
+
+#  	install -Dm644 $SRC/my.cnf $PKG/etc/mysql/my.cnf
+#  	install -Dm755 $SRC/mysqld $PKG/etc/rc.d/mysqld
+
+  	# provided by libmysqlclient
+  	rm $PKG/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  	rm $PKG/usr/lib/libmysql*
+  	rm -r $PKG/usr/include/
+  	rm $PKG/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  
+  	# provided by mysql-clients
+  	rm $PKG/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  	rm $PKG/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  	# not needed
+  	rm -r $PKG/usr/{mysql-test,sql-bench}
+
+  	# These shouldn't be here
+  	rm -r $PKG/usr/docs
+  	install -d $PKG/var/lib/mysql
+  	cp -r $PKG/usr/data/* $PKG/var/lib/mysql/
+  	chmod -R 700 $PKG/var/lib/mysql
+
+#	cd $name-$version
+#	libtoolize --force
+#	aclocal
+#	autoconf
+#	automake
+#	./configure --prefix=/usr \
+#               --sysconfdir=/etc \
+#                --libexecdir=/usr/sbin \
+#               --localstatedir=/srv/mysql \
+#               --enable-assembler \
+#               --enable-thread-safe-client \
+#               --enable-local-infile \
+#               --with-unix-socket-path=/var/run/mysql/mysql.sock \
+#               --with-extra-charsets=all \
+#		--with-plugins=partition,innobase,innodb_plugin \
+#               --without-debug \
+#               --without-readline \
+#               --without-docs \
+#               --without-bench 
+#	make
+#	make DESTDIR=$PKG install
+#	rm -r $PKG/usr/{mysql-test,sql-bench}
+#	for i in mysql mysql_upgrade \
+#	mysqladmin mysqlbinlog \
+#	mysqlcheck mysqldump mysqlimport mysqlshow \
+#	mysqlslap mysqltest mysql_config
+#	do rm -r $PKG/usr/bin/$i
+#	done
+#	rm $PKG/usr/share/mysql/charsets/README
 	mkdir -p $PKG/etc
 	install -v -m644 $PKG/usr/share/mysql/my-medium.cnf \
 	$PKG/etc/my.cnf
@@ -50,7 +117,7 @@ build () {
 	$PKG/etc/my.cnf
 	cd ../$scripts-$scriptsversion
 	make DESTDIR=$PKG install-mysql
-	# Suppression des librairies
-	rm -r $PKG/usr/{include,lib}
+#	# Suppression des librairies
+#	rm -r $PKG/usr/{include,lib}
 }