Mon Apr 14 15:29:21 2014 UTC ()
Pullup ticket #4373 - requested by taca
databases/mysql55-client: security update
databases/mysql56-server: update to keep in sync with with "mysql55-client"

Revisions pulled up:
- databases/mysql55-client/Makefile                             1.16
- databases/mysql55-client/Makefile.common                      1.35
- databases/mysql55-client/distinfo                             1.32
- databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt 1.2
- databases/mysql55-server/Makefile                             1.20
- databases/mysql55-server/PLIST                                1.28

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Mar 31 08:03:23 UTC 2014

   Modified Files:
   	pkgsrc/databases/mysql55-client: Makefile Makefile.common distinfo
   	pkgsrc/databases/mysql55-client/patches: patch-libmysql_CMakeLists.txt
   	pkgsrc/databases/mysql55-server: Makefile PLIST

   Log Message:
   Changes 5.5.37:

   Functionality Added or Changed

   On Solaris, mysql_config --libs now includes -R/path/to/library so that libraries can be found at runtime.

   Bugs Fixed

   InnoDB: A regression introduced by Bug 14329288 would result in a performance degradation when a compressed table does not fit into memory.

   InnoDB: The maximum value for innodb_thread_sleep_delay is now 1000000 microseconds. The previous maximum value (4294967295 microseconds on 32-bit and 18446744073709551615 microseconds on 64-bit) was unnecessarily large. Because the maximum value of innodb_thread_sleep_delay is limited by the value set for innodb_adaptive_max_sleep_delay (when set to a non-zero value), the maximum value for innodb_thread_sleep_delay is now the same as the maximum value for innodb_adaptive_max_sleep_delay.

   InnoDB: In debug builds, creating a unique index on a binary column, with input data containing duplicate keys, would cause an assertion.

   InnoDB: InnoDB would fail to start when innodb_data_file_path specified the data file size in kilobytes by appending K to the size value.

   InnoDB: An insert buffer merge would cause an assertion error due to incorrectly handled ownership information for externally stored BLOBs.

   InnoDB: Assertion failure in thread thread_num in file ibuf0ibuf.cc line 4080
   InnoDB: Failing assertion: rec_get_deleted_flag(rec, page_is_comp(page))

   InnoDB: Decreasing the auto_increment_increment value would have no affect on the next auto-increment value.

   Replication: The server did not handle correctly the insertion of a row larger than 4 GB when using row-based replication.

   Replication: When using row-based replication, an additional auto-increment column on the slave version of a table was not updated correctly; a zero was inserted instead.

   Replication: Statements involving the Performance Schema tables should not be written to the binary log, because the content of these tables is applicable only to a given MySQL Server instance, and may differ greatly between different servers in a replication topology. The database administrator should be able to configure (INSERT, UPDATE, or DELETE) or flush (TRUNCATE TABLE) performance schema tables on a single server without affecting others. However, when replicating from a MySQL 5.5 master to a MySQL 5.5 or later slave, warnings about unsafe statements updating Performance Schema tables were elevated to errors. For MySQL 5.6 and later slaves, this prevented the simultaneous use of performance_schema and GTIDs (see Replication with Global Transaction Identifiers, in the MySQL 5.6 Manual).

   This fix causes all updates on tables in the performance_schema database to be filtered on the master and not replicated, regardless of the type of logging that is in effect. Prior to this fix, statements using were handled by being marked as unsafe for replication, which caused warnings during execution; the statements were nonetheless written to the binary log, regardless of the logging format in effect.

   Existing replication behavior for tables in the INFORMATION_SCHEMA database is not changed by this fix.

   For more information, see MySQL Performance Schema.

   Compilation failed if MySQL was configured with CFLAGS set to include a -Werror option with an argument.

   A shared libmysqld embedded server library was not built on Linux.

   While printing the server version, the mysql client did not check for buffer overflow in a string variable.

   Contraction information in a collation could be mishandled, resulting in incorrect decisions about whether a character is part of a contraction, and miscalculation of contraction weights.

   DROP TRIGGER succeeded even with the read_only system variable enabled.

   Updating the Performance Schema setup_instruments table on a replication master caused a slave to exit.

   Due to a race condition, it was possible for two threads to end up with the same query ID for different queries.

   When run by root, mysqld --help --verbose exited with a nonzero error code after displaying the help message.

   MySQL client programs from a Community Edition distribution could not connect using SSL to a MySQL server from an Enterprise Edition. This was due to a difference in certificate handling by yaSSL and OpenSSL (used for Community and Enterprise, respectively). OpenSSL expected a blank certificate to be sent when not all of the --ssl-ca, --ssl-cert, and --ssl-key options were specified, and yaSSL did not do so. To resolve this, yaSSL has been modified to send a blank certificate when an option is missing.

   A deadlock error occurring during subquery execution could cause an assertion to be raised.

   The Performance Schema stage/sql/Waiting to get readlock instrument is no longer used and has been removed.

   For system variables that take a string value, SET statements permitted an unquoted value, but values that contained dots were parsed incorrectly and only part of the value was assigned. For example, SET GLOBAL slow_query_log_file = my_slow.log assigned the value my_slow. Now such values must be quoted or an error occurs.

   On Windows, mysql_install_db.pl could be run only from within the bin directory under the installation directory.


