Tested in production for a week and ok giovanni@
No time to commit till 08/25, any takers ?
Cheers
Giovanni
-------- Messaggio originale --------
Oggetto: UPDATE: MariaDB - 5.7 security fixes
Data: Lunedi, 3 Agosto, 2015 02:11 CEST
Da: Brad Smith <b...@comstyle.com>
A: giova...@openbsd.org
Here is an update to MariaDB 10.0.20 for 5.7 to resolve a bunch of security
issues..
CVE-2015-2568, CVE-2015-2573, CVE-2015-0433, CVE-2015-0441, CVE-2014-8964,
CVE-2015-2325, CVE-2015-2326, CVE-2015-0501, CVE-2015-2571, CVE-2015-0505,
CVE-2015-0499, CVE-2015-3152
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 30 Jan 2015 18:43:12 -0000 1.23
+++ Makefile 21 Jul 2015 01:16:59 -0000
@@ -10,7 +10,7 @@ COMMENT-main= multithreaded SQL database
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
-VERSION= 10.0.16
+VERSION= 10.0.20
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 30 Jan 2015 18:43:12 -0000 1.12
+++ distinfo 21 Jul 2015 01:18:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.0.16.tar.gz) = RBNKXz4XTj6EQ8HQeRavV/P/rdTIhGM41BhQ/t/vzeQ=
-SIZE (mariadb-10.0.16.tar.gz) = 55656968
+SHA256 (mariadb-10.0.20.tar.gz) = Ok9pY8eUl3r11f2ewGozeirVVrOihxlv3b0iQ8E4i3s=
+SIZE (mariadb-10.0.20.tar.gz) = 56241178
Index: patches/patch-libmysql_CMakeLists_txt
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-libmysql_CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-libmysql_CMakeLists_txt
--- patches/patch-libmysql_CMakeLists_txt 30 Jan 2015 18:43:12 -0000
1.9
+++ patches/patch-libmysql_CMakeLists_txt 21 Jul 2015 01:21:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libmysql_CMakeLists_txt,v 1.9 2015/01/30 18:43:12 brad Exp $
---- libmysql/CMakeLists.txt.orig Sun Jan 25 10:21:37 2015
-+++ libmysql/CMakeLists.txt Tue Jan 27 17:42:13 2015
-@@ -263,6 +263,8 @@ mariadb_deinitialize_ssl
+--- libmysql/CMakeLists.txt.orig Wed Feb 25 10:40:54 2015
++++ libmysql/CMakeLists.txt Mon Mar 2 23:11:35 2015
+@@ -266,6 +266,8 @@ mysql_net_field_length
mysql_options4
)
@@ -10,7 +10,7 @@ $OpenBSD: patch-libmysql_CMakeLists_txt,
SET(CLIENT_API_FUNCTIONS
${CLIENT_API_FUNCTIONS_5_1}
${CLIENT_API_FUNCTIONS_5_5}
-@@ -438,8 +440,12 @@ IF(NOT DISABLE_SHARED)
+@@ -441,8 +443,12 @@ IF(NOT DISABLE_SHARED)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
@@ -25,7 +25,7 @@ $OpenBSD: patch-libmysql_CMakeLists_txt,
ELSE()
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
ENDIF()
-@@ -447,7 +453,7 @@ IF(NOT DISABLE_SHARED)
+@@ -450,7 +456,7 @@ IF(NOT DISABLE_SHARED)
SET_TARGET_PROPERTIES(libmysql PROPERTIES
OUTPUT_NAME mysqlclient
VERSION "${OS_SHARED_LIB_VERSION}"
@@ -34,7 +34,7 @@ $OpenBSD: patch-libmysql_CMakeLists_txt,
IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
IF(NOT libmysql_link_flags)
-@@ -466,18 +472,8 @@ IF(NOT DISABLE_SHARED)
+@@ -469,18 +475,8 @@ IF(NOT DISABLE_SHARED)
GET_VERSIONED_LIBNAME(
"${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
Index: patches/patch-scripts_CMakeLists_txt
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-scripts_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-scripts_CMakeLists_txt
--- patches/patch-scripts_CMakeLists_txt 30 Jan 2015 18:43:12 -0000
1.3
+++ patches/patch-scripts_CMakeLists_txt 21 Jul 2015 01:24:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_CMakeLists_txt,v 1.3 2015/01/30 18:43:12 brad Exp $
---- scripts/CMakeLists.txt.orig Sun Jan 25 10:21:37 2015
-+++ scripts/CMakeLists.txt Tue Jan 27 17:42:13 2015
-@@ -181,22 +181,13 @@ ENDIF(UNIX)
+--- scripts/CMakeLists.txt.orig Wed Jun 17 10:54:12 2015
++++ scripts/CMakeLists.txt Thu Jun 18 17:43:00 2015
+@@ -175,22 +175,13 @@ ENDIF(UNIX)
# i.e. makes access relative the current directory. This matches
# the documentation, so better not change this.
Index: patches/patch-scripts_mysqld_safe_sh
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-scripts_mysqld_safe_sh,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-scripts_mysqld_safe_sh
--- patches/patch-scripts_mysqld_safe_sh 30 Jan 2015 18:43:12 -0000
1.6
+++ patches/patch-scripts_mysqld_safe_sh 21 Jul 2015 01:20:11 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.6 2015/01/30 18:43:12 brad Exp $
---- scripts/mysqld_safe.sh.orig Sun Jan 25 10:21:38 2015
-+++ scripts/mysqld_safe.sh Tue Jan 27 17:42:13 2015
+--- scripts/mysqld_safe.sh.orig Wed Feb 25 10:40:55 2015
++++ scripts/mysqld_safe.sh Mon Mar 2 23:11:35 2015
@@ -25,7 +25,8 @@ numa_interleave=0
logging=init
want_syslog=0
@@ -10,8 +10,8 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v
+group='_mysql'
pid_file=
err_log=
-
-@@ -636,8 +637,8 @@ then
+ err_log_base=
+@@ -646,8 +647,8 @@ then
echo "Fatal error Can't create database directory '$mysql_unix_port'"
exit 1
fi
Index: patches/patch-sql_CMakeLists_txt
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/patches/patch-sql_CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-sql_CMakeLists_txt
--- patches/patch-sql_CMakeLists_txt 3 Oct 2014 08:32:53 -0000 1.9
+++ patches/patch-sql_CMakeLists_txt 21 Jul 2015 01:21:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-sql_CMakeLists_txt,v 1.9 2014/10/03 08:32:53 brad Exp $
---- sql/CMakeLists.txt.orig Wed Sep 24 18:29:47 2014
-+++ sql/CMakeLists.txt Fri Sep 26 15:58:22 2014
-@@ -285,7 +285,7 @@ ADD_CUSTOM_TARGET(distclean
+--- sql/CMakeLists.txt.orig Wed May 6 06:49:00 2015
++++ sql/CMakeLists.txt Thu May 7 14:26:02 2015
+@@ -312,7 +312,7 @@ ADD_CUSTOM_TARGET(distclean
VERBATIM
)
@@ -10,7 +10,7 @@ $OpenBSD: patch-sql_CMakeLists_txt,v 1.9
# Copy db.opt into data/test/
SET(DBOPT_FILE ${CMAKE_SOURCE_DIR}/support-files/db.opt )
-@@ -327,7 +327,7 @@ ELSE()
+@@ -354,7 +354,7 @@ ELSE()
# Not windows or cross compiling, just install an empty directory
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
Index: patches/patch-storage_connect_reldef_cpp
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-storage_connect_reldef_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-storage_connect_reldef_cpp
--- patches/patch-storage_connect_reldef_cpp 30 Jan 2015 18:43:12 -0000
1.1
+++ patches/patch-storage_connect_reldef_cpp 21 Jul 2015 01:22:48 -0000
@@ -1,14 +1,14 @@
$OpenBSD: patch-storage_connect_reldef_cpp,v 1.1 2015/01/30 18:43:12 brad Exp $
---- storage/connect/reldef.cpp.orig Tue Jan 27 19:39:09 2015
-+++ storage/connect/reldef.cpp Tue Jan 27 19:39:46 2015
-@@ -466,6 +466,10 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
+--- storage/connect/reldef.cpp.orig Wed Jun 17 10:54:13 2015
++++ storage/connect/reldef.cpp Thu Jun 18 17:45:44 2015
+@@ -512,6 +512,10 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
const char *error = NULL;
Dl_info dl_info;
-
+
+#ifndef RTLD_NOLOAD
+#define RTLD_NOLOAD 0
+#endif
+
+ #if 0 // Don't know what all this stuff does
// The OEM lib must retrieve exported CONNECT variables
if (dladdr(&connect_hton, &dl_info)) {
- if (dlopen(dl_info.dli_fname, RTLD_NOLOAD | RTLD_NOW | RTLD_GLOBAL) == 0)
{
Index: pkg/PLIST-server
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-server,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST-server
--- pkg/PLIST-server 3 Oct 2014 08:32:53 -0000 1.12
+++ pkg/PLIST-server 21 Jul 2015 01:17:42 -0000
@@ -151,6 +151,8 @@ include/mysql/private/sql_cursor.h
include/mysql/private/sql_db.h
include/mysql/private/sql_delete.h
include/mysql/private/sql_derived.h
+include/mysql/private/sql_digest.h
+include/mysql/private/sql_digest_stream.h
include/mysql/private/sql_do.h
include/mysql/private/sql_error.h
include/mysql/private/sql_explain.h
Index: pkg/PLIST-tests
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-tests,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST-tests
--- pkg/PLIST-tests 30 Jan 2015 18:43:12 -0000 1.12
+++ pkg/PLIST-tests 21 Jul 2015 01:17:54 -0000
@@ -272,6 +272,7 @@ share/mysql-test/include/ctype_strtoll10
share/mysql-test/include/ctype_unescape.inc
share/mysql-test/include/ctype_unicode520.inc
share/mysql-test/include/ctype_unicode_latin.inc
+share/mysql-test/include/ctype_utf8_ilseq.inc
share/mysql-test/include/ctype_utf8_table.inc
share/mysql-test/include/ctype_utf8mb4.inc
share/mysql-test/include/daemon_example_bad_format.ini
@@ -341,7 +342,6 @@ share/mysql-test/include/have_innodb.com
share/mysql-test/include/have_innodb.inc
share/mysql-test/include/have_innodb_16k.inc
share/mysql-test/include/have_ipv4_mapped.inc
-share/mysql-test/include/have_ipv6.inc
share/mysql-test/include/have_koi8r.inc
share/mysql-test/include/have_latin2_ch.inc
share/mysql-test/include/have_local_infile.inc
@@ -448,6 +448,7 @@ share/mysql-test/include/ndb_restore_mas
share/mysql-test/include/ndb_restore_slave_eoption.inc
share/mysql-test/include/ndb_setup_slave.inc
share/mysql-test/include/ndb_wait_connected.inc
+share/mysql-test/include/no_protocol.inc
share/mysql-test/include/no_running_event_scheduler.inc
share/mysql-test/include/no_running_events.inc
share/mysql-test/include/no_valgrind_without_big.inc
@@ -542,7 +543,9 @@ share/mysql-test/include/show_relaylog_e
share/mysql-test/include/show_rpl_debug_info.inc
share/mysql-test/include/show_slave_hosts.inc
share/mysql-test/include/show_slave_status.inc
+share/mysql-test/include/shutdown_mysqld.inc
share/mysql-test/include/sp-vars.inc
+share/mysql-test/include/start_mysqld.inc
share/mysql-test/include/start_slave.inc
share/mysql-test/include/stop_dump_threads.inc
share/mysql-test/include/stop_slave.inc
@@ -632,6 +635,7 @@ share/mysql-test/lib/My/SafeProcess/Base
share/mysql-test/lib/My/Suite.pm
share/mysql-test/lib/My/SysInfo.pm
share/mysql-test/lib/My/Test.pm
+share/mysql-test/lib/generate-ssl-certs.sh
share/mysql-test/lib/mtr_cases.pm
share/mysql-test/lib/mtr_gcov.pl
share/mysql-test/lib/mtr_gprof.pl
@@ -687,6 +691,7 @@ share/mysql-test/plugin/connect/connect/
share/mysql-test/plugin/connect/connect/r/ini.result
share/mysql-test/plugin/connect/connect/r/ini_grant.result
share/mysql-test/plugin/connect/connect/r/json.result
+share/mysql-test/plugin/connect/connect/r/json_udf.result
share/mysql-test/plugin/connect/connect/r/mrr.result
share/mysql-test/plugin/connect/connect/r/mul.result
share/mysql-test/plugin/connect/connect/r/mysql.result
@@ -716,28 +721,31 @@ share/mysql-test/plugin/connect/connect/
share/mysql-test/plugin/connect/connect/r/xcol.result
share/mysql-test/plugin/connect/connect/r/xml.result
share/mysql-test/plugin/connect/connect/r/xml_grant.result
+share/mysql-test/plugin/connect/connect/r/xml_html.result
share/mysql-test/plugin/connect/connect/r/xml_mdev5261.result
share/mysql-test/plugin/connect/connect/r/xml_mult.result
share/mysql-test/plugin/connect/connect/std_data/
share/mysql-test/plugin/connect/connect/std_data/Testbal.dat
-share/mysql-test/plugin/connect/connect/std_data/biblio.jsn
+share/mysql-test/plugin/connect/connect/std_data/beers.xml
+share/mysql-test/plugin/connect/connect/std_data/biblio.json
share/mysql-test/plugin/connect/connect/std_data/bookstore.xml
share/mysql-test/plugin/connect/connect/std_data/boys.txt
share/mysql-test/plugin/connect/connect/std_data/boyswin.txt
+share/mysql-test/plugin/connect/connect/std_data/coffee.htm
share/mysql-test/plugin/connect/connect/std_data/contact.ini
share/mysql-test/plugin/connect/connect/std_data/contacts.xls
share/mysql-test/plugin/connect/connect/std_data/cp1251.xml
share/mysql-test/plugin/connect/connect/std_data/dept.dat
share/mysql-test/plugin/connect/connect/std_data/emp.txt
share/mysql-test/plugin/connect/connect/std_data/employee.dat
-share/mysql-test/plugin/connect/connect/std_data/expense.jsn
+share/mysql-test/plugin/connect/connect/std_data/expense.json
share/mysql-test/plugin/connect/connect/std_data/expenses.txt
share/mysql-test/plugin/connect/connect/std_data/funny.txt
share/mysql-test/plugin/connect/connect/std_data/funny2.txt
share/mysql-test/plugin/connect/connect/std_data/latin1.xml
-share/mysql-test/plugin/connect/connect/std_data/mulexp3.jsn
-share/mysql-test/plugin/connect/connect/std_data/mulexp4.jsn
-share/mysql-test/plugin/connect/connect/std_data/mulexp5.jsn
+share/mysql-test/plugin/connect/connect/std_data/mulexp3.json
+share/mysql-test/plugin/connect/connect/std_data/mulexp4.json
+share/mysql-test/plugin/connect/connect/std_data/mulexp5.json
share/mysql-test/plugin/connect/connect/std_data/nocs.xml
share/mysql-test/plugin/connect/connect/std_data/people.csv
share/mysql-test/plugin/connect/connect/std_data/sexe.csv
@@ -768,6 +776,8 @@ share/mysql-test/plugin/connect/connect/
share/mysql-test/plugin/connect/connect/t/ini.test
share/mysql-test/plugin/connect/connect/t/ini_grant.test
share/mysql-test/plugin/connect/connect/t/json.test
+share/mysql-test/plugin/connect/connect/t/json_udf.inc
+share/mysql-test/plugin/connect/connect/t/json_udf.test
share/mysql-test/plugin/connect/connect/t/mrr.test
share/mysql-test/plugin/connect/connect/t/mul.test
share/mysql-test/plugin/connect/connect/t/myconn.inc
@@ -803,6 +813,7 @@ share/mysql-test/plugin/connect/connect/
share/mysql-test/plugin/connect/connect/t/xcol.test
share/mysql-test/plugin/connect/connect/t/xml.test
share/mysql-test/plugin/connect/connect/t/xml_grant.test
+share/mysql-test/plugin/connect/connect/t/xml_html.test
share/mysql-test/plugin/connect/connect/t/xml_mdev5261.test
share/mysql-test/plugin/connect/connect/t/xml_mult.test
share/mysql-test/plugin/example/
@@ -894,7 +905,6 @@ share/mysql-test/plugin/myisam/storage_e
share/mysql-test/plugin/myisam/storage_engine/foreign_keys.rdiff
share/mysql-test/plugin/myisam/storage_engine/index_type_hash.rdiff
share/mysql-test/plugin/myisam/storage_engine/misc.rdiff
-share/mysql-test/plugin/myisam/storage_engine/parts/
share/mysql-test/plugin/myisam/storage_engine/show_engine.rdiff
share/mysql-test/plugin/myisam/storage_engine/tbl_opt_insert_method.rdiff
share/mysql-test/plugin/myisam/storage_engine/tbl_opt_union.rdiff
@@ -1480,7 +1490,6 @@ share/mysql-test/plugin/test_sql_discove
share/mysql-test/plugin/test_sql_discovery/archive/
share/mysql-test/plugin/test_sql_discovery/archive/discover.test
share/mysql-test/plugin/test_sql_discovery/main/
-share/mysql-test/plugin/test_sql_discovery/main/r/
share/mysql-test/plugin/test_sql_discovery/main/t/
share/mysql-test/plugin/test_sql_discovery/main/t/create.test
share/mysql-test/plugin/test_sql_discovery/main/t/drop.test
@@ -1568,7 +1577,6 @@ share/mysql-test/r/bootstrap.result
share/mysql-test/r/bug12427262.result
share/mysql-test/r/bug13633383.result
share/mysql-test/r/bug39022.result
-share/mysql-test/r/bug46261.result
share/mysql-test/r/bug46760.result
share/mysql-test/r/bug47671.result
share/mysql-test/r/bug58669.result
@@ -1645,6 +1653,7 @@ share/mysql-test/r/ctype_sjis.result
share/mysql-test/r/ctype_swe7.result
share/mysql-test/r/ctype_tis620.result
share/mysql-test/r/ctype_uca.result
+share/mysql-test/r/ctype_uca_innodb.result
share/mysql-test/r/ctype_ucs.result
share/mysql-test/r/ctype_ucs2_def.result
share/mysql-test/r/ctype_ucs2_query_cache.result
@@ -1686,6 +1695,7 @@ share/mysql-test/r/drop.result
share/mysql-test/r/drop_bad_db_type.result
share/mysql-test/r/drop_debug.result
share/mysql-test/r/dyncol.result
+share/mysql-test/r/empty_server_name-8224.result
share/mysql-test/r/empty_table.result
share/mysql-test/r/empty_user_table.result
share/mysql-test/r/endspace.result
@@ -1713,6 +1723,7 @@ share/mysql-test/r/failed_auth_3909.resu
share/mysql-test/r/failed_auth_unixsocket.result
share/mysql-test/r/features.result
share/mysql-test/r/file_contents.result
+share/mysql-test/r/filesort_bad_i_s-7585.result
share/mysql-test/r/filesort_debug.result
share/mysql-test/r/fix_priv_tables.result
share/mysql-test/r/flush-innodb-notembedded.result
@@ -1762,6 +1773,7 @@ share/mysql-test/r/func_misc.result
share/mysql-test/r/func_op.result
share/mysql-test/r/func_regexp.result
share/mysql-test/r/func_regexp_pcre.result
+share/mysql-test/r/func_regexp_pcre_debug.result
share/mysql-test/r/func_rollback.result
share/mysql-test/r/func_sapdb.result
share/mysql-test/r/func_set.result
@@ -1775,7 +1787,6 @@ share/mysql-test/r/func_weight_string.re
share/mysql-test/r/function_defaults.result
share/mysql-test/r/function_defaults_innodb.result
share/mysql-test/r/function_defaults_notembedded.result
-share/mysql-test/r/galera_sst_mode.result
share/mysql-test/r/gcc296.result
share/mysql-test/r/get_diagnostics.result
share/mysql-test/r/gis-debug.result
@@ -1975,6 +1986,7 @@ share/mysql-test/r/mysql_upgrade-6984.re
share/mysql-test/r/mysql_upgrade.result
share/mysql-test/r/mysql_upgrade_no_innodb.result
share/mysql-test/r/mysql_upgrade_ssl.result
+share/mysql-test/r/mysql_upgrade_view.result
share/mysql-test/r/mysqladmin.result
share/mysql-test/r/mysqlbinlog-innodb.result
share/mysql-test/r/mysqlbinlog.result
@@ -2119,6 +2131,7 @@ share/mysql-test/r/query_cache_ps_ps_pro
share/mysql-test/r/query_cache_with_views.result
share/mysql-test/r/quick_select_4161.result
share/mysql-test/r/range.result
+share/mysql-test/r/range_innodb.result
share/mysql-test/r/range_mrr_icp.result
share/mysql-test/r/range_vs_index_merge.result
share/mysql-test/r/range_vs_index_merge_innodb.result
@@ -2155,6 +2168,7 @@ share/mysql-test/r/show_check.result
share/mysql-test/r/show_explain.result
share/mysql-test/r/show_explain_non_select.result
share/mysql-test/r/show_explain_ps.result
+share/mysql-test/r/show_grants_with_plugin-7985.result
share/mysql-test/r/show_profile.result
share/mysql-test/r/shutdown.result
share/mysql-test/r/sighup-6580.result
@@ -2196,6 +2210,8 @@ share/mysql-test/r/sql_mode.result
share/mysql-test/r/ssl-big.result
share/mysql-test/r/ssl-crl-revoked-crl.result
share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_7937,nossl.result
+share/mysql-test/r/ssl_7937.result
share/mysql-test/r/ssl_8k_key.result
share/mysql-test/r/ssl_and_innodb.result
share/mysql-test/r/ssl_cipher.result
@@ -2206,6 +2222,7 @@ share/mysql-test/r/ssl_crl_clients-valid
share/mysql-test/r/ssl_crl_clients.result
share/mysql-test/r/ssl_crl_clients_valid.result
share/mysql-test/r/ssl_crl_clrpath.result
+share/mysql-test/r/ssl_timeout.result
share/mysql-test/r/stack-crash.result
share/mysql-test/r/stat_tables-enospc.result
share/mysql-test/r/stat_tables.result
@@ -2272,6 +2289,7 @@ share/mysql-test/r/system_mysql_db_fix50
share/mysql-test/r/system_mysql_db_refs.result
share/mysql-test/r/table_elim.result
share/mysql-test/r/table_elim_debug.result
+share/mysql-test/r/table_keyinfo-6838.result
share/mysql-test/r/table_options-5867.result
share/mysql-test/r/table_options.result
share/mysql-test/r/tablelock.result
@@ -2284,12 +2302,14 @@ share/mysql-test/r/timezone2.result
share/mysql-test/r/timezone3.result
share/mysql-test/r/timezone4.result
share/mysql-test/r/timezone_grant.result
+share/mysql-test/r/tmp_table_count-7586.result
share/mysql-test/r/trans_read_only.result
share/mysql-test/r/trigger-compat.result
share/mysql-test/r/trigger-trans.result
share/mysql-test/r/trigger.result
share/mysql-test/r/trigger_notembedded.result
share/mysql-test/r/true.require
+share/mysql-test/r/truncate-stale-6500.result
share/mysql-test/r/truncate.result
share/mysql-test/r/truncate_badse.result
share/mysql-test/r/truncate_coverage.result
@@ -2323,9 +2343,11 @@ share/mysql-test/r/udf_query_cache.resul
share/mysql-test/r/udf_skip_grants.result
share/mysql-test/r/union.result
share/mysql-test/r/union_crash-714.result
+share/mysql-test/r/uniques_crash-7912.result
share/mysql-test/r/unsafe_binlog_innodb.result
share/mysql-test/r/update.result
share/mysql-test/r/update_ignore_216.result
+share/mysql-test/r/update_innodb.result
share/mysql-test/r/upgrade.result
share/mysql-test/r/user_limits.result
share/mysql-test/r/user_var-binlog.result
@@ -2541,6 +2563,15 @@ share/mysql-test/std_data/mysql56time.fr
share/mysql-test/std_data/mysql56timestamp.MYD
share/mysql-test/std_data/mysql56timestamp.MYI
share/mysql-test/std_data/mysql56timestamp.frm
+share/mysql-test/std_data/mysql_upgrade/
+share/mysql-test/std_data/mysql_upgrade/event.MYD
+share/mysql-test/std_data/mysql_upgrade/event.MYI
+share/mysql-test/std_data/mysql_upgrade/event.frm
+share/mysql-test/std_data/mysql_upgrade/v1.frm
+share/mysql-test/std_data/mysql_upgrade/v1badcheck.frm
+share/mysql-test/std_data/mysql_upgrade/v2.frm
+share/mysql-test/std_data/mysql_upgrade/v3.frm
+share/mysql-test/std_data/mysql_upgrade/v4.frm
share/mysql-test/std_data/ndb_backup50/
share/mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data
share/mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data
@@ -2583,6 +2614,10 @@ share/mysql-test/std_data/new-format-rel
share/mysql-test/std_data/numbers.txt
share/mysql-test/std_data/old-format-relay-log-win.info
share/mysql-test/std_data/old-format-relay-log.info
+share/mysql-test/std_data/old_decimal/
+share/mysql-test/std_data/old_decimal/t1dec102.MYD
+share/mysql-test/std_data/old_decimal/t1dec102.MYI
+share/mysql-test/std_data/old_decimal/t1dec102.frm
share/mysql-test/std_data/old_table-323.frm
share/mysql-test/std_data/onerow.xml
share/mysql-test/std_data/parts/
@@ -2670,6 +2705,7 @@ share/mysql-test/suite/binlog/r/binlog_b
share/mysql-test/suite/binlog/r/binlog_bug36391.result
share/mysql-test/suite/binlog/r/binlog_checkpoint.result
share/mysql-test/suite/binlog/r/binlog_checksum.result
+share/mysql-test/suite/binlog/r/binlog_commit_wait.result
share/mysql-test/suite/binlog/r/binlog_database.result
share/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
share/mysql-test/suite/binlog/r/binlog_drop_if_exists.result
@@ -2739,6 +2775,7 @@ share/mysql-test/suite/binlog/r/binlog_u
share/mysql-test/suite/binlog/r/binlog_write_error.result
share/mysql-test/suite/binlog/r/binlog_xa_recover.result
share/mysql-test/suite/binlog/r/load_data_stm_view.result
+share/mysql-test/suite/binlog/r/temptable_uservar_disconnect-7938.result
share/mysql-test/suite/binlog/std_data/
share/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
share/mysql-test/suite/binlog/std_data/bug32407.001
@@ -2757,6 +2794,7 @@ share/mysql-test/suite/binlog/t/binlog_b
share/mysql-test/suite/binlog/t/binlog_bug36391.test
share/mysql-test/suite/binlog/t/binlog_checkpoint.test
share/mysql-test/suite/binlog/t/binlog_checksum.test
+share/mysql-test/suite/binlog/t/binlog_commit_wait.test
share/mysql-test/suite/binlog/t/binlog_database.test
share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index-master.opt
share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
@@ -2852,6 +2890,7 @@ share/mysql-test/suite/binlog/t/binlog_w
share/mysql-test/suite/binlog/t/binlog_xa_recover-master.opt
share/mysql-test/suite/binlog/t/binlog_xa_recover.test
share/mysql-test/suite/binlog/t/load_data_stm_view.test
+share/mysql-test/suite/binlog/t/temptable_uservar_disconnect-7938.test
share/mysql-test/suite/csv/
share/mysql-test/suite/csv/csv.result
share/mysql-test/suite/csv/csv.test
@@ -4240,7 +4279,7 @@ share/mysql-test/suite/innodb/r/group_co
share/mysql-test/suite/innodb/r/help_url.result
share/mysql-test/suite/innodb/r/innochecksum.result
share/mysql-test/suite/innodb/r/innodb-alter-discard.result
-share/mysql-test/suite/innodb/r/innodb-alter-table-disk-full.result
+share/mysql-test/suite/innodb/r/innodb-alter-tempfile.result
share/mysql-test/suite/innodb/r/innodb-analyze.result
share/mysql-test/suite/innodb/r/innodb-autoinc-18274.result
share/mysql-test/suite/innodb/r/innodb-autoinc-44030.result
@@ -4248,6 +4287,7 @@ share/mysql-test/suite/innodb/r/innodb-a
share/mysql-test/suite/innodb/r/innodb-autoinc-61209.result
share/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
share/mysql-test/suite/innodb/r/innodb-autoinc.result
+share/mysql-test/suite/innodb/r/innodb-bigblob.result
share/mysql-test/suite/innodb/r/innodb-blob.result
share/mysql-test/suite/innodb/r/innodb-bug-14068765.result
share/mysql-test/suite/innodb/r/innodb-bug-14084530.result
@@ -4258,6 +4298,8 @@ share/mysql-test/suite/innodb/r/innodb-f
share/mysql-test/suite/innodb/r/innodb-index.result
share/mysql-test/suite/innodb/r/innodb-index_ucs2.result
share/mysql-test/suite/innodb/r/innodb-lock.result
+share/mysql-test/suite/innodb/r/innodb-mdev-7408.result
+share/mysql-test/suite/innodb/r/innodb-mdev-7513.result
share/mysql-test/suite/innodb/r/innodb-mdev7046.result
share/mysql-test/suite/innodb/r/innodb-replace.result
share/mysql-test/suite/innodb/r/innodb-semi-consistent.result
@@ -4267,13 +4309,16 @@ share/mysql-test/suite/innodb/r/innodb-t
share/mysql-test/suite/innodb/r/innodb-truncate.result
share/mysql-test/suite/innodb/r/innodb-ucs2.result
share/mysql-test/suite/innodb/r/innodb-update-insert.result
+share/mysql-test/suite/innodb/r/innodb-virtual-columns.result
share/mysql-test/suite/innodb/r/innodb-wl5522-1.result
share/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result
share/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
share/mysql-test/suite/innodb/r/innodb-wl5522-zip.result
share/mysql-test/suite/innodb/r/innodb-wl5522.result
+share/mysql-test/suite/innodb/r/innodb-xa.result
share/mysql-test/suite/innodb/r/innodb.result
share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+share/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result
share/mysql-test/suite/innodb/r/innodb_bug11754376.result
share/mysql-test/suite/innodb/r/innodb_bug12400341.result
share/mysql-test/suite/innodb/r/innodb_bug12661768.result
@@ -4363,6 +4408,7 @@ share/mysql-test/suite/innodb/r/multi_re
share/mysql-test/suite/innodb/r/row_lock.result
share/mysql-test/suite/innodb/r/sp_temp_table.result
share/mysql-test/suite/innodb/r/strict_mode.result
+share/mysql-test/suite/innodb/r/xa_recovery.result
share/mysql-test/suite/innodb/t/
share/mysql-test/suite/innodb/t/auto_increment_dup.test
share/mysql-test/suite/innodb/t/binlog_consistent.test
@@ -4388,8 +4434,7 @@ share/mysql-test/suite/innodb/t/help_url
share/mysql-test/suite/innodb/t/innochecksum.opt
share/mysql-test/suite/innodb/t/innochecksum.test
share/mysql-test/suite/innodb/t/innodb-alter-discard.test
-share/mysql-test/suite/innodb/t/innodb-alter-table-disk-full-master.opt
-share/mysql-test/suite/innodb/t/innodb-alter-table-disk-full.test
+share/mysql-test/suite/innodb/t/innodb-alter-tempfile.test
share/mysql-test/suite/innodb/t/innodb-analyze.test
share/mysql-test/suite/innodb/t/innodb-autoinc-18274.test
share/mysql-test/suite/innodb/t/innodb-autoinc-44030-master.opt
@@ -4400,6 +4445,8 @@ share/mysql-test/suite/innodb/t/innodb-a
share/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
share/mysql-test/suite/innodb/t/innodb-autoinc.opt
share/mysql-test/suite/innodb/t/innodb-autoinc.test
+share/mysql-test/suite/innodb/t/innodb-bigblob.opt
+share/mysql-test/suite/innodb/t/innodb-bigblob.test
share/mysql-test/suite/innodb/t/innodb-blob.test
share/mysql-test/suite/innodb/t/innodb-bug-14068765.test
share/mysql-test/suite/innodb/t/innodb-bug-14084530.test
@@ -4414,6 +4461,9 @@ share/mysql-test/suite/innodb/t/innodb-i
share/mysql-test/suite/innodb/t/innodb-index_ucs2.test
share/mysql-test/suite/innodb/t/innodb-lock.test
share/mysql-test/suite/innodb/t/innodb-master.opt
+share/mysql-test/suite/innodb/t/innodb-mdev-7408.opt
+share/mysql-test/suite/innodb/t/innodb-mdev-7408.test
+share/mysql-test/suite/innodb/t/innodb-mdev-7513.test
share/mysql-test/suite/innodb/t/innodb-mdev7046.test
share/mysql-test/suite/innodb/t/innodb-replace.test
share/mysql-test/suite/innodb/t/innodb-semi-consistent-master.opt
@@ -4424,14 +4474,17 @@ share/mysql-test/suite/innodb/t/innodb-t
share/mysql-test/suite/innodb/t/innodb-truncate.test
share/mysql-test/suite/innodb/t/innodb-ucs2.test
share/mysql-test/suite/innodb/t/innodb-update-insert.test
+share/mysql-test/suite/innodb/t/innodb-virtual-columns.test
share/mysql-test/suite/innodb/t/innodb-wl5522-1.test
share/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
share/mysql-test/suite/innodb/t/innodb-wl5522-debug.test
share/mysql-test/suite/innodb/t/innodb-wl5522-zip.test
share/mysql-test/suite/innodb/t/innodb-wl5522.test
+share/mysql-test/suite/innodb/t/innodb-xa.test
share/mysql-test/suite/innodb/t/innodb.test
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+share/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test
share/mysql-test/suite/innodb/t/innodb_bug11754376.test
share/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
share/mysql-test/suite/innodb/t/innodb_bug12400341.test
@@ -4541,6 +4594,7 @@ share/mysql-test/suite/innodb/t/multi_re
share/mysql-test/suite/innodb/t/row_lock.test
share/mysql-test/suite/innodb/t/sp_temp_table.test
share/mysql-test/suite/innodb/t/strict_mode.test
+share/mysql-test/suite/innodb/t/xa_recovery.test
share/mysql-test/suite/innodb_fts/
share/mysql-test/suite/innodb_fts/r/
share/mysql-test/suite/innodb_fts/r/fulltext.result
@@ -4878,12 +4932,6 @@ share/mysql-test/suite/large_tests/t/alt
share/mysql-test/suite/large_tests/t/lock_tables_big.test
share/mysql-test/suite/large_tests/t/rpl_slave_net_timeout-slave.opt
share/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
-share/mysql-test/suite/manual/
-share/mysql-test/suite/manual/r/
-share/mysql-test/suite/manual/r/rpl_replication_delay.result
-share/mysql-test/suite/manual/t/
-share/mysql-test/suite/manual/t/rpl_replication_delay-slave.opt
-share/mysql-test/suite/manual/t/rpl_replication_delay.test
share/mysql-test/suite/maria/
share/mysql-test/suite/maria/alter.result
share/mysql-test/suite/maria/alter.test
@@ -5416,8 +5464,6 @@ share/mysql-test/suite/parts/t/partition
share/mysql-test/suite/parts/t/partition_value_innodb.test
share/mysql-test/suite/parts/t/partition_value_myisam.test
share/mysql-test/suite/parts/t/rpl_partition.test
-share/mysql-test/suite/pbxt/
-share/mysql-test/suite/pbxt/r/
share/mysql-test/suite/percona/
share/mysql-test/suite/percona/disabled.def
share/mysql-test/suite/percona/have_response_time_distribution.inc
@@ -5598,7 +5644,6 @@ share/mysql-test/suite/perfschema/includ
share/mysql-test/suite/perfschema/include/have_aligned_memory.inc
share/mysql-test/suite/perfschema/include/hostcache_dump.inc
share/mysql-test/suite/perfschema/include/hostcache_set_state.inc
-share/mysql-test/suite/perfschema/include/no_protocol.inc
share/mysql-test/suite/perfschema/include/pfs_upgrade.inc
share/mysql-test/suite/perfschema/include/privilege.inc
share/mysql-test/suite/perfschema/include/rpl_statements_truncate.inc
@@ -5702,6 +5747,7 @@ share/mysql-test/suite/perfschema/r/ddl_
share/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result
share/mysql-test/suite/perfschema/r/ddl_tlws_by_table.result
share/mysql-test/suite/perfschema/r/ddl_users.result
+share/mysql-test/suite/perfschema/r/digest_null_literal.result
share/mysql-test/suite/perfschema/r/digest_table_full.result
share/mysql-test/suite/perfschema/r/dml_accounts.result
share/mysql-test/suite/perfschema/r/dml_cond_instances.result
@@ -5861,6 +5907,7 @@ share/mysql-test/suite/perfschema/r/star
share/mysql-test/suite/perfschema/r/start_server_disable_statements.result
share/mysql-test/suite/perfschema/r/start_server_disable_waits.result
share/mysql-test/suite/perfschema/r/start_server_innodb.result
+share/mysql-test/suite/perfschema/r/start_server_low_digest.result
share/mysql-test/suite/perfschema/r/start_server_no_account.result
share/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
share/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
@@ -6034,6 +6081,7 @@ share/mysql-test/suite/perfschema/t/ddl_
share/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test
share/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test
share/mysql-test/suite/perfschema/t/ddl_users.test
+share/mysql-test/suite/perfschema/t/digest_null_literal.test
share/mysql-test/suite/perfschema/t/digest_table_full-master.opt
share/mysql-test/suite/perfschema/t/digest_table_full.test
share/mysql-test/suite/perfschema/t/disabled.def
@@ -6245,6 +6293,8 @@ share/mysql-test/suite/perfschema/t/star
share/mysql-test/suite/perfschema/t/start_server_disable_waits.test
share/mysql-test/suite/perfschema/t/start_server_innodb-master.opt
share/mysql-test/suite/perfschema/t/start_server_innodb.test
+share/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt
+share/mysql-test/suite/perfschema/t/start_server_low_digest.test
share/mysql-test/suite/perfschema/t/start_server_no_account-master.opt
share/mysql-test/suite/perfschema/t/start_server_no_account.test
share/mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt
@@ -6403,6 +6453,7 @@ share/mysql-test/suite/plugins/r/qc_info
share/mysql-test/suite/plugins/r/server_audit.result
share/mysql-test/suite/plugins/r/show_all_plugins.result
share/mysql-test/suite/plugins/r/sql_error_log.result
+share/mysql-test/suite/plugins/r/thread_pool_server_audit.result
share/mysql-test/suite/plugins/r/unix_socket.result
share/mysql-test/suite/plugins/suite.pm
share/mysql-test/suite/plugins/t/
@@ -6436,6 +6487,8 @@ share/mysql-test/suite/plugins/t/server_
share/mysql-test/suite/plugins/t/server_audit.test
share/mysql-test/suite/plugins/t/show_all_plugins.test
share/mysql-test/suite/plugins/t/sql_error_log.test
+share/mysql-test/suite/plugins/t/thread_pool_server_audit.opt
+share/mysql-test/suite/plugins/t/thread_pool_server_audit.test
share/mysql-test/suite/plugins/t/unix_socket.test
share/mysql-test/suite/roles/
share/mysql-test/suite/roles/acl_load_mutex-5170.result
@@ -6597,6 +6650,7 @@ share/mysql-test/suite/rpl/r/rpl_delete_
share/mysql-test/suite/rpl/r/rpl_do_grant.result
share/mysql-test/suite/rpl/r/rpl_drop.result
share/mysql-test/suite/rpl/r/rpl_drop_db.result
+share/mysql-test/suite/rpl/r/rpl_drop_db_fail.result
share/mysql-test/suite/rpl/r/rpl_drop_temp.result
share/mysql-test/suite/rpl/r/rpl_drop_view.result
share/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
@@ -6633,6 +6687,7 @@ share/mysql-test/suite/rpl/r/rpl_gtid_md
share/mysql-test/suite/rpl/r/rpl_gtid_mdev4484.result
share/mysql-test/suite/rpl/r/rpl_gtid_mdev4485.result
share/mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result
+share/mysql-test/suite/rpl/r/rpl_gtid_misc.result
share/mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result
share/mysql-test/suite/rpl/r/rpl_gtid_reconnect.result
share/mysql-test/suite/rpl/r/rpl_gtid_startpos.result
@@ -6717,13 +6772,17 @@ share/mysql-test/suite/rpl/r/rpl_non_dir
share/mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
share/mysql-test/suite/rpl/r/rpl_not_null_innodb.result
share/mysql-test/suite/rpl/r/rpl_not_null_myisam.result
+share/mysql-test/suite/rpl/r/rpl_old_decimal.result
share/mysql-test/suite/rpl/r/rpl_old_master.result
share/mysql-test/suite/rpl/r/rpl_optimize.result
share/mysql-test/suite/rpl/r/rpl_packet.result
share/mysql-test/suite/rpl/r/rpl_parallel.result
share/mysql-test/suite/rpl/r/rpl_parallel2.result
share/mysql-test/suite/rpl/r/rpl_parallel_charset.result
+share/mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result
+share/mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result
share/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result
+share/mysql-test/suite/rpl/r/rpl_parallel_partition.result
share/mysql-test/suite/rpl/r/rpl_parallel_retry.result
share/mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result
share/mysql-test/suite/rpl/r/rpl_parallel_temptable.result
@@ -6850,6 +6909,7 @@ share/mysql-test/suite/rpl/r/rpl_sp.resu
share/mysql-test/suite/rpl/r/rpl_sp004.result
share/mysql-test/suite/rpl/r/rpl_sp_effects.result
share/mysql-test/suite/rpl/r/rpl_spec_variables.result
+share/mysql-test/suite/rpl/r/rpl_special_charset.result
share/mysql-test/suite/rpl/r/rpl_sporadic_master.result
share/mysql-test/suite/rpl/r/rpl_ssl.result
share/mysql-test/suite/rpl/r/rpl_ssl1.result
@@ -6907,7 +6967,10 @@ share/mysql-test/suite/rpl/r/rpl_variabl
share/mysql-test/suite/rpl/r/rpl_variables_stm.result
share/mysql-test/suite/rpl/r/rpl_view.result
share/mysql-test/suite/rpl/r/rpl_view_multi.result
+share/mysql-test/suite/rpl/r/sec_behind_master-5114.result
+share/mysql-test/suite/rpl/r/semisync_future-7591.result
share/mysql-test/suite/rpl/r/semisync_memleak_4066.result
+share/mysql-test/suite/rpl/r/show_status_stop_slave_race-7126.result
share/mysql-test/suite/rpl/rpl_1slave_base.cnf
share/mysql-test/suite/rpl/t/
share/mysql-test/suite/rpl/t/create_or_replace.inc
@@ -6997,6 +7060,7 @@ share/mysql-test/suite/rpl/t/rpl_delete_
share/mysql-test/suite/rpl/t/rpl_do_grant.test
share/mysql-test/suite/rpl/t/rpl_drop.test
share/mysql-test/suite/rpl/t/rpl_drop_db.test
+share/mysql-test/suite/rpl/t/rpl_drop_db_fail.test
share/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
share/mysql-test/suite/rpl/t/rpl_drop_temp.test
share/mysql-test/suite/rpl/t/rpl_drop_view.test
@@ -7049,6 +7113,7 @@ share/mysql-test/suite/rpl/t/rpl_gtid_md
share/mysql-test/suite/rpl/t/rpl_gtid_mdev4485.cnf
share/mysql-test/suite/rpl/t/rpl_gtid_mdev4485.test
share/mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test
+share/mysql-test/suite/rpl/t/rpl_gtid_misc.test
share/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.cnf
share/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test
share/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
@@ -7166,6 +7231,7 @@ share/mysql-test/suite/rpl/t/rpl_non_dir
share/mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
share/mysql-test/suite/rpl/t/rpl_not_null_innodb.test
share/mysql-test/suite/rpl/t/rpl_not_null_myisam.test
+share/mysql-test/suite/rpl/t/rpl_old_decimal.test
share/mysql-test/suite/rpl/t/rpl_old_master.test
share/mysql-test/suite/rpl/t/rpl_optimize.test
share/mysql-test/suite/rpl/t/rpl_packet-master.opt
@@ -7174,8 +7240,12 @@ share/mysql-test/suite/rpl/t/rpl_packet.
share/mysql-test/suite/rpl/t/rpl_parallel.test
share/mysql-test/suite/rpl/t/rpl_parallel2.test
share/mysql-test/suite/rpl/t/rpl_parallel_charset.test
+share/mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test
+share/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.cnf
+share/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.test
share/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates-slave.opt
share/mysql-test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test
+share/mysql-test/suite/rpl/t/rpl_parallel_partition.test
share/mysql-test/suite/rpl/t/rpl_parallel_retry.test
share/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
share/mysql-test/suite/rpl/t/rpl_parallel_temptable-master.opt
@@ -7334,6 +7404,8 @@ share/mysql-test/suite/rpl/t/rpl_sp_effe
share/mysql-test/suite/rpl/t/rpl_sp_effects.test
share/mysql-test/suite/rpl/t/rpl_spec_variables-slave.opt
share/mysql-test/suite/rpl/t/rpl_spec_variables.test
+share/mysql-test/suite/rpl/t/rpl_special_charset.opt
+share/mysql-test/suite/rpl/t/rpl_special_charset.test
share/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
share/mysql-test/suite/rpl/t/rpl_sporadic_master.test
share/mysql-test/suite/rpl/t/rpl_ssl.test
@@ -7403,7 +7475,10 @@ share/mysql-test/suite/rpl/t/rpl_variabl
share/mysql-test/suite/rpl/t/rpl_variables_stm.test
share/mysql-test/suite/rpl/t/rpl_view.test
share/mysql-test/suite/rpl/t/rpl_view_multi.test
+share/mysql-test/suite/rpl/t/sec_behind_master-5114.test
+share/mysql-test/suite/rpl/t/semisync_future-7591.test
share/mysql-test/suite/rpl/t/semisync_memleak_4066.test
+share/mysql-test/suite/rpl/t/show_status_stop_slave_race-7126.test
share/mysql-test/suite/storage_engine/
share/mysql-test/suite/storage_engine/1st.result
share/mysql-test/suite/storage_engine/1st.test
@@ -9049,6 +9124,7 @@ share/mysql-test/suite/sys_vars/t/slave_
share/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test
share/mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test
share/mysql-test/suite/sys_vars/t/slave_parallel_max_queued_basic.test
+share/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf
share/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.test
share/mysql-test/suite/sys_vars/t/slave_skip_errors_basic.test
share/mysql-test/suite/sys_vars/t/slave_sql_verify_checksum_basic.test
@@ -9272,8 +9348,6 @@ share/mysql-test/t/bootstrap.test
share/mysql-test/t/bug12427262.test
share/mysql-test/t/bug13633383.test
share/mysql-test/t/bug39022.test
-share/mysql-test/t/bug46261-master.opt
-share/mysql-test/t/bug46261.test
share/mysql-test/t/bug46760-master.opt
share/mysql-test/t/bug46760.test
share/mysql-test/t/bug47671-master.opt
@@ -9358,6 +9432,7 @@ share/mysql-test/t/ctype_sjis.test
share/mysql-test/t/ctype_swe7.test
share/mysql-test/t/ctype_tis620.test
share/mysql-test/t/ctype_uca.test
+share/mysql-test/t/ctype_uca_innodb.test
share/mysql-test/t/ctype_ucs.test
share/mysql-test/t/ctype_ucs2_def-master.opt
share/mysql-test/t/ctype_ucs2_def.test
@@ -9406,9 +9481,11 @@ share/mysql-test/t/drop.test
share/mysql-test/t/drop_bad_db_type.test
share/mysql-test/t/drop_debug.test
share/mysql-test/t/dyncol.test
+share/mysql-test/t/empty_server_name-8224.test
share/mysql-test/t/empty_table.test
share/mysql-test/t/empty_user_table.test
share/mysql-test/t/endspace.test
+share/mysql-test/t/error_simulation-master.opt
share/mysql-test/t/error_simulation.test
share/mysql-test/t/errors.test
share/mysql-test/t/events_1.test
@@ -9437,6 +9514,7 @@ share/mysql-test/t/failed_auth_3909.test
share/mysql-test/t/failed_auth_unixsocket.test
share/mysql-test/t/features.test
share/mysql-test/t/file_contents.test
+share/mysql-test/t/filesort_bad_i_s-7585.test
share/mysql-test/t/filesort_debug.test
share/mysql-test/t/fix_priv_tables.test
share/mysql-test/t/flush-innodb-notembedded.test
@@ -9488,6 +9566,7 @@ share/mysql-test/t/func_misc.test
share/mysql-test/t/func_op.test
share/mysql-test/t/func_regexp.test
share/mysql-test/t/func_regexp_pcre.test
+share/mysql-test/t/func_regexp_pcre_debug.test
share/mysql-test/t/func_rollback.test
share/mysql-test/t/func_sapdb.test
share/mysql-test/t/func_set.test
@@ -9501,7 +9580,6 @@ share/mysql-test/t/func_weight_string.te
share/mysql-test/t/function_defaults.test
share/mysql-test/t/function_defaults_innodb.test
share/mysql-test/t/function_defaults_notembedded.test
-share/mysql-test/t/galera_sst_mode.test
share/mysql-test/t/gcc296.test
share/mysql-test/t/get_diagnostics.test
share/mysql-test/t/gis-debug.test
@@ -9732,6 +9810,7 @@ share/mysql-test/t/mysql_upgrade-6984.te
share/mysql-test/t/mysql_upgrade.test
share/mysql-test/t/mysql_upgrade_no_innodb.test
share/mysql-test/t/mysql_upgrade_ssl.test
+share/mysql-test/t/mysql_upgrade_view.test
share/mysql-test/t/mysqladmin.test
share/mysql-test/t/mysqlbinlog-innodb.test
share/mysql-test/t/mysqlbinlog-master.opt
@@ -9889,6 +9968,7 @@ share/mysql-test/t/query_cache_ps_ps_pro
share/mysql-test/t/query_cache_with_views.test
share/mysql-test/t/quick_select_4161.test
share/mysql-test/t/range.test
+share/mysql-test/t/range_innodb.test
share/mysql-test/t/range_mrr_icp.test
share/mysql-test/t/range_vs_index_merge.test
share/mysql-test/t/range_vs_index_merge_innodb.test
@@ -9930,6 +10010,7 @@ share/mysql-test/t/show_check.test
share/mysql-test/t/show_explain.test
share/mysql-test/t/show_explain_non_select.test
share/mysql-test/t/show_explain_ps.test
+share/mysql-test/t/show_grants_with_plugin-7985.test
share/mysql-test/t/show_profile.test
share/mysql-test/t/shutdown.test
share/mysql-test/t/sighup-6580.test
@@ -9973,6 +10054,8 @@ share/mysql-test/t/sp_trans_log.test
share/mysql-test/t/sql_mode.test
share/mysql-test/t/ssl-big.test
share/mysql-test/t/ssl.test
+share/mysql-test/t/ssl_7937.combinations
+share/mysql-test/t/ssl_7937.test
share/mysql-test/t/ssl_8k_key-master.opt
share/mysql-test/t/ssl_8k_key.test
share/mysql-test/t/ssl_and_innodb.test
@@ -9988,6 +10071,7 @@ share/mysql-test/t/ssl_crl_clients_valid
share/mysql-test/t/ssl_crl_clients_valid.test
share/mysql-test/t/ssl_crl_clrpath-master.opt
share/mysql-test/t/ssl_crl_clrpath.test
+share/mysql-test/t/ssl_timeout.test
share/mysql-test/t/stack-crash.test
share/mysql-test/t/stat_tables-enospc.test
share/mysql-test/t/stat_tables.test
@@ -10057,6 +10141,7 @@ share/mysql-test/t/system_mysql_db_fix50
share/mysql-test/t/system_mysql_db_refs.test
share/mysql-test/t/table_elim.test
share/mysql-test/t/table_elim_debug.test
+share/mysql-test/t/table_keyinfo-6838.test
share/mysql-test/t/table_options-5867.test
share/mysql-test/t/table_options.test
share/mysql-test/t/tablelock.test
@@ -10073,12 +10158,14 @@ share/mysql-test/t/timezone3.test
share/mysql-test/t/timezone4-master.opt
share/mysql-test/t/timezone4.test
share/mysql-test/t/timezone_grant.test
+share/mysql-test/t/tmp_table_count-7586.test
share/mysql-test/t/trans_read_only-master.opt
share/mysql-test/t/trans_read_only.test
share/mysql-test/t/trigger-compat.test
share/mysql-test/t/trigger-trans.test
share/mysql-test/t/trigger.test
share/mysql-test/t/trigger_notembedded.test
+share/mysql-test/t/truncate-stale-6500.test
share/mysql-test/t/truncate.test
share/mysql-test/t/truncate_badse.test
share/mysql-test/t/truncate_coverage.test
@@ -10114,10 +10201,12 @@ share/mysql-test/t/udf_skip_grants.test
share/mysql-test/t/union-master.opt
share/mysql-test/t/union.test
share/mysql-test/t/union_crash-714.test
+share/mysql-test/t/uniques_crash-7912.test
share/mysql-test/t/unsafe_binlog_innodb-master.opt
share/mysql-test/t/unsafe_binlog_innodb.test
share/mysql-test/t/update.test
share/mysql-test/t/update_ignore_216.test
+share/mysql-test/t/update_innodb.test
share/mysql-test/t/upgrade.test
share/mysql-test/t/user_limits-master.opt
share/mysql-test/t/user_limits.test
Index: pkg/README-server
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/pkg/README-server,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 README-server
--- pkg/README-server 8 Apr 2013 02:49:53 -0000 1.3
+++ pkg/README-server 21 Jul 2015 01:17:08 -0000
@@ -12,7 +12,7 @@ a default database first. In order to cr
${TRUEPREFIX}/bin/mysql_install_db
You will need to tune the values in the my.cnf file (examples
-available in ${TRUEPREFIX}/share/mysql).
+available in ${TRUEPREFIX}/share/examples/mysql).
By default, the _mysql user, and so the MariaDB processes run in the
login(1) class of "daemon". On a busy server, it may be advisable
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