(tron)
diff -r1.15 -r1.15.2.1 pkgsrc/databases/mysql55-client/Makefile
diff -r1.34 -r1.34.2.1 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.31 -r1.31.2.1 pkgsrc/databases/mysql55-client/distinfo
diff -r1.1 -r1.1.4.1 pkgsrc/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt
diff -r1.19 -r1.19.2.1 pkgsrc/databases/mysql55-server/Makefile
diff -r1.27 -r1.27.2.1 pkgsrc/databases/mysql55-server/PLIST

cvs diff -r1.15 -r1.15.2.1 pkgsrc/databases/mysql55-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile 2014/02/12 23:17:39 1.15
+++ pkgsrc/databases/mysql55-client/Attic/Makefile 2014/04/14 15:29:21 1.15.2.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.15 2014/02/12 23:17:39 tron Exp $ 1# $NetBSD: Makefile,v 1.15.2.1 2014/04/14 15:29:21 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 1 
5SVR4_PKGNAME= mysqc 4SVR4_PKGNAME= mysqc
6COMMENT= MySQL 5, a free SQL database (client) 5COMMENT= MySQL 5, a free SQL database (client)
7 6
8CONFLICTS= mysql3-client-[0-9]* 7CONFLICTS= mysql3-client-[0-9]*
9 8
10.include "Makefile.common" 9.include "Makefile.common"
11 10
12CMAKE_ARGS+= -DWITHOUT_SERVER=ON 11CMAKE_ARGS+= -DWITHOUT_SERVER=ON
13CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF 12CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
14UNWRAP_FILES+= scripts/mysql_config 13UNWRAP_FILES+= scripts/mysql_config
15INFO_FILES= yes 14INFO_FILES= yes
16INSTALL_DIRS+= client include libmysql man scripts tests 15INSTALL_DIRS+= client include libmysql man scripts tests
17 16

cvs diff -r1.34 -r1.34.2.1 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2014/02/01 11:16:03 1.34
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2014/04/14 15:29:21 1.34.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.34 2014/02/01 11:16:03 adam Exp $ 1# $NetBSD: Makefile.common,v 1.34.2.1 2014/04/14 15:29:21 tron Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.36 6DISTNAME= mysql-5.5.37
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run

cvs diff -r1.31 -r1.31.2.1 pkgsrc/databases/mysql55-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/distinfo 2014/02/13 15:47:15 1.31
+++ pkgsrc/databases/mysql55-client/Attic/distinfo 2014/04/14 15:29:21 1.31.2.1
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: distinfo,v 1.31 2014/02/13 15:47:15 jperkin Exp $ 1$NetBSD: distinfo,v 1.31.2.1 2014/04/14 15:29:21 tron Exp $
2 2
3SHA1 (mysql-5.5.36.tar.gz) = 581d49e1a38d5536c8268350e2f91ed9d461909d 3SHA1 (mysql-5.5.37.tar.gz) = b5f15ff72c86358693c250203e7cb9c20fbe5f7f
4RMD160 (mysql-5.5.36.tar.gz) = 7651338751545a30652836d9c7bb0d3102592180 4RMD160 (mysql-5.5.37.tar.gz) = 1af56fc6d508a512fbac3372a0db50722b8c5f4e
5Size (mysql-5.5.36.tar.gz) = 21723910 bytes 5Size (mysql-5.5.37.tar.gz) = 21718944 bytes
6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
7SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a 7SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a
8SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf 8SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
9SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 9SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0
10SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 10SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
11SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 11SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600
12SHA1 (patch-cmake_dtrace.cmake) = 5ae3284589a17a8375b8a546136965fa337f3767 12SHA1 (patch-cmake_dtrace.cmake) = 5ae3284589a17a8375b8a546136965fa337f3767
13SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 13SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
14SHA1 (patch-cmake_plugin.cmake) = 2b702af6bf8f251886cea12cf7477abae7659230 14SHA1 (patch-cmake_plugin.cmake) = 2b702af6bf8f251886cea12cf7477abae7659230
15SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d 15SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d
16SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 16SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
17SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 17SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
18SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af 18SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
19SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 19SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
20SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 20SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
21SHA1 (patch-libmysql_CMakeLists.txt) = 83deca6faca4116a088db87bf359524e3e6cd3ff 21SHA1 (patch-libmysql_CMakeLists.txt) = 80c8a7d1c1ed8dca49fba647aba31561981f3913
22SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 22SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
23SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3 23SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3
24SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 24SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
25SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478 25SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478
26SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76 26SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76
27SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8 27SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8
28SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c 28SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c
29SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141 29SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141
30SHA1 (patch-storage_archive_CMakeLists.txt) = 1144fc8dda537be12656e76c2a714f2af59d0368 30SHA1 (patch-storage_archive_CMakeLists.txt) = 1144fc8dda537be12656e76c2a714f2af59d0368
31SHA1 (patch-storage_blackhole_CMakeLists.txt) = c8907f400c64e7405a2d112b80892fa0a395d212 31SHA1 (patch-storage_blackhole_CMakeLists.txt) = c8907f400c64e7405a2d112b80892fa0a395d212
32SHA1 (patch-storage_csv_CMakeLists.txt) = 59ef822fe0eeb65bd003a5cc6849b57d26276b56 32SHA1 (patch-storage_csv_CMakeLists.txt) = 59ef822fe0eeb65bd003a5cc6849b57d26276b56
33SHA1 (patch-storage_example_CMakeLists.txt) = 10b4e505dc2d7291b9f61228e34426f2f99479b5 33SHA1 (patch-storage_example_CMakeLists.txt) = 10b4e505dc2d7291b9f61228e34426f2f99479b5
34SHA1 (patch-storage_federated_CMakeLists.txt) = aec604eca871e9efcde479a31569127746884c92 34SHA1 (patch-storage_federated_CMakeLists.txt) = aec604eca871e9efcde479a31569127746884c92

cvs diff -r1.1 -r1.1.4.1 pkgsrc/databases/mysql55-client/patches/Attic/patch-libmysql_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/patches/Attic/patch-libmysql_CMakeLists.txt 2013/12/15 18:45:19 1.1
+++ pkgsrc/databases/mysql55-client/patches/Attic/patch-libmysql_CMakeLists.txt 2014/04/14 15:29:21 1.1.4.1
@@ -1,26 +1,22 @@ @@ -1,26 +1,22 @@
1$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1 2013/12/15 18:45:19 asau Exp $ 1$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1.4.1 2014/04/14 15:29:21 tron Exp $
2 2
3Use uniform shared library names to avoid packaging list divergence. 3Use uniform shared library names to avoid packaging list divergence.
4 4
5--- libmysql/CMakeLists.txt.orig 2013-11-05 07:19:26.000000000 +0000 5--- libmysql/CMakeLists.txt.orig 2014-03-14 18:58:32.000000000 +0000
6+++ libmysql/CMakeLists.txt 2013-12-15 17:49:19.435504292 +0000 6+++ libmysql/CMakeLists.txt
7@@ -193,13 +193,13 @@ 7@@ -207,14 +207,8 @@ IF(NOT DISABLE_SHARED)
8 MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) 8 COMPONENT SharedLibraries)
9 IF(UNIX) 9 IF(UNIX)
10 # libtool compatability 10 # libtool compatability
11- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) 11- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
12- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") 12- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
13- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") 13- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
14- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") 14- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
15- ELSE() 15- ELSE()
16+# IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) 16- SET(OS_SHARED_LIB_VERSION
17+# SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") 17+ SET(OS_SHARED_LIB_VERSION
18+# ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") 18 "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
19+# SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") 
20+# ELSE() 
21 SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0") 
22- ENDIF() 19- ENDIF()
23+# ENDIF() 
24 # Name of shared library is mysqlclient on Unix 20 # Name of shared library is mysqlclient on Unix
25 SET_TARGET_PROPERTIES(libmysql PROPERTIES  21 SET_TARGET_PROPERTIES(libmysql PROPERTIES
26 OUTPUT_NAME mysqlclient  22 OUTPUT_NAME mysqlclient

cvs diff -r1.19 -r1.19.2.1 pkgsrc/databases/mysql55-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/Makefile 2014/03/11 14:34:36 1.19
+++ pkgsrc/databases/mysql55-server/Attic/Makefile 2014/04/14 15:29:21 1.19.2.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.19 2014/03/11 14:34:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.19.2.1 2014/04/14 15:29:21 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 1 
5SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
6COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
7 6
8CONFLICTS= mysql3-server-[0-9]* 7CONFLICTS= mysql3-server-[0-9]*
9 8
10.include "../../databases/mysql55-client/Makefile.common" 9.include "../../databases/mysql55-client/Makefile.common"
11 10
12CMAKE_ARGS+= -DWITH_LIBWRAP=ON 11CMAKE_ARGS+= -DWITH_LIBWRAP=ON
13CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR} 12CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
14 13
15.if !empty(PKG_OPTIONS:Membedded-server) 14.if !empty(PKG_OPTIONS:Membedded-server)
16CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 15CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
17PLIST.embedded= yes 16PLIST.embedded= yes

cvs diff -r1.27 -r1.27.2.1 pkgsrc/databases/mysql55-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/PLIST 2014/03/11 14:05:00 1.27
+++ pkgsrc/databases/mysql55-server/Attic/PLIST 2014/04/14 15:29:21 1.27.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.27 2014/03/11 14:05:00 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.27.2.1 2014/04/14 15:29:21 tron Exp $
2bin/innochecksum 2bin/innochecksum
3bin/my_print_defaults 3bin/my_print_defaults
4bin/myisam_ftdump 4bin/myisam_ftdump
5bin/myisamchk 5bin/myisamchk
6bin/myisamlog 6bin/myisamlog
7bin/myisampack 7bin/myisampack
8${PLIST.embedded}bin/mysql_client_test_embedded 8${PLIST.embedded}bin/mysql_client_test_embedded
9${PLIST.embedded}bin/mysql_embedded 9${PLIST.embedded}bin/mysql_embedded
10bin/mysql_tzinfo_to_sql 10bin/mysql_tzinfo_to_sql
11bin/mysql_waitpid 11bin/mysql_waitpid
12${PLIST.embedded}bin/mysqltest_embedded 12${PLIST.embedded}bin/mysqltest_embedded
13bin/perror 13bin/perror
14bin/replace 14bin/replace
@@ -2888,43 +2888,46 @@ share/mysql/test/suite/funcs_2/data/char @@ -2888,43 +2888,46 @@ share/mysql/test/suite/funcs_2/data/char
2888share/mysql/test/suite/funcs_2/include/check_charset.inc 2888share/mysql/test/suite/funcs_2/include/check_charset.inc
2889share/mysql/test/suite/funcs_2/include/check_charset_ucs2.inc 2889share/mysql/test/suite/funcs_2/include/check_charset_ucs2.inc
2890share/mysql/test/suite/funcs_2/include/check_charset_utf8.inc 2890share/mysql/test/suite/funcs_2/include/check_charset_utf8.inc
2891share/mysql/test/suite/funcs_2/lib/gen_charset_utf8.pl 2891share/mysql/test/suite/funcs_2/lib/gen_charset_utf8.pl
2892share/mysql/test/suite/funcs_2/r/innodb_charset.result 2892share/mysql/test/suite/funcs_2/r/innodb_charset.result
2893share/mysql/test/suite/funcs_2/r/memory_charset.result 2893share/mysql/test/suite/funcs_2/r/memory_charset.result
2894share/mysql/test/suite/funcs_2/r/myisam_charset.result 2894share/mysql/test/suite/funcs_2/r/myisam_charset.result
2895share/mysql/test/suite/funcs_2/readme.txt 2895share/mysql/test/suite/funcs_2/readme.txt
2896share/mysql/test/suite/funcs_2/t/disabled.def 2896share/mysql/test/suite/funcs_2/t/disabled.def
2897share/mysql/test/suite/funcs_2/t/innodb_charset.test 2897share/mysql/test/suite/funcs_2/t/innodb_charset.test
2898share/mysql/test/suite/funcs_2/t/memory_charset.test 2898share/mysql/test/suite/funcs_2/t/memory_charset.test
2899share/mysql/test/suite/funcs_2/t/myisam_charset.test 2899share/mysql/test/suite/funcs_2/t/myisam_charset.test
2900share/mysql/test/suite/funcs_2/t/suite.opt 2900share/mysql/test/suite/funcs_2/t/suite.opt
 2901share/mysql/test/suite/innodb/r/blob-update-debug.result
 2902share/mysql/test/suite/innodb/r/create-index.result
2901share/mysql/test/suite/innodb/r/innodb-analyze.result 2903share/mysql/test/suite/innodb/r/innodb-analyze.result
2902share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result 2904share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result
2903share/mysql/test/suite/innodb/r/innodb-autoinc-44030.result 2905share/mysql/test/suite/innodb/r/innodb-autoinc-44030.result
2904share/mysql/test/suite/innodb/r/innodb-autoinc-56228.result 2906share/mysql/test/suite/innodb/r/innodb-autoinc-56228.result
2905share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result 2907share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result
2906share/mysql/test/suite/innodb/r/innodb-autoinc.result 2908share/mysql/test/suite/innodb/r/innodb-autoinc.result
2907share/mysql/test/suite/innodb/r/innodb-blob.result 2909share/mysql/test/suite/innodb/r/innodb-blob.result
2908share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result 2910share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result
2909share/mysql/test/suite/innodb/r/innodb-consistent.result 2911share/mysql/test/suite/innodb/r/innodb-consistent.result
2910share/mysql/test/suite/innodb/r/innodb-index.result 2912share/mysql/test/suite/innodb/r/innodb-index.result
2911share/mysql/test/suite/innodb/r/innodb-index_ucs2.result 2913share/mysql/test/suite/innodb/r/innodb-index_ucs2.result
2912share/mysql/test/suite/innodb/r/innodb-lock.result 2914share/mysql/test/suite/innodb/r/innodb-lock.result
2913share/mysql/test/suite/innodb/r/innodb-replace.result 2915share/mysql/test/suite/innodb/r/innodb-replace.result
2914share/mysql/test/suite/innodb/r/innodb-semi-consistent.result 2916share/mysql/test/suite/innodb/r/innodb-semi-consistent.result
2915share/mysql/test/suite/innodb/r/innodb-timeout.result 2917share/mysql/test/suite/innodb/r/innodb-timeout.result
2916share/mysql/test/suite/innodb/r/innodb-truncate.result 2918share/mysql/test/suite/innodb/r/innodb-truncate.result
2917share/mysql/test/suite/innodb/r/innodb-ucs2.result 2919share/mysql/test/suite/innodb/r/innodb-ucs2.result
 2920share/mysql/test/suite/innodb/r/innodb-update-insert.result
2918share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result 2921share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result
2919share/mysql/test/suite/innodb/r/innodb.result 2922share/mysql/test/suite/innodb/r/innodb.result
2920share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result 2923share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
2921share/mysql/test/suite/innodb/r/innodb_bug11754376.result 2924share/mysql/test/suite/innodb/r/innodb_bug11754376.result
2922share/mysql/test/suite/innodb/r/innodb_bug11766634.result 2925share/mysql/test/suite/innodb/r/innodb_bug11766634.result
2923share/mysql/test/suite/innodb/r/innodb_bug12400341.result 2926share/mysql/test/suite/innodb/r/innodb_bug12400341.result
2924share/mysql/test/suite/innodb/r/innodb_bug12661768.result 2927share/mysql/test/suite/innodb/r/innodb_bug12661768.result
2925share/mysql/test/suite/innodb/r/innodb_bug12902967.result 2928share/mysql/test/suite/innodb/r/innodb_bug12902967.result
2926share/mysql/test/suite/innodb/r/innodb_bug13510739.result 2929share/mysql/test/suite/innodb/r/innodb_bug13510739.result
2927share/mysql/test/suite/innodb/r/innodb_bug13635833.result 2930share/mysql/test/suite/innodb/r/innodb_bug13635833.result
2928share/mysql/test/suite/innodb/r/innodb_bug14007649.result 2931share/mysql/test/suite/innodb/r/innodb_bug14007649.result
2929share/mysql/test/suite/innodb/r/innodb_bug14147491.result 2932share/mysql/test/suite/innodb/r/innodb_bug14147491.result
2930share/mysql/test/suite/innodb/r/innodb_bug14676111.result 2933share/mysql/test/suite/innodb/r/innodb_bug14676111.result
@@ -2983,51 +2986,54 @@ share/mysql/test/suite/innodb/r/innodb_f @@ -2983,51 +2986,54 @@ share/mysql/test/suite/innodb/r/innodb_f
2983share/mysql/test/suite/innodb/r/innodb_gis.result 2986share/mysql/test/suite/innodb/r/innodb_gis.result
2984share/mysql/test/suite/innodb/r/innodb_information_schema.result 2987share/mysql/test/suite/innodb/r/innodb_information_schema.result
2985share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result 2988share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result
2986share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result 2989share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
2987share/mysql/test/suite/innodb/r/innodb_misc1.result 2990share/mysql/test/suite/innodb/r/innodb_misc1.result
2988share/mysql/test/suite/innodb/r/innodb_multi_update.result 2991share/mysql/test/suite/innodb/r/innodb_multi_update.result
2989share/mysql/test/suite/innodb/r/innodb_mysql.result 2992share/mysql/test/suite/innodb/r/innodb_mysql.result
2990share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result 2993share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
2991share/mysql/test/suite/innodb/r/innodb_notembedded.result 2994share/mysql/test/suite/innodb/r/innodb_notembedded.result
2992share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result 2995share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result
2993share/mysql/test/suite/innodb/r/innodb_replace.result 2996share/mysql/test/suite/innodb/r/innodb_replace.result
2994share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result 2997share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
2995share/mysql/test/suite/innodb/r/innodb_trx_weight.result 2998share/mysql/test/suite/innodb/r/innodb_trx_weight.result
 2999share/mysql/test/suite/innodb/t/blob-update-debug.test
 3000share/mysql/test/suite/innodb/t/create-index.test
2996share/mysql/test/suite/innodb/t/disabled.def 3001share/mysql/test/suite/innodb/t/disabled.def
2997share/mysql/test/suite/innodb/t/innodb-analyze.test 3002share/mysql/test/suite/innodb/t/innodb-analyze.test
2998share/mysql/test/suite/innodb/t/innodb-autoinc-18274.test 3003share/mysql/test/suite/innodb/t/innodb-autoinc-18274.test
2999share/mysql/test/suite/innodb/t/innodb-autoinc-44030-master.opt 3004share/mysql/test/suite/innodb/t/innodb-autoinc-44030-master.opt
3000share/mysql/test/suite/innodb/t/innodb-autoinc-44030.test 3005share/mysql/test/suite/innodb/t/innodb-autoinc-44030.test
3001share/mysql/test/suite/innodb/t/innodb-autoinc-56228-master.opt 3006share/mysql/test/suite/innodb/t/innodb-autoinc-56228-master.opt
3002share/mysql/test/suite/innodb/t/innodb-autoinc-56228.test 3007share/mysql/test/suite/innodb/t/innodb-autoinc-56228.test
3003share/mysql/test/suite/innodb/t/innodb-autoinc-master.opt 3008share/mysql/test/suite/innodb/t/innodb-autoinc-master.opt
3004share/mysql/test/suite/innodb/t/innodb-autoinc-optimize.test 3009share/mysql/test/suite/innodb/t/innodb-autoinc-optimize.test
3005share/mysql/test/suite/innodb/t/innodb-autoinc.test 3010share/mysql/test/suite/innodb/t/innodb-autoinc.test
3006share/mysql/test/suite/innodb/t/innodb-blob.test 3011share/mysql/test/suite/innodb/t/innodb-blob.test
3007share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt 3012share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
3008share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test 3013share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test
3009share/mysql/test/suite/innodb/t/innodb-consistent-master.opt 3014share/mysql/test/suite/innodb/t/innodb-consistent-master.opt
3010share/mysql/test/suite/innodb/t/innodb-consistent.test 3015share/mysql/test/suite/innodb/t/innodb-consistent.test
3011share/mysql/test/suite/innodb/t/innodb-index.test 3016share/mysql/test/suite/innodb/t/innodb-index.test
3012share/mysql/test/suite/innodb/t/innodb-index_ucs2.test 3017share/mysql/test/suite/innodb/t/innodb-index_ucs2.test
3013share/mysql/test/suite/innodb/t/innodb-lock.test 3018share/mysql/test/suite/innodb/t/innodb-lock.test
3014share/mysql/test/suite/innodb/t/innodb-master.opt 3019share/mysql/test/suite/innodb/t/innodb-master.opt
3015share/mysql/test/suite/innodb/t/innodb-replace.test 3020share/mysql/test/suite/innodb/t/innodb-replace.test
3016share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt 3021share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt
3017share/mysql/test/suite/innodb/t/innodb-semi-consistent.test 3022share/mysql/test/suite/innodb/t/innodb-semi-consistent.test
3018share/mysql/test/suite/innodb/t/innodb-timeout.test 3023share/mysql/test/suite/innodb/t/innodb-timeout.test
3019share/mysql/test/suite/innodb/t/innodb-truncate.test 3024share/mysql/test/suite/innodb/t/innodb-truncate.test
3020share/mysql/test/suite/innodb/t/innodb-ucs2.test 3025share/mysql/test/suite/innodb/t/innodb-ucs2.test
 3026share/mysql/test/suite/innodb/t/innodb-update-insert.test
3021share/mysql/test/suite/innodb/t/innodb-use-sys-malloc-master.opt 3027share/mysql/test/suite/innodb/t/innodb-use-sys-malloc-master.opt
3022share/mysql/test/suite/innodb/t/innodb-use-sys-malloc.test 3028share/mysql/test/suite/innodb/t/innodb-use-sys-malloc.test
3023share/mysql/test/suite/innodb/t/innodb.test 3029share/mysql/test/suite/innodb/t/innodb.test
3024share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt 3030share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
3025share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test 3031share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
3026share/mysql/test/suite/innodb/t/innodb_bug11754376.test 3032share/mysql/test/suite/innodb/t/innodb_bug11754376.test
3027share/mysql/test/suite/innodb/t/innodb_bug11766634-master.opt 3033share/mysql/test/suite/innodb/t/innodb_bug11766634-master.opt
3028share/mysql/test/suite/innodb/t/innodb_bug11766634.test 3034share/mysql/test/suite/innodb/t/innodb_bug11766634.test
3029share/mysql/test/suite/innodb/t/innodb_bug12400341-master.opt 3035share/mysql/test/suite/innodb/t/innodb_bug12400341-master.opt
3030share/mysql/test/suite/innodb/t/innodb_bug12400341.test 3036share/mysql/test/suite/innodb/t/innodb_bug12400341.test
3031share/mysql/test/suite/innodb/t/innodb_bug12661768.test 3037share/mysql/test/suite/innodb/t/innodb_bug12661768.test
3032share/mysql/test/suite/innodb/t/innodb_bug12902967.test 3038share/mysql/test/suite/innodb/t/innodb_bug12902967.test
3033share/mysql/test/suite/innodb/t/innodb_bug13510739.test 3039share/mysql/test/suite/innodb/t/innodb_bug13510739.test