Pullup ticket #5103 - requested by maya

databases/mariadb55-server: security fix Revisions pulled up: - databases/mariadb55-client/Makefile 1.6 - databases/mariadb55-client/Makefile.common 1.4 - databases/mariadb55-client/distinfo 1.5 - databases/mariadb55-client/patches/patch-include_my__context.h 1.2 - databases/mariadb55-client/patches/patch-vio_viosslfactories.c deleted - databases/mariadb55-server/Makefile 1.4 - databases/mariadb55-server/PLIST 1.3-1.4 --- Module Name: pkgsrc Committed By: maya Date: Tue Sep 13 19:15:14 UTC 2016 Modified Files: pkgsrc/databases/mariadb55-client: Makefile Makefile.common distinfo pkgsrc/databases/mariadb55-client/patches: patch-include_my__context.h pkgsrc/databases/mariadb55-server: Makefile PLIST Removed Files: pkgsrc/databases/mariadb55-client/patches: patch-vio_viosslfactories.c Log Message: update mariadb55-{client,server} to 5.5.52 Security update CVE-2016-6662: Remote Root Code Execution / Privilege Escalation (0day) (Fixed in 5.5.51, MDEV-10465) XXX put the distfile on nbftp manually as most mirrors don't have it yet and pullup. Changes: Revision #0da39ca 2016-09-12 16:18:07 +0200 fix BIGINT+MEDIUMINT type aggregation Revision #347eeef 2016-09-11 20:55:11 +0200 don't use my_copystat in the server Revision #611dc0d 2016-09-11 20:53:16 +0200 missing element in prelocked_mode_name[] array Revision #a229091 2016-09-11 20:52:00 +0200 potential signedness issue Revision #7ae555c 2016-09-11 20:51:09 +0200 - Merge branch 'mysql/5.5' into 5.5 Revision #b9631e3 2015-11-10 12:41:26 +0100 MDEV-8833 Crash of server on prepared statement with conversion to semi-join Revision #ee97274 2016-08-25 09:50:04 +0300 DEV-10595 MariaDB daemon leaks memory with specific query Revision #a92a8cc 2016-08-19 17:11:20 +0000 Windows packaging : use /d switch to sign MSI, to prevent installer showing randomly generated name in UAC prompt Revision #723488b 2016-08-04 15:43:52 +0400 MDEV-10424 - Assertion `ticket == null' failed in MDL_request::set_type Revision #09cb646 2016-08-11 19:35:53 +0000 Windows : fix search for WiX root directory when using 64bit cmake Revision #5ad0206 2016-08-09 16:15:10 +0300 MDEV-10341: InnoDB: Failing assertion: mutex_own(mutex) - mutex_exit_func Revision #0098d78 2016-08-09 13:25:40 +0200 MDEV-10465 general_log_file can be abused Revision #a3f6424 2016-08-08 12:58:27 +0200 MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names Revision #2a54a53 2016-08-08 10:27:22 +0200 MDEV-10465 general_log_file can be abused Revision #a7c43a6 2016-01-26 14:49:25 +0200 MDEV-9304: MariaDB crash with specific query Revision #5269d37 2016-08-08 18:37:02 +0400 MDEV-10468 Assertion `nr >= 0.0' failed in Item_sum_std::val_real() Revision #1b3430a 2016-08-08 16:04:40 +0400 MDEV-10500 CASE/IF Statement returns multiple values and shifts further result values to the next column Revision #5e23b63 2016-08-07 11:02:42 +0200 MDEV-10506 Protocol::end_statement(): Assertion `0' failed upon ALTER TABLE Revision #93d5cdf 2016-08-04 13:14:45 +0300 MDEV-9946: main.xtradb_mrr fails sporadically Revision #c0cb84b 2016-08-04 10:57:55 +0200 - Merge branch 'bb-5.5-serg' into 5.5 Revision #470f259 2016-08-03 20:56:24 +0200 MDEV-10465 general_log_file can be abused Revision #0214115 2016-08-01 16:53:57 +0200 trivial cleanup Revision #03dec1a 2016-08-03 18:05:29 +0200 MDEV-10350 "./mtr --report-features" doesn't work Revision #9d2f892 2016-08-03 17:58:56 +0200 MDEV-7329 plugins.pam_cleartext fails sporadically in buildbot Revision #75891ed 2016-08-03 17:50:45 +0200 improve pam_cleartext.test a bit Revision #5265243 2016-08-03 20:44:08 +0200 - Merge branch 'merge/merge-xtradb-5.5' into 5.5 Revision #e316c46 2016-08-03 20:43:29 +0200 5.5.50-38.0 Revision #19fe10c 2016-08-03 20:39:47 +0200 MDEV-6581 Writing to TEMPORARY TABLE not possible in read-only Revision #a350e53 2016-08-03 20:38:25 +0200 - Merge branch 'mysql/5.5' into 5.5 Revision #eb32dfd 2016-08-03 11:49:35 +0400 MDEV-10365 - Race condition in error handling of INSERT DELAYED Revision #511313b 2016-08-03 13:42:46 +0000 MDEV-10010 - potential deadlock on windows due to recursive SRWLock acquisition Revision #141f88d 2016-08-03 12:41:38 +0000 MDEV-10357 my_context_continue() does not store current fiber on Windows Revision #ecb7ce7 2016-08-03 15:55:48 +0400 MDEV-10467 Assertion `nr >= 0.0' failed in Item_sum_std::val_real() Backporting MDEV-5781 from 10.0. Revision #35c9c85 2016-08-03 13:40:53 +0300 MDEV-10217: innodb.innodb_bug59641 fails sporadically in buildbot: InnoDB: Failing assertion: current_rec != insert_rec in file page0cur.c line 1052 Revision #6b71a6d 2016-08-02 18:52:51 +0200 MDEV-10383 Named pipes : multiple servers can listen on the same pipename Revision #5fdb3cf 2016-07-29 18:21:08 +0200 MDEV-10419: crash in mariadb 10.1.16-MariaDB-1trusty Revision #c6aaa2a 2016-07-30 10:53:01 +0300 MDEV-10228: update test results Revision #15ef38d 2016-07-27 00:38:51 +0300 MDEV-10228: Delete missing rows with OR conditions Revision #1b5da2c 2016-07-21 15:32:28 +0400 MDEV-10316 - main.type_date fails around midnight sporadically Revision #5cf49cd 2016-07-15 23:51:30 +0300 MDEV-10248 Cannot Remove Test Tables Revision #4e19aa3 2016-07-12 12:13:31 +0200 MDEV-10318 unset params in --ps --embedded Revision #97ded96 2016-07-11 17:03:03 +0000 MDEV-10318 : Fix crash in embedded, in case prepared statement has parameter placeholders, but does not bind parameters Revision #e81455bb 2015-05-04 08:32:05 +0200 MDEV-7973 bigint fail with gcc 5.0 Revision #a7814d4 2016-06-30 12:59:52 +0400 MDEV-10311 - funcs_1.processlist_priv_no_prot fails sporadically Revision #79f852a 2016-06-22 14:17:06 +0200 MDEV-10050: Crash in subselect Revision #ef92aaf 2016-06-22 22:37:28 +0300 MDEV-10083: Orphan ibd file when playing with foreign keys Revision #a482e76 2016-06-20 16:12:54 +0200 fix a mysql-5.5.50 merge: mysqlcheck Revision #95bf696 2016-06-19 14:51:03 +0200 MDEV-9749 InnoDB receives 'Bad file descriptor' error, possibly related to feedback plugin Revision #7f38a07 2016-06-17 18:54:11 +0400 MDEV-10043 - main.events_restart fails sporadically in buildbot (crashes upon shutdown) Revision #7ff86b4 2016-06-17 14:59:17 +0300 MDEV-10247 TokuDB assertion error when building with DEBUG Revision #12ae840 2016-06-16 22:04:24 +0300 Fix typo bug that cause myisam repair to fail Revision #c7eef02 2016-06-16 22:00:16 +0300 Increase the number of default build thread ids possibilities Revision #7ab7abd 2016-06-16 18:52:46 +0300 Fix compilation failure when compiling with std=c90 Revision #b644661 2016-06-14 22:29:24 +0200 MDEV-9256 : Crashes on Windows x64 with aria_pagecache_buffer_size > 4GB Revision #34a104b 2016-06-14 12:28:05 +0300 MDEV-10229: TokuDB fails to build with CLang Revision #1bf2509 2016-06-13 23:32:50 +0300 MDEV-10162: Update repair testcase Revision #2b47832 2015-12-10 03:56:31 +0200 Fixed compilation failure using clang Revision #6a34ba3 2016-02-16 16:15:22 +0200 [Code cleanup] Refactor duplicate code within myisam and maria sort.cc Revision #bfef17b 2016-06-13 18:30:02 +0300 MDEV-9433: [PATCH} cppcheck reported a number of minor coding errors Revision #0089af8 2016-06-13 18:11:31 +0300 MDEV-9433: [PATCH] cppcheck reported a number of minor coding errors Revision #cf721d2 2015-12-10 17:00:14 +1100 MDEV-9257: Increase limit on parallel workers in mysql-test-run Revision #05bb3b9 2016-06-14 16:28:07 +0200 fix main.ssl_ca test for windows Revision #a4cfd32 2016-06-14 14:52:43 +0200 main.openssl_1 failure Revision #c73b987 2016-06-14 13:18:05 +0200 MDEV-8328 Evaluation of two "!" operators depends on space in beetween Revision #c3c272c 2016-06-10 13:47:00 +0200 MDEV-10166 probes_mysql_nodtrace.h is not provided anymore by mariadb-10.0.25 Revision #260699e 2016-06-14 13:59:41 +0200 - Merge branch 'merge-xtradb-5.5' into 5.5 Revision #f54dcf1 2016-06-14 12:38:47 +0200 5.5.49-37.9 Revision #90eb302 2016-06-14 13:57:49 +0200 fix main.ssl_ca from mysql-5.5.50 Revision #ae29ea2 2016-06-14 13:55:28 +0200 - Merge branch 'mysql/5.5' into 5.5 Revision #1b50d59 2016-06-14 14:44:09 +0400 MDEV-9945 - main.kill_processlist-6619 fails sporadically Revision #d6a1bae 2016-06-13 17:10:31 +0400 MDEV-10218 - rpl.rpl_binlog_errors fails in buildbot with valgrind warnings - bytes are possibly lost Revision #2db724c 2016-06-13 15:54:12 +0400 MDEV-10218 - rpl.rpl_binlog_errors fails in buildbot with valgrind warnings - bytes are possibly lost Revision #3c77a00 2016-03-08 13:27:18 +0200 MDEV-8012: Wrong exit code when asking for help Revision #416006a 2016-06-12 22:45:15 +0300 MDEV-8012: Wrong exit code when asking for help Revision #67b4a6f 2016-06-12 20:14:51 +0300 MDEV-8859 rpl.rpl_mdev382 sporadically fails to finish due to disappeared expect file Revision #87007dc 2016-06-08 15:03:18 +0400 MDEV-9994 - Aria service threads are not "joined" Revision #4155d09 2016-06-10 17:06:38 +0400 MDEV-8402 Bug #77473 Truncated data with subquery & UTF8 Revision #df14488 2016-06-10 15:50:19 +0400 MDEV-10181 Illegal mix of collation for a field and an ASCII string as a view field Revision #7adf04e 2016-01-05 22:48:50 +0100 MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows. Fix test whether process is alive in mysqltest. Revision #a4848e9 2016-06-08 19:04:12 +0400 MDEV-9972 Least function retuns date in date time format Revision #b31976f 2016-06-08 15:15:55 +0200 - Merge branch 'mdev9991' into mdev9991-5.5 Revision #196d96c 2016-06-08 15:12:44 +0200 Fix compiler check for stack unwind hint Revision #0f25270 2016-06-08 08:40:10 +0300 MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8 Revision #ff832e0 2016-05-24 17:37:23 +0200 Restore COMPONENT Embedded for Windows embedded libs. Revision #221adbc 2016-05-24 17:01:08 +0200 Fix warnings on Windows, compiler option -ggdb3 option is nonexistent Revision #535160b 2016-05-24 16:57:03 +0200 MDEV-10117 - update HeidiSQL to current version Revision #9eb0fbd 2016-05-24 14:20:53 +0200 MDEV-10071 Block installation on XP/Windows 2003 Server(they are no more supported) Revision #18487ed 2016-05-24 14:18:55 +0200 MDEV-10108 Fix errors in installations by domain user Revision #964c4f0 2016-05-10 19:13:06 +0400 MDEV-10052 Illegal mix of collations with DAYNAME(date_field)<>varchar_field Revision #672bbcd 2016-04-27 16:13:14 +0200 MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later) This appears to break some installation, and it did not do anything useful anyway. Revision #4f1ad43 2016-04-26 16:15:15 +0400 MDEV-9987 - gen_lex_hash leaks memory, making LeakSanitizer builds fail Revision #29868de 2016-04-26 12:58:14 +0200 MDEV-9986 Full-text search of the utf8mb4 column causes crash Revision #7f5ceb7 2016-04-26 11:49:35 +0200 disable main.wait_timeout_not_windows for embedded Revision #2220480 2016-04-25 18:59:41 +0200 MDEV-7775 Wrong error message (Unknown error) when idle sessions are killed after wait_timeout Revision #a98ecc2 2016-04-23 12:19:40 +0200 support SEARCH_RANGE in search_pattern_in_file.inc Revision #2b7573e 2016-04-24 13:36:51 +0400 MDEV-9975 - main.partition_innodb_plugin fails sporadically Revision #19e3597 2016-04-07 10:47:46 +0300 MDEV-9142 :Adding Constraint with no database reference results in ERROR 1046 (3D000) at line 13: No database selected. Revision #0ea4c73 2016-04-23 12:15:18 +0400 Fixed compilation failure due to unused var. Revision #618e300 2016-04-22 12:57:39 +0400 MDEV-9970 - main.sp-threads fails sporadically Revision #bd75ee7 2016-04-22 09:10:00 -0400 bump the VERSION Revision #3f0d07e 2016-04-22 16:04:20 +0400 MDEV-9372 select 100 between 1 and 9223372036854775808 returns false Revision #0991e19e 2016-04-20 20:25:46 +0200 - Merge branch 'bb-5.5-serg' into 5.5 Revision #63c834e 2016-04-20 18:56:41 +0200 - Merge branch 'merge-xtradb-5.5' into 5.5 Revision #c9e56d5 2016-04-18 17:38:05 +0200 5.5.48-37.8 Revision #24ac546 2016-04-20 18:27:23 +0200 use consistent error messaging for IGNORE Revision #9e826bf 2016-04-20 15:28:44 +0200 trivial optimization Revision #8f1f869 2016-04-20 15:26:37 +0200 another test case for ER_DATA_OUT_OF_RANGE on insert Revision #b069d19 2016-04-20 15:25:55 +0200 - Merge branch 'mysql/5.5' into 5.5 Revision #1bc0b0b 2016-04-19 11:08:16 +0200 fix a couple of dbug tests not to write to /tmp Revision #cc04a9f 2016-04-18 18:30:42 +0200 MDEV-9835 Valid password is not working after server restart Revision #608c0e1 2016-04-18 11:57:34 +0200 MDEV-5982 `make` fail @ ".../libmysql_versions.ld:155:9: invalid use of VERSION in input file" Revision #ce35530 2016-04-17 19:52:15 +0200 MDEV-9885 Client doesn't start if 'TERM' unknown Revision #95fe71a 2016-04-17 18:51:54 +0200 MDEV-9707 MAX(timestamp(6) column) in correlated sub-query returns non-existent row data in original table Revision #3294cd1 2016-04-16 17:36:47 +0200 MDEV-9929 MariaDB segfaults on command "mysqld --version" with ignore-db-dir option on /etc/my.cnf Revision #4f133fb 2016-04-16 12:39:20 +0200 MDEV-9493 --tc-heuristic-recover option values off by one Revision #edf71fd 2016-04-16 10:28:03 +0200 MDEV-9928 LC_TIME_NAMES=de_AT; unusual name for february Revision #9c64735 2016-03-29 12:50:56 +0200 MDEV-9748 Include Twin (mysys_err.h is included twice in mysys/my_copy.c) Revision #2a45fa9 2016-04-20 19:03:59 +0200 MDEV-9836 Connection lost when using SSL Revision #0c0a865 2016-04-19 16:16:13 +0400 MDEV-9943 - TokuDB fails to compile with gcc 5.2.1 Revision #62122ba 2016-04-20 00:36:58 +0300 MDEV-9953 Debian packages install broken 'maria' test suite which cannot be run Revision #e90f8b7 2016-04-20 11:11:13 +0400 MDEV-9413 "datetime >= coalesce(c1(NULL))" doesn't return expected NULL Revision #2564650 2016-04-20 11:02:34 +0400 MDEV-9662 Assertion `precision || !scale' failed in my_decimal_precision_to_length_no_truncation(uint, uint8, bool) Revision #9a98714 2016-04-20 08:53:30 +0400 MDEV-9745 Crash with CASE WHEN TRUE THEN COALESCE(CAST(NULL AS UNSIGNED)) ELSE 4 END Revision #6c0e231 2016-04-19 14:05:52 +0400 MDEV-9945 - main.kill_processlist-6619 fails sporadically Revision #18ff6f6 2016-04-19 12:38:00 +0400 MDEV-9944 - main.events_2 fails sporadically Revision #6fd54c0 2016-04-18 23:15:15 +0400 MDEV-9521 Least function returns 0000-00-00 for null date columns instead of null Revision #777c213 2016-04-02 00:04:47 +0400 MDEV-9862 Illegal mix of collation, when comparing column with CASE expression Revision #11b77e9 2016-03-18 16:55:11 +0100 MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11" Revision #fc2c1e4 2016-03-17 21:29:52 +0100 MDEV-9733 Server crashes in lf_pinbox_real_free on replication slaves Revision #0b9fb9a 2016-03-17 10:45:15 +0100 MDEV-9568 mysqlcheck crashes with nonexistent table name Revision #c29e450 2016-02-26 03:02:07 +0200 MDEV-4070 sys_vars.secure_file_priv fails sporadically if it's executed with --mem Revision #ceba41c 2016-01-24 17:41:11 +0100 MDEV-9299 Test main.events_2 incompatible with Debian reproducibility testing framework Revision #e1385f2 2016-02-15 12:59:47 +0100 fix buffer overrun Revision #3889b19 2016-02-14 22:19:27 +0100 more strict ipv6_ok check in mtr Revision #8f5030e 2016-02-14 22:17:38 +0100 fix my_gethwaddr() for solaris Revision #95740bc 2016-02-14 22:16:50 +0100 dtrace in cmake Revision #a5d9597 2016-02-14 22:15:16 +0100 better inline check Revision #5f078cc 2016-02-14 20:57:48 +0100 compilation errors on sparc sun studio 10 Revision #2a47817 2016-02-14 18:33:20 +0200 MDEV-9225 mysql_upgrade segfault due to missing /etc/my.cnf.d Revision #b7dc830 2016-02-14 18:31:06 +0200 Fix memory leak when failing to read config file Revision #93e9d81 2016-02-12 12:04:11 +0400 Errorneous PSI declaration line fixed. Revision #a9a08b1 2016-02-10 10:03:47 +0400 MDEV-9371 select insert('a',2,1,'b') doesn't return expected 'a' Revision #3c5c04b 2016-02-10 03:49:11 +0200 MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::init Revision #6b614c6 2016-02-09 13:50:48 +0100 MDEV-7765: Crash (Assertion `!table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || bitmap_is_set(table->vcol_set, field_index))' fails) on using function over not created table Revision #775cccc 2016-02-08 22:53:40 +0200 MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::init Revision #01628ce 2016-02-09 14:08:36 +0100 Merge branch 'bb-5.5-serg' into 5.5 Revision #afce541 2016-02-09 14:06:45 +0100 Merge branch 'merge-xtradb-5.5' into 5.5 Revision #5d478f5 2016-02-08 20:07:38 +0100 Bug#19817021 Revision #6703e5b 2016-02-08 20:07:09 +0100 Bug#20691429 ASSERTION `CHILD_L' FAILED IN STORAGE/MYISAMMRG/HA_MYISAMMRG.CC:631 Revision #dece4bc 2016-02-09 11:28:44 +0100 cleanup: make assert more readable Revision #63d3ccd 2016-02-08 20:04:39 +0100 Bug#21205695 DROP TABLE MAY CAUSE SLAVES TO BREAK Revision #f3444df 2016-02-09 11:27:40 +0100 Merge branch 'mysql/5.5' into 5.5 Revision #ea0c3fc 2016-02-09 05:17:41 +0400 MDEV-9438 backport feedback-http-proxy to 5.5 and 10.0. The http-proxy option to the FEEDBACK plugin backported. Revision #b17a435 2016-02-09 02:31:47 +0300 MDEV-6859: scalar subqueries in a comparison produced unexpected result Revision #3cfd36b 2016-02-09 00:13:25 +0100 5.5.47-37.7 Revision #d443d70 2016-02-09 01:46:53 +0300 MDEV-7823: Server crashes in next_depth_first_tab on nested IN clauses with SQ inside Revision #c4cb240 2016-02-06 22:41:58 +0100 MDEV-9024 Build fails with VS2015 Revision #1e361f2 2016-02-06 13:57:59 +0100 MDEV-4664 mysql_upgrade crashes if root's password contains an apostrophe/single quotation mark Revision #9e4e412 2016-02-06 13:56:37 +0100 unit test for dynstr_append_os_quoted() Revision #41021c0 2016-02-03 17:15:22 +0100 MDEV-9462: Out of memory using explain on 2 empty tables Revision #ad94790 2016-02-04 14:47:46 +0100 MDEV-9453 mysql_upgrade.exe error when mysql is migrated to mariadb Revision #0a76ad5 2016-02-04 12:51:57 +0100 MDEV-9175 Query parser tansforms MICROSECOND into SECOND_FRAC, which does not work Revision #a90da6e 2016-02-05 14:04:24 +0100 MDEV-9314 fatal build error: viosslfactories.c:58:5: error: dereferencing pointer to incomplete type ???DH {aka struct dh_st} Revision #db5f743 2016-02-06 12:37:46 +0200 Merge pull request #148 from grooverdan/5.5-rpl_reporting-cppcheck-va_end Revision #6ecf6d8 2016-02-05 17:46:01 +0100 MDEV-7827: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed in Field_long::val_str on EXPLAIN EXTENDED Revision #9f3b53f 2015-12-14 19:16:29 +0100 MDEV-9093 Persistent computed column is not updated when update query contains join Revision #a3d843d 2016-02-03 15:52:26 +0200 Fix function visibility as it is used on row0mysql.c in Windows. Revision #f66d016 2016-02-03 11:32:51 +0200 MDEV-9471: Server crashes or returns an error while trying to alter partitioning on a table moved from Windows to Linux Revision #603c096 2016-02-03 00:43:00 +0100 MDEV-9466 : Exception handler on Windows does not output any text, if mysqld runs as service Revision #0e84d54 2016-02-01 16:27:12 +0100 Merge MDEV-9112 into 5.5 Revision #8cf1f50 2016-02-01 16:10:49 +0100 MDEV-9112: Non-blocking client API missing on non-x86 platforms Revision #d0c5efc 2016-01-29 23:53:44 +0200 If one compiled with too long MYSQL_SERVER_SUFFIX this caused a memory overrun that caused some test to fail. Revision #a1ddf01 2016-01-29 23:52:15 +0200 my_decimal didn't compile properly with debug Revision #3e5724f 2016-01-19 14:47:41 +1100 Add va_end to make cppcheck happy Revision #9c9d10b 2016-01-15 09:50:27 +0400 MDEV-9106 Audit plugin not working with MySQL 5.7. fixing Windows crash. Revision #fe4823d 2016-01-13 18:02:44 +0400 MDEV-9106 Audit plugin doesnt run with MySQL 5.7. updata thread_pool_server_audit test result. Revision #cdc9aa5 2016-01-13 15:24:33 +0400 MDEV-9106 Audit Plugin doesn't run with MySQL 5.7. MariaDB 5.5 built in debug gets unhappy with mutexes. Although everything is correct, some DBUG_ASSERT can happen. So this patch keeps safe_mutex silent. Revision #c955253 2016-01-12 16:29:02 +0400 MDEV-9106 Audit plugin compiled with MariaDB can't install on MySQL 5.7. The audit API was seriously changed in MySQL 5.7. so we had to adapt the plugin's code to that. Revision #5f48b61 2016-01-07 14:45:40 +0100 MDEV-9298 : Build failure when linking libmysql. Revision #ff24820 2015-12-30 19:39:31 +0100 Fix process handle leak in buildbot. GenerateConsoleCtrlEvent sent to non-existing process will add a process handle to this non-existing process to console host process conhost.exe Revision #61d3621 2015-12-29 18:40:41 +0400 Moving Field_blob::store_length() back from protected to public, as it's needed for Cassandra in 10.0. Revision #e1b9be5 2015-12-29 14:17:31 +0400 MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much data Revision #e126baa 2015-12-21 10:19:02 +0100 MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ???ERR_remove_state??? was not declared in this scope" when linking against OpenSSL 1.0.2e Revision #591e74c 2015-06-20 16:59:22 +0800 MDEV-7526: TokuDB doesn't build on OS X Revision #e386523 2015-12-19 13:53:43 +0200 MDEV-7526: TokuDB doesn't build on OS X Revision #f39b9e0 2015-12-19 13:52:27 +0200 MDEV-7526: TokuDB doesn't build on OS X Revision #6414959 2015-12-19 13:31:44 +0200 MDEV-7526: TokuDB doesn't build on OS X Revision #f89c9fc 2015-12-19 13:25:55 +0200 MDEV-7526: TokuDB doesn't build on OS X Revision #0ed4744 2015-12-11 17:03:55 +0100 fix main.mysqldump test on windows Revision #ca28d90 2015-12-09 17:54:55 +0100 MDEV-7655 SHOW CREATE TABLE returns invalid DDL when using virtual columns along with a table collation Revision #f560c1b 2015-12-10 10:32:11 +0100 revert 5e9a50efc37c233f1e2a3616f8bcb36315aba4c2 Revision #265e833 2015-12-09 21:22:37 +0100 revert 415faa122b9c683661dafac82fff414fa6864151 Revision #c19972f 2015-12-11 14:33:41 +0200 MDEV-9251: Fix MySQL Bug#20755615: InnoDB compares column names case sensitively, while according to Storage Engine API column names should be compared case insensitively. This can cause FRM and InnoDB data dictionary to go out of sync. Revision #fa25921 2015-12-10 11:22:53 +0100 MDEV-8407 Numeric errors, server crash with COLUMN_JSON() on DECIMAL with precision > 40 Revision #d67aacb 2015-12-09 17:11:55 +0100 fix xtradb compilation on windows Revision #fa4d4fc 2015-12-09 10:06:28 +0100 unit tests for my_getopt Revision #584c07b 2015-10-21 11:51:15 +0200 MDEV-8978 Specify GPL version in RPM metadata Revision #142b725 2015-12-09 12:57:04 +0100 Merge branch 'merge/merge-xtradb-5.5' into 5.5 Revision #9457139 2015-12-09 12:27:04 +0100 5.5.46-37.6 Revision #1a72c6f 2015-12-09 11:51:59 +0100 Merge branch 'bb-5.5-serg' into 5.5 Revision #abf9d35 2015-12-09 10:00:49 +0100 Merge branch 'mysql/5.5' into 5.5 Revision #dac3149 2015-12-08 17:20:34 +0400 MDEV-9001 - [PATCH] Fix DB name quoting in mysqldump --routine Revision #50a796d 2015-12-08 10:16:41 +0100 MDEV-8825 mysql_upgrade leaks the admin password when it spawns a shell process to execute mysqlcheck Revision #c21b927 2015-12-08 10:13:13 +0100 mysql_upgrade cleanup Revision #f0d774d 2015-12-07 20:06:54 +0100 MDEV-9212 ssl-validate-cert incorrect hostname check Revision #544eeda 2015-12-07 20:27:58 +0100 MDEV-8644 Using a UDF in a virtual column causes a crash when stopping the server Revision #79d08e6 2015-12-07 15:15:43 +0100 small cleanup: udf_init()/udf_free() calls Revision #859a736 2015-12-07 14:07:36 +0100 MDEV-9161 feedback_plugin_send in debug builds Revision #99774f1 2015-12-06 11:51:57 +0100 feedback plugin compilation warnings Revision #8fd24b4 2015-12-07 20:25:27 +0100 MDEV-9226 SHOW COLUMNS returns wrong column order for tables with large ENUMs Revision #f18599a 2015-12-06 20:22:33 +0100 tokudb compilation warnings Revision #d1fe928 2015-12-06 12:01:12 +0100 MDEV-8607 Init script doesn't check all applicable configuration groups Revision #18954ff 2015-12-06 01:48:07 +0100 MDEV-8313 Got an error writing communication packets Revision #354e567 2015-12-06 01:40:51 +0100 federatedx small cleanup Revision #e05883b 2015-12-05 15:25:15 +0100 MDEV-7341 mysqld_multi doesn't recognize include directive (not following includes) Revision #ef47b625 2015-12-05 11:29:00 +0100 MDEV-8827 Duplicate key with auto increment Revision #c8652ee 2015-12-05 11:22:25 +0100 one more test Revision #ee2fce5 2015-10-20 09:41:44 +0200 fix debian logrotate slow log filename Revision #0df22a5 2015-12-07 09:34:41 +0200 MDEV-7050: MySQL#74603 - Assertion `comma_length > 0' failed in mysql_prepare_create_table Revision #d85168e 2015-12-07 09:20:31 +0200 Correct length check in my_wc_mb_filename() Revision #e528fe7 2015-12-05 12:21:33 +0200 Fix gcc v5.compiler errors. Revision #082b859 2015-12-04 14:24:03 +0200 MDEV-9233: Copying MySQL 5.5 data directory to 10.0 with partition tables crashes on insert Revision #d87bc55 2015-12-03 20:43:54 +0400 MDEV-8630 Datetime value dropped in "INSERT ... SELECT ... ON DUPLICATE KEY" Item_func_coalesce::fix_length_and_dec() calls Item_func::count_string_result_length()) which called agg_arg_charsets() with wrong flags, so the collation derivation of the COALESCE result was not properly set to DERIVATION_COERCIBLE. It erroneously stayed DERIVATION_NUMERIC. So GREATEST() misinterpreted the argument as a number rather that a string and did not calculate its own length properly. Revision #9f07c6b 2015-12-02 16:08:54 +0400 MDEV-9001 - [PATCH] Fix DB name quoting in mysqldump --routine Revision #33589b2 2015-12-03 13:18:10 +0200 MDEV-7762 InnoDB: Failing assertion: block->page.buf_fix_count > 0 in buf0buf.ic line 730 Revision #13ad179 2015-11-20 14:50:18 +0100 MDEV-8756 MariaDB 10.0.21 crashes during PREPARE Revision #43a5090 2015-11-18 11:20:59 +0100 MDEV-9051 mysqld got signal 11, after upgrade to 10.1.8 Revision #7261629 2015-11-18 10:58:51 +0100 feedback plugin debug Revision #e669a5f 2015-11-17 18:33:08 +0100 MDEV-7588 Add thd_wait_begin/end to notify threadpool of binlog waits Revision #7e4da9b 2015-11-06 16:36:41 +0100 MDEV-8632 Segmentation fault on INSERT Revision #5d754fc 2015-11-09 09:23:32 +0200 MDEV-8854: New warning messages are unreadable Revision #c88ca2c 2015-11-06 17:56:56 +0100 MDEV-8701 Crash on derived query MDEV-8938 Server Crash on Update with joins Revision #df80420 2015-10-21 14:42:56 +0200 fix events_1 test for October 2015 Revision #978c2a3 2015-10-11 17:06:03 -0400 MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements Revision #16c4b3c 2015-10-09 16:43:59 +0200 fixes for buildbot Revision #f41a41f 2015-10-09 00:06:16 +0200 Merge branch 'merge-xtradb-5.5' into 5.5 Revision #db79f4c 2015-10-08 23:02:43 +0200 5.5.45-37.4 Revision #82e9f6d 2015-10-08 22:54:24 +0200 Merge remote-tracking branch 'mysql/5.5' into 5.5 Revision #c8d5112 2015-10-08 00:32:07 +0200 MDEV-8796 Delete with sub query with information_schema.TABLES deletes too many rows Revision #504802f 2015-08-05 11:57:35 +0200 MDEV-7846: postreview fix Revision #54b9981 2015-04-23 20:08:57 +0200 MDEV-7846: Server crashes in Item_subselect::fix_fields or fails with Thread stack overrun Revision #0ab93fd 2015-04-23 19:16:57 +0200 MDEV-7445:Server crash with Signal 6 MDEV-7565: Server crash with Signal 6 (part 2) Revision #2e3e818 2015-04-23 19:11:06 +0200 MDEV-7445: Server crash with Signal 6 Revision #7ccde2c 2015-04-23 19:04:11 +0200 MDEV-7565: Server crash with Signal 6 (part 2) Revision #006acf7 2015-09-30 10:49:45 +0300 Bug #68148: drop index on a foreign key column leads to missing table MDEV-8845: Table disappear after modifying FK Revision #a95711e 2015-09-29 08:39:54 +0300 MDEV-8855: innodb.innodb-fk-warnings fails on Windows Revision #02a38fd 2015-09-24 17:25:52 +0200 MDEV-8624: MariaDB hangs on query with many logical condition Revision #f804b74 2015-09-28 03:40:29 +0300 MDEV-8154 rpl.show_status_stop_slave_race-7126 sporadically causes internal check failure Revision #ce7d8c5 2015-09-27 18:01:47 +0300 MDEV-7330 plugins.feedback_plugin_send fails sporadically in buildbot Revision #bdcf370 2015-09-27 16:00:48 +0300 MDEV-7933 plugins.feedback_plugin_send depends on being executed after plugins.feedback_plugin_load Revision #2563609 2015-09-26 02:51:29 +0300 Increased the version number Revision #86ed494 2015-09-26 02:48:55 +0300 MDEV-8849 rpl.rpl_innodb_bug30888 sporadically fails in buildbot with testcase timeout Revision #dca4ab9 2015-09-24 21:24:28 +0300 MDEV-8841 innodb_zip.innodb-create-options fails in buildbot Revision #5cc149f 2015-09-24 10:28:47 +0200 The compiler warnings fixed. Revision #29ac245 2015-09-07 13:13:52 +0200 MDEV-8473: mysqlbinlog -v does not properly decode DECIMAL values in an RBR log Revision #102a85f 2015-09-03 18:00:43 +0200 MDEV-8663: IF Statement returns multiple values erroneously (or Assertion `!null_value' failed in Item::send(Protocol*, String*)) Revision #fa51f70 2015-08-04 23:42:44 +0200 correct the NULL-pointer test Revision #877de3a 2015-07-30 22:08:39 +0300 MDEV-8554: Server crashes in base_list_iterator::next_fast ... Revision #1b0c81c 2015-08-01 15:02:14 +0200 5.5.44-37.3 Revision #96badb1 2015-07-31 22:09:46 +0200 MDEV-7821 Server crashes in Item_func_group_concat::fix_fields on 2nd execution of PS Revision #409709e 2015-07-31 20:33:10 +0200 compilation error on windows Revision #79deefc 2015-07-31 12:31:37 +0200 MDEV-8340 Add "mysqlbinlog --binlog-row-event-max-size" support for MariaDB 5.5 Revision #4d5772c 2015-07-31 10:13:01 +0200 MDEV-7810 Wrong result on execution of a query as a PS (both 1st and further executions) Revision #2721d69 2015-07-28 19:11:53 +0200 MDEV-8352 Increase Diffie-Helman modulus to 2048-bits Revision #bfe2689 2015-07-31 13:13:39 +0400 MDEV-8379 - SUSE mariadb patches Revision #360e597 2015-07-31 12:06:29 +0300 Make sure name buffer has string end marker on correct place. Revision #1ad294e 2015-07-30 18:51:44 +0400 MDEV-7821 - Server crashes in Item_func_group_concat::fix_fields on 2nd execution of PS Revision #fa765a4 2015-07-31 08:52:24 +0300 MDEV-6697: Improve foreign keys warnings/errors Revision #e05cd97 2015-07-29 05:58:45 +0300 MDEV-8524: Improve error messaging when there is duplicate key or foreign key names Revision #392df76 2015-07-23 12:50:58 +0400 MDEV-4017 - GET_LOCK() with negative timeouts has strange behavior Revision #e40bc65 2015-07-25 15:14:40 +0300 Fixed memory loss detected on P8. This can happen when we call after_flush but never call after_rollback() or after_commit(). Revision #7115341 2015-07-23 14:57:12 +0300 Fixed warnings and errors found by buildbot Revision #7a96702 2015-07-21 12:12:58 +0300 MDEV-8474: InnoDB sets per-connection data unsafely Revision #00d3b20 2015-07-17 00:06:27 +0300 MDEV-8432 Slave cannot replicate signed integer-type values with high bit set to 1 Revision #44de090 2015-07-17 00:02:25 +0300 MDEV-8432 Slave cannot replicate signed integer-type values with high bit set to 1 Revision #bc30046 2015-06-26 14:48:22 +0300 Fix for MDEV-8301; Statistics for a thread could be counted twice in SHOW STATUS while thread was ending Revision #67c56ab 2015-06-25 23:34:54 +0300 Simple cleanups - Removing use of calls to current_thd - More DBUG_PRINT - Code style changes - Made some local functions static Ensure that calls to print_keyuse are locked with mutex to get all lines in same debug packet Revision #8c81575 2015-06-25 23:26:29 +0300 Problem was that for cases like: SELECT ... WHERE XX IN (SELECT YY) this was transformed to something like: SELECT ... WHERE IF_EXISTS(SELECT ... HAVING XX=YY) Revision #2e941fe 2015-06-25 23:18:48 +0300 Fixed crashing bug when using ONLY_FULL_GROUP_BY in a stored procedure/trigger that is repeatedly executed. This is MDEV-7601, including its sub tasks MDEV-7594, MDEV-7555, MDEV-7590, MDEV-7581, MDEV-7589 Revision #d199a0f 2015-06-11 17:47:52 +0200 more renames after tokudb merge Revision #b96c196 2015-06-11 16:48:10 +0200 Item_cache::safe_charset_converter() fixes Revision #7c98e8a 2015-06-11 16:43:56 +0200 fix after the tokudb ft-index merge Revision #5a44e1a 2015-06-09 22:11:22 +0200 tests for MDEV-7937: Enforce SSL when --ssl client option is used Revision #80f6b22 2015-06-09 16:08:09 +0400 MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with disabled keys Revision #3a50a8c 2015-06-09 13:50:43 +0400 MDEV-363 - Server crashes in intern_plugin_lock on concurrent installing semisync plugin and setting rpl_semi_sync_master_enabled Revision #49a3392 2015-06-09 11:57:31 +0400 MDEV-363 - Server crashes in intern_plugin_lock on concurrent installing semisync plugin and setting rpl_semi_sync_master_enabled Revision #e5005ce 2015-06-09 18:06:41 +0200 disable ssl for ssl-disabled tests Revision #992d782 2015-06-09 18:56:09 +0300 MDEV-6735: Range checked for each record used with key (also MDEV-7786, MDEV-7923) Revision #5d57e2d 2015-06-09 16:46:45 +0300 Fix tests for 7937 Revision #be5035b 2015-06-09 15:59:29 +0300 Added tests for MDEV-7937 Revision #4ef7497 2015-06-09 14:08:44 +0300 MDEV-7937: Enforce SSL when --ssl client option is used Revision #56e2d83 2015-05-02 08:45:10 +0200 MDEV-7695 MariaDB - ssl - fips: can not connect with --ssl-cipher=DHE-RSA-AES256-SHA - handshake failure Revision #92b3659 2015-06-09 12:05:06 +0400 MDEV-7268 Column of table cannot be converted from type 'decimal(0,?)' to type ' 'decimal(10,7)' Changing the error message to: "...from type 'decimal(0,?)/*old*/' to type ' 'decimal(10,7)'..." So it's now clear that the master data type is OLD decimal. Revision #b1e1039 2015-06-09 07:36:24 +0400 MDEV-8286 Likely a redundant declaration of Item_cache::used_table_map Revision #a4d93e0 2015-06-05 20:05:08 +0200 MDEV-8050 sphinx test cases cannot run with sphinxsearch-2.2.6 Revision #b41ad55 2015-06-08 15:09:20 +0200 update tokudb version Revision #1707cfc 2015-06-08 21:55:52 +0500 MDEV-8211 plugins.server_audit fails sporadically in buildbot. More fixes to assure the order of queries in the log. Revision #87088b9 2015-06-08 21:44:13 +0500 MDEV-8211 plugins.server_audit fails sporadically in buildbot. This test also should be fixed - delay added so the connection event doesn't happen before the query. Revision #96b3703 2015-06-08 21:40:17 +0500 MDEV-8211 plugins.server_audit fails sporadically in buildbot. Connection event can happen before the query ends. Added a delay to confirm the order. Revision #a765cca 2015-06-08 20:50:40 +0400 MDEV-8067 correct fix for MySQL Bug # 19699237: UNINITIALIZED VARIABLE IN ITEM_FIELD::STR_RESULT Revision #b37b52a 2015-06-08 13:47:07 +0500 MDEV-4922 Stored Procedure - Geometry parameter not working. Fhe GEOMETRY field should be handled just as the BLOB field. So that was fiexed in field_conv. One additional bug was found and fixed meanwhile - thet the geometry field subtypes should also be merged for UNION command. Revision #69ed429 2015-06-08 12:09:13 +0500 MDEV-7500 thread_handling option in my.cnf is not passing "connect events" to audit plugin. The MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT() call moved to the login_connection() function. So that it'll be invoked in any thread handling mode. Revision #1ae05db 2015-06-07 15:40:42 +0500 MDEV-8078 Memory disclosure/buffer overread on audit plugin. If the SET PASSWORD query doesn't have the password string, the parsing of it can fail. It manifested first in MySQL 5.6 as it started to hide password lines sent to the plugins. Fixed by checking for that case. Revision #db0ecf2 2015-06-06 19:12:44 +0500 MDEV-8032 [PATCH] audit plugin - csv output broken. Symbols like TAB or NEWLINE should be escaped, which was forgotten in one place. Revision #6264451 2015-06-06 16:13:51 +0200 MDEV-8114: server crash on updates with joins still on 10.0.18 Revision #9a3b975 2015-06-05 09:51:17 +0200 Merge branch '5.5' into bb-5.5-serg Revision #a2bb9d2 2015-06-04 16:04:05 +0400 MDEV-7505 - Too large scale in DECIMAL dynamic column getter crashes mysqld Revision #b611ac0 2015-06-03 14:30:09 +0400 MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL Revision #af2256f 2015-06-03 13:59:58 +0400 MDEV-7207 - ALTER VIEW does not change ALGORITM Revision #ae0c576 2015-06-05 02:14:49 +0200 Merge branch 'merge/merge-xtradb-5.5' into bb-5.5-serg Revision #f84f577 2015-06-05 02:06:51 +0200 Merge tag 'mysql-5.5.44' into bb-5.5-serg Revision #f07b346 2015-06-05 02:04:32 +0200 do not re-populate I_S tables in subqueries Revision #1ff423d 2015-06-04 21:12:29 +0400 MDEV-8243 configure defines to empty string, not 1 Revision #750aa8b 2015-06-04 18:58:12 +0200 5.5.43-37.2 Revision #980bdc3 2015-06-04 17:39:05 +0200 followup: CREATE SERVER tests should not be run for embedded Revision #a477cd1 2015-06-03 23:31:05 +0300 MDEV-6500: Stale data returned after TRUNCATE PARTITION operation Revision #08fa02c 2015-06-04 18:51:30 +0400 Some MYD files (e.g. in mysql-test/std_data) could erroneously be treated by git as text files. Revision #9da8a8f 2015-06-04 18:49:12 +0400 MDEV-7269 mysqlbinlog Don't know how to handle column type=0 meta=0 (0000)# MDEV-8267 Add /*old*/ comment into I_S.COLUMN_TYPE for old DECIMAL Revision #a8b8544 2015-06-04 13:00:53 +0300 MDEV-7906: InnoDB: Failing assertion: prebuilt->sql_stat_start || trx->state == 1 on concurrent multi-table update Revision #7b05650 2015-06-03 20:24:51 +0200 Merge tag 'tokudb-engine/tokudb-7.5.7' into 5.5 Revision #e500c47 2015-06-03 19:47:46 +0200 Merge tag 'tokudb-ft-index/tokudb-7.5.7' into 5.5 Revision #934a18d 2015-06-03 19:42:34 +0200 .gitattributes: *.dat files should not be CRLF converted Revision #c79e98e 2015-06-03 18:45:08 +0200 MDEV-8085 main.group_by failed in buildbot Revision #5d8cee4 2015-06-03 17:11:07 +0200 MDEV-8224 Server crashes in get_server_from_table_to_cache on empty name Revision #33d480f 2015-06-03 16:33:10 +0200 MDEV-4608 deb packages for jessie Revision #f806b4d 2015-06-03 12:13:43 +0200 MDEV-8124 mysqlcheck: --auto-repair runs REPAIR TABLE instead of REPAIR VIEW on views Revision #535b514 2015-06-03 10:35:34 +0200 MDEV-8123 mysqlcheck: new --process-views option conflicts with --quick, --extended and such Revision #64569fa 2015-06-03 11:11:53 +0200 parser: better error messages for CHECK/REPAIR VIEW Revision #0ffef5d 2015-06-03 09:54:56 +0200 MDEV-8052 abi detection incorrect with clang Revision #8e7d665 2015-06-02 22:07:47 +0200 CRLF->LF Revision #6bd76f8 2015-05-27 10:27:18 +0400 Merge pull request #73 from akopytov/MDEV-7658-5.5 Revision #70bc0a3 2015-05-26 23:56:00 +0300 Fixes MDEV-7658: MDEV-7026 fix reintroduces MDEV-6615 on AArch64 Revision #5d02928 2015-05-16 10:26:34 +0200 remove second @ from CONFIGURE_FILE (... @ONLY@) Revision #6f8558b 2015-05-12 14:19:30 -0400 Fix for debug build failure Revision #373d092 2015-05-08 17:19:48 +0300 Fix win/ files to be stored with LF in repository Revision #23b2b95 2015-05-08 17:19:06 +0300 Update .gitattributes Revision #6ef3c7d 2015-05-08 17:09:45 +0300 Updated .gitattributes Revision #0014bdc 2015-05-07 22:18:34 +0200 MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW Revision #8350ea0 2015-05-07 13:04:03 +0300 Fix compiler error if compiler does not support c99 style initializers. Revision #f704b33 2015-05-06 16:47:23 +0300 Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-members Revision #4d606cb 2015-04-24 23:17:16 +1000 c99 style for assigning structure members --- Module Name: pkgsrc Committed By: maya Date: Wed Sep 14 07:29:10 UTC 2016 Modified Files: pkgsrc/databases/mariadb55-server: PLIST Log Message: mariadb55-server: Restore PLIST ability to build without embedded-server
author: bsiegert <bsiegert> 2016-09-23 18:40:39 +0000
committer: bsiegert <bsiegert> 2016-09-23 18:40:39 +0000
commit: 53e4e4d634ab0374483390b8b686f2ac09c11cf5 (patch)
tree: 9a6c03d3885f58936cd4b59141e610a5381cc25d
parent: 08cc721104f4f58b6a01db9010861412ec5f96f1 (diff)
download: pkgsrc-53e4e4d634ab0374483390b8b686f2ac09c11cf5.tar.gz
7 files changed, 108 insertions, 155 deletions
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index c8f18c5756d..38c4e89d36b 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/03/05 11:27:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2016/09/23 18:40:39 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	3
 COMMENT=	MarisDB 5.5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mariadb55-client/Makefile.common b/databases/mariadb55-client/Makefile.common
index 4f35699b8c1..844a4338c08 100644
--- a/databases/mariadb55-client/Makefile.common
+++ b/databases/mariadb55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2016/02/25 11:46:21 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.3.4.1 2016/09/23 18:40:39 bsiegert Exp $
 #
 # used by databases/mariadb55-client/Makefile
 # used by databases/mariadb55-server/Makefile
 
-DISTNAME=	mariadb-5.5.43
+DISTNAME=	mariadb-5.5.52
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
 
diff --git a/databases/mariadb55-client/distinfo b/databases/mariadb55-client/distinfo
index 04f636fa551..7177c0eab8e 100644
--- a/databases/mariadb55-client/distinfo
+++ b/databases/mariadb55-client/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:56:14 agc Exp $
+$NetBSD: distinfo,v 1.4.6.1 2016/09/23 18:40:39 bsiegert Exp $
 
-SHA1 (mariadb-5.5.43.tar.gz) = 80223c91ecda64ec30a5056af225eee39a3782fd
-RMD160 (mariadb-5.5.43.tar.gz) = 93296e8d9e14949d47d4d0195f566891ba83bc76
-SHA512 (mariadb-5.5.43.tar.gz) = fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db
-Size (mariadb-5.5.43.tar.gz) = 45651398 bytes
+SHA1 (mariadb-5.5.52.tar.gz) = bbedcc0eba7580d1ef16f2dfe4868cf9f31a636d
+RMD160 (mariadb-5.5.52.tar.gz) = fcad9e40ecd29b341a8cdc42afc18aa83b85e60c
+SHA512 (mariadb-5.5.52.tar.gz) = 76d1c1209aa8b56d6562907cb224d0be4f6bccd46e30d16dfb57f19fee1c60dcba21d8388c70674cac0a09e11361e1c5296d1e79d2ba9edc16bc4f9c7a7733eb
+Size (mariadb-5.5.52.tar.gz) = 45745859 bytes
 SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
 RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
+SHA512 (sphinx-2.2.7-release.tar.gz) = 8920fac5730aedd0656fff51acf57a71b9b68d09cf9536959a99623518a126f40f5d8ddf1233a58fccf7801ab2402cebbbd17af4394ebc9fb4eca9b710cc9318
 Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = 02b414235a2cdfc1d5c95946010e0cdbada76c5d
 SHA1 (patch-CMakeLists.txt) = 9c56523626837ab83ecef26f1c0609e084976fa7
@@ -20,7 +21,7 @@ SHA1 (patch-cmake_plugin.cmake) = b7566d25c80c2492a96c5617b96f9b6212b0fe93
 SHA1 (patch-cmake_readline.cmake) = eeadad96a6c8f042c82134b5488956f8094ba4ac
 SHA1 (patch-config.h.cmake) = 75d4c09eb34353057c6a8e36523f55d1bfdace59
 SHA1 (patch-include_CMakeLists.txt) = 9ce9db088fda6ed76039b818c27b74d584bae151
-SHA1 (patch-include_my__context.h) = 2f74d458d10c24261fdd532d197b84c44719c552
+SHA1 (patch-include_my__context.h) = 16e9f69c35243967e5b95022b0350b36c02725da
 SHA1 (patch-include_my_compare.h) = 9d04f444d56d705f3a57add7ad5f8fc5c7ce8341
 SHA1 (patch-include_my_net.h) = b6361a0871afdf66feabc82c5ad3559ff5b34c37
 SHA1 (patch-include_my_pthread.h) = 6d4ec91f90e717b0a075133fea535ee62d64d3ef
@@ -55,4 +56,3 @@ SHA1 (patch-strings_decimal.c) = 4b22180d1766352673a648f76302780b1c06bca5
 SHA1 (patch-strtoll.c) = 53a3c0172487ee68f621328b16aa1742af4ae737
 SHA1 (patch-strtoull.c) = 7126be697036a588d29e21a6e1a472863d285f4a
 SHA1 (patch-vio_viosocket.c) = bf6d57ee04db57b7ac508b18653b0955ef8a6a2b
-SHA1 (patch-vio_viosslfactories.c) = a2e38d211d6dfdbf83d729f195bf81b8c7620103
diff --git a/databases/mariadb55-client/patches/patch-include_my__context.h b/databases/mariadb55-client/patches/patch-include_my__context.h
index 00229152742..68cd4cd77a4 100644
--- a/databases/mariadb55-client/patches/patch-include_my__context.h
+++ b/databases/mariadb55-client/patches/patch-include_my__context.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-include_my__context.h,v 1.1 2015/05/07 12:45:29 fhajny Exp $
+$NetBSD: patch-include_my__context.h,v 1.1.10.1 2016/09/23 18:40:39 bsiegert Exp $
 
---- include/my_context.h.orig	2015-02-13 12:07:01.000000000 +0000
+--- include/my_context.h.orig	2016-09-12 14:54:54.000000000 +0000
 +++ include/my_context.h
 @@ -27,9 +27,9 @@
  
@@ -12,5 +12,5 @@ $NetBSD: patch-include_my__context.h,v 1.1 2015/05/07 12:45:29 fhajny Exp $
 -#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
 +#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) && !defined(__sun)
  #define MY_CONTEXT_USE_I386_GCC_ASM
- #elif defined(HAVE_UCONTEXT)
+ #elif defined(HAVE_UCONTEXT_H)
  #define MY_CONTEXT_USE_UCONTEXT
diff --git a/databases/mariadb55-client/patches/patch-vio_viosslfactories.c b/databases/mariadb55-client/patches/patch-vio_viosslfactories.c
deleted file mode 100644
index 8e60f95c292..00000000000
--- a/databases/mariadb55-client/patches/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-vio_viosslfactories.c,v 1.1 2015/08/03 14:51:30 manu Exp $
-
-Port from mysql:
-https://github.com/mysql/mysql-server/commit/866b988a76e8e7e217017a7883a52a12ec5024b9
-
-From 866b988a76e8e7e217017a7883a52a12ec5024b9 Mon Sep 17 00:00:00 2001
-From: Marek Szymczak <marek.szymczak@oracle.com>
-Date: Thu, 9 Oct 2014 16:39:43 +0200
-Subject: [PATCH] Bug#18367167 DH KEY LENGTH OF 1024 BITS TO MEET MINIMUM REQ
- OF FIPS 140-2
-
-Perfect Forward Secrecy (PFS) requires Diffie-Hellman (DH) parameters to be set.
- Current implementation uses DH key of 512 bit.
-
---- vio/viosslfactories.c.orig	2015-04-29 20:55:39.000000000 +0200
-+++ vio/viosslfactories.c	2015-08-02 14:40:21.000000000 +0200
-@@ -20,29 +20,58 @@
- 
- static my_bool     ssl_algorithms_added    = FALSE;
- static my_bool     ssl_error_strings_loaded= FALSE;
- 
--static unsigned char dh512_p[]=
--{
--  0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
--  0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
--  0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
--  0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
--  0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
--  0x47,0x74,0xE8,0x33,
-+/*
-+  Diffie-Hellman key.
-+  Generated using: >openssl dhparam -5 -C 2048
-+ 
-+  -----BEGIN DH PARAMETERS-----
-+  MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ
-+  46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD
-+  glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E
-+  BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB
-+  h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG
-+  mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
-+  -----END DH PARAMETERS-----
-+ */
-+static unsigned char dh2048_p[]=
-+{
-+  0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
-+  0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
-+  0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2,
-+  0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59,
-+  0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7,
-+  0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41,
-+  0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D,
-+  0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19,
-+  0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64,
-+  0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD,
-+  0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C,
-+  0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0,
-+  0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1,
-+  0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA,
-+  0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E,
-+  0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E,
-+  0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE,
-+  0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C,
-+  0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF,
-+  0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3,
-+  0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66,
-+  0x00, 0x05, 0x85, 0xB7,
- };
- 
--static unsigned char dh512_g[]={
--  0x02,
-+static unsigned char dh2048_g[]={
-+  0x05,
- };
- 
--static DH *get_dh512(void)
-+static DH *get_dh2048(void)
- {
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
--    dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
-+    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-+    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-     if (! dh->p || ! dh->g)
-     {
-       DH_free(dh);
-       dh=0;
-@@ -81,9 +110,11 @@
-   "Unable to get private key",
-   "Private key does not match the certificate public key",
-   "SSL_CTX_set_default_verify_paths failed",
-   "Failed to set ciphers to use",
--  "SSL_CTX_new failed"
-+  "SSL_CTX_new failed",
-+  "SSL context is not usable without certificate and private key",
-+  "SSL_CTX_set_tmp_dh failed"
- };
- 
- const char*
- sslGetErrString(enum enum_ssl_init_error e)
-@@ -258,10 +289,19 @@
-     DBUG_RETURN(0);
-   }
- 
-   /* DH stuff */
--  dh=get_dh512();
--  SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
-+  dh= get_dh2048();
-+  if (SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh) == 0)
-+  {
-+    *error= SSL_INITERR_DHFAIL;
-+    DBUG_PRINT("error", ("%s", sslGetErrString(*error)));
-+    report_errors();
-+    DH_free(dh);
-+    SSL_CTX_free(ssl_fd->ssl_context);
-+    my_free(ssl_fd);
-+    DBUG_RETURN(0);
-+  }
-   DH_free(dh);
- 
-   DBUG_PRINT("exit", ("OK 1"));
- 
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 996a2122fa2..e5f454c8900 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:27:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2016/09/23 18:40:39 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 5.5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mariadb55-server/PLIST b/databases/mariadb55-server/PLIST
index 714b6d55910..f526b79f65e 100644
--- a/databases/mariadb55-server/PLIST
+++ b/databases/mariadb55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/05/07 12:45:29 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2.10.1 2016/09/23 18:40:39 bsiegert Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -720,7 +720,6 @@ share/mariadb/test/include/query_cache_partitions.inc
 share/mariadb/test/include/query_cache_sql_prepare.inc
 share/mariadb/test/include/read_many_rows.inc
 share/mariadb/test/include/relocate_binlogs.inc
-share/mariadb/test/include/report-features.test
 share/mariadb/test/include/restart_mysqld.inc
 share/mariadb/test/include/restart_slave_sql.inc
 share/mariadb/test/include/rowid_order.inc
@@ -1098,6 +1097,7 @@ share/mariadb/test/r/ctype_binary.result
 share/mariadb/test/r/ctype_collate.result
 share/mariadb/test/r/ctype_cp1250_ch.result
 share/mariadb/test/r/ctype_cp1251.result
+share/mariadb/test/r/ctype_cp850.result
 share/mariadb/test/r/ctype_cp932.result
 share/mariadb/test/r/ctype_cp932_binlog_row.result
 share/mariadb/test/r/ctype_cp932_binlog_stm.result
@@ -1161,6 +1161,7 @@ share/mariadb/test/r/drop.result
 share/mariadb/test/r/drop_bad_db_type.result
 share/mariadb/test/r/drop_debug.result
 share/mariadb/test/r/dyncol.result
+share/mariadb/test/r/empty_server_name-8224.result
 share/mariadb/test/r/empty_table.result
 share/mariadb/test/r/empty_user_table.result
 share/mariadb/test/r/endspace.result
@@ -1325,6 +1326,7 @@ share/mariadb/test/r/innodb_mysql_lock2.result
 share/mariadb/test/r/innodb_mysql_sync.result
 share/mariadb/test/r/innodb_utf8.result
 share/mariadb/test/r/insert.result
+share/mariadb/test/r/insert_innodb.result
 share/mariadb/test/r/insert_notembedded.result
 share/mariadb/test/r/insert_select.result
 share/mariadb/test/r/insert_update.result
@@ -1378,11 +1380,11 @@ share/mariadb/test/r/lowercase0.require
 share/mariadb/test/r/lowercase1.require
 share/mariadb/test/r/lowercase2.require
 share/mariadb/test/r/lowercase_fs_off.result
+share/mariadb/test/r/lowercase_fs_on.result
 share/mariadb/test/r/lowercase_mixed_tmpdir.result
 share/mariadb/test/r/lowercase_mixed_tmpdir_innodb.result
 share/mariadb/test/r/lowercase_table.result
 share/mariadb/test/r/lowercase_table2.result
-share/mariadb/test/r/lowercase_table3.result
 share/mariadb/test/r/lowercase_table4.result
 share/mariadb/test/r/lowercase_table_grant.result
 share/mariadb/test/r/lowercase_table_qcache.result
@@ -1397,7 +1399,6 @@ share/mariadb/test/r/merge.result
 share/mariadb/test/r/merge_debug.result
 share/mariadb/test/r/merge_innodb.result
 share/mariadb/test/r/merge_mmap.result
-share/mariadb/test/r/merge_recover.result
 share/mariadb/test/r/metadata.result
 share/mariadb/test/r/mix2_myisam.result
 share/mariadb/test/r/mix2_myisam_ucs2.result
@@ -1415,10 +1416,12 @@ share/mariadb/test/r/myisam-system.result
 share/mariadb/test/r/myisam.result
 share/mariadb/test/r/myisam_crash_before_flush_keys.result
 share/mariadb/test/r/myisam_debug.result
+share/mariadb/test/r/myisam_enable_keys-10506.result
 share/mariadb/test/r/myisam_icp.result
 share/mariadb/test/r/myisam_icp_notembedded.result
 share/mariadb/test/r/myisam_mrr.result
 share/mariadb/test/r/myisam_optimize.result
+share/mariadb/test/r/myisam_recover.result
 share/mariadb/test/r/myisampack.result
 share/mariadb/test/r/mysql-bug41486.result
 share/mariadb/test/r/mysql-bug45236.result
@@ -1565,6 +1568,7 @@ share/mariadb/test/r/ps_2myisam.result
 share/mariadb/test/r/ps_3innodb.result
 share/mariadb/test/r/ps_4heap.result
 share/mariadb/test/r/ps_5merge.result
+share/mariadb/test/r/ps_change_master.result
 share/mariadb/test/r/ps_ddl.result
 share/mariadb/test/r/ps_ddl1.result
 share/mariadb/test/r/ps_grant.result
@@ -1580,6 +1584,7 @@ share/mariadb/test/r/query_cache_ps_ps_prot.result
 share/mariadb/test/r/query_cache_with_views.result
 share/mariadb/test/r/quick_select_4161.result
 share/mariadb/test/r/range.result
+share/mariadb/test/r/range_innodb.result
 share/mariadb/test/r/range_mrr_icp.result
 share/mariadb/test/r/range_vs_index_merge.result
 share/mariadb/test/r/range_vs_index_merge_innodb,innodb_plugin.rdiff
@@ -1603,6 +1608,7 @@ share/mariadb/test/r/rpl_extraColmaster_innodb.result
 share/mariadb/test/r/rpl_extraColmaster_myisam.result
 share/mariadb/test/r/rpl_mysqldump_slave.result
 share/mariadb/test/r/schema.result
+share/mariadb/test/r/second_frac-9175.result
 share/mariadb/test/r/secure_file_priv_win.result
 share/mariadb/test/r/select.result
 share/mariadb/test/r/select_debug.result
@@ -1612,10 +1618,12 @@ share/mariadb/test/r/select_pkeycache.result
 share/mariadb/test/r/select_safe.result
 share/mariadb/test/r/server_id.require
 share/mariadb/test/r/server_id1.require
+share/mariadb/test/r/set_password_plugin-9835.result
 share/mariadb/test/r/shm.result
 share/mariadb/test/r/show_bad_definer-5553.result
 share/mariadb/test/r/show_check.result
 share/mariadb/test/r/show_profile.result
+share/mariadb/test/r/show_row_order-9226.result
 share/mariadb/test/r/signal.result
 share/mariadb/test/r/signal_code.result
 share/mariadb/test/r/signal_demo1.result
@@ -1635,6 +1643,7 @@ share/mariadb/test/r/sp-destruct.result
 share/mariadb/test/r/sp-dynamic.result
 share/mariadb/test/r/sp-error.result
 share/mariadb/test/r/sp-fib.result
+share/mariadb/test/r/sp-group.result
 share/mariadb/test/r/sp-innodb.result
 share/mariadb/test/r/sp-lock.result
 share/mariadb/test/r/sp-no-code.result
@@ -1654,11 +1663,16 @@ share/mariadb/test/r/sp_trans_log.result
 share/mariadb/test/r/sql_mode.result
 share/mariadb/test/r/ssl-big.result
 share/mariadb/test/r/ssl.result
+share/mariadb/test/r/ssl_7937,nossl.result
+share/mariadb/test/r/ssl_7937.result
 share/mariadb/test/r/ssl_8k_key.result
 share/mariadb/test/r/ssl_and_innodb.result
+share/mariadb/test/r/ssl_ca.result
+share/mariadb/test/r/ssl_cert_verify.result
 share/mariadb/test/r/ssl_cipher.result
 share/mariadb/test/r/ssl_compress.result
 share/mariadb/test/r/ssl_connect.result
+share/mariadb/test/r/ssl_timeout-9836.result
 share/mariadb/test/r/stack-crash.result
 share/mariadb/test/r/status.result
 share/mariadb/test/r/status2.result
@@ -1728,6 +1742,7 @@ share/mariadb/test/r/trigger-trans.result
 share/mariadb/test/r/trigger.result
 share/mariadb/test/r/trigger_notembedded.result
 share/mariadb/test/r/true.require
+share/mariadb/test/r/truncate-stale-6500.result
 share/mariadb/test/r/truncate.result
 share/mariadb/test/r/truncate_coverage.result
 share/mariadb/test/r/type_binary.result
@@ -1754,6 +1769,7 @@ share/mariadb/test/r/type_varchar.result
 share/mariadb/test/r/type_year.result
 share/mariadb/test/r/udf.result
 share/mariadb/test/r/udf_debug_sync.result
+share/mariadb/test/r/udf_notembedded.result
 share/mariadb/test/r/udf_query_cache.result
 share/mariadb/test/r/udf_skip_grants.result
 share/mariadb/test/r/union.result
@@ -1762,6 +1778,7 @@ share/mariadb/test/r/uniques_crash-7912.result
 share/mariadb/test/r/unsafe_binlog_innodb.result
 share/mariadb/test/r/update.result
 share/mariadb/test/r/update_ignore_216.result
+share/mariadb/test/r/update_innodb.result
 share/mariadb/test/r/upgrade.result
 share/mariadb/test/r/user_limits.result
 share/mariadb/test/r/user_var-binlog.result
@@ -1775,6 +1792,7 @@ share/mariadb/test/r/view.result
 share/mariadb/test/r/view_alias.result
 share/mariadb/test/r/view_grant.result
 share/mariadb/test/r/wait_timeout.result
+share/mariadb/test/r/wait_timeout_not_windows.result
 share/mariadb/test/r/warnings.result
 share/mariadb/test/r/warnings_debug.result
 share/mariadb/test/r/warnings_engine_disabled.result
@@ -1795,10 +1813,13 @@ share/mariadb/test/std_data/binlog_savepoint.000001
 share/mariadb/test/std_data/binlog_transaction.000001
 share/mariadb/test/std_data/bug11747416_32228_binlog.000001
 share/mariadb/test/std_data/bug15328.cnf
+share/mariadb/test/std_data/bug16171518_1.dat
+share/mariadb/test/std_data/bug16171518_2.dat
 share/mariadb/test/std_data/bug16266.000001
 share/mariadb/test/std_data/bug19371.MYD
 share/mariadb/test/std_data/bug19371.MYI
 share/mariadb/test/std_data/bug19371.frm
+share/mariadb/test/std_data/bug20683959loaddata.txt
 share/mariadb/test/std_data/bug30435_10k_items.txt
 share/mariadb/test/std_data/bug30435_5k.txt
 share/mariadb/test/std_data/bug33029-slave-relay-bin.000001
@@ -1823,6 +1844,7 @@ share/mariadb/test/std_data/bug49823.CSM
 share/mariadb/test/std_data/bug49823.CSV
 share/mariadb/test/std_data/bug49823.frm
 share/mariadb/test/std_data/bug887051.txt
+share/mariadb/test/std_data/ca-cert-verify.pem
 share/mariadb/test/std_data/cacert.pem
 share/mariadb/test/std_data/charset_utf8.txt
 share/mariadb/test/std_data/checkDBI_DBD-mysql.pl
@@ -1924,6 +1946,9 @@ share/mariadb/test/std_data/ndb_config_config.ini
 share/mariadb/test/std_data/ndb_config_mycnf1.cnf
 share/mariadb/test/std_data/ndb_config_mycnf2.cnf
 share/mariadb/test/std_data/numbers.txt
+share/mariadb/test/std_data/old_decimal/t1dec102.MYD
+share/mariadb/test/std_data/old_decimal/t1dec102.MYI
+share/mariadb/test/std_data/old_decimal/t1dec102.frm
 share/mariadb/test/std_data/old_table-323.frm
 share/mariadb/test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
 share/mariadb/test/std_data/parts/part_supported_sql_funcs_int_date.inc
@@ -1948,7 +1973,11 @@ share/mariadb/test/std_data/rpl_loaddata2.dat
 share/mariadb/test/std_data/rpl_mixed.dat
 share/mariadb/test/std_data/rpl_timezone.dat
 share/mariadb/test/std_data/rpl_timezone2.dat
+share/mariadb/test/std_data/server-cert-verify-fail.pem
+share/mariadb/test/std_data/server-cert-verify-pass.pem
 share/mariadb/test/std_data/server-cert.pem
+share/mariadb/test/std_data/server-key-verify-fail.pem
+share/mariadb/test/std_data/server-key-verify-pass.pem
 share/mariadb/test/std_data/server-key.pem
 share/mariadb/test/std_data/server8k-cert.pem
 share/mariadb/test/std_data/server8k-key.pem
@@ -1989,6 +2018,7 @@ share/mariadb/test/suite/binlog/r/binlog_bug36391.result
 share/mariadb/test/suite/binlog/r/binlog_checksum.result
 share/mariadb/test/suite/binlog/r/binlog_database.result
 share/mariadb/test/suite/binlog/r/binlog_delete_and_flush_index.result
+share/mariadb/test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result
 share/mariadb/test/suite/binlog/r/binlog_drop_if_exists.result
 share/mariadb/test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 share/mariadb/test/suite/binlog/r/binlog_grant.result
@@ -2075,6 +2105,7 @@ share/mariadb/test/suite/binlog/t/binlog_checksum.test
 share/mariadb/test/suite/binlog/t/binlog_database.test
 share/mariadb/test/suite/binlog/t/binlog_delete_and_flush_index-master.opt
 share/mariadb/test/suite/binlog/t/binlog_delete_and_flush_index.test
+share/mariadb/test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test
 share/mariadb/test/suite/binlog/t/binlog_drop_if_exists.test
 share/mariadb/test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 share/mariadb/test/suite/binlog/t/binlog_grant.test
@@ -3091,6 +3122,8 @@ share/mariadb/test/suite/engines/rr_trx/t/rr_u_10-19_nolimit.test
 share/mariadb/test/suite/engines/rr_trx/t/rr_u_4.test
 share/mariadb/test/suite/federated/combinations
 share/mariadb/test/suite/federated/disabled.def
+share/mariadb/test/suite/federated/error_on_close-8313.result
+share/mariadb/test/suite/federated/error_on_close-8313.test
 share/mariadb/test/suite/federated/federated.result
 share/mariadb/test/suite/federated/federated.test
 share/mariadb/test/suite/federated/federated_archive.result
@@ -3495,12 +3528,14 @@ share/mariadb/test/suite/heap/heap_hash.test
 share/mariadb/test/suite/innodb/disabled.def
 share/mariadb/test/suite/innodb/include/innodb_simulate_comp_failures.inc
 share/mariadb/test/suite/innodb/include/restart_and_reinit.inc
+share/mariadb/test/suite/innodb/r/add_constraint.result
 share/mariadb/test/suite/innodb/r/auto_increment_dup.result
 share/mariadb/test/suite/innodb/r/binlog_consistent.result
 share/mariadb/test/suite/innodb/r/blob-update-debug.result
 share/mariadb/test/suite/innodb/r/blob_unique2pk.result
 share/mariadb/test/suite/innodb/r/count_distinct.result
 share/mariadb/test/suite/innodb/r/create-index.result
+share/mariadb/test/suite/innodb/r/dropdb.result
 share/mariadb/test/suite/innodb/r/foreign-keys.result
 share/mariadb/test/suite/innodb/r/group_commit.result
 share/mariadb/test/suite/innodb/r/group_commit_binlog_pos.result
@@ -3519,7 +3554,10 @@ share/mariadb/test/suite/innodb/r/innodb-blob.result
 share/mariadb/test/suite/innodb/r/innodb-change-buffer-recovery.result
 share/mariadb/test/suite/innodb/r/innodb-changed-pages.result
 share/mariadb/test/suite/innodb/r/innodb-consistent.result
+share/mariadb/test/suite/innodb/r/innodb-dict.result
+share/mariadb/test/suite/innodb/r/innodb-fk-warnings.result
 share/mariadb/test/suite/innodb/r/innodb-fk.result
+share/mariadb/test/suite/innodb/r/innodb-fkcheck.result
 share/mariadb/test/suite/innodb/r/innodb-index.result
 share/mariadb/test/suite/innodb/r/innodb-index_ucs2.result
 share/mariadb/test/suite/innodb/r/innodb-lock.result
@@ -3592,11 +3630,13 @@ share/mariadb/test/suite/innodb/r/innodb_bug59733.result
 share/mariadb/test/suite/innodb/r/innodb_bug60049.result
 share/mariadb/test/suite/innodb/r/innodb_bug60196.result
 share/mariadb/test/suite/innodb/r/innodb_bug60229.result
+share/mariadb/test/suite/innodb/r/innodb_bug68148.result
 share/mariadb/test/suite/innodb/r/innodb_corrupt_bit.result
 share/mariadb/test/suite/innodb/r/innodb_file_format.result
 share/mariadb/test/suite/innodb/r/innodb_gis.result
 share/mariadb/test/suite/innodb/r/innodb_information_schema.result
 share/mariadb/test/suite/innodb/r/innodb_information_schema_buffer.result
+share/mariadb/test/suite/innodb/r/innodb_information_schema_tables.result
 share/mariadb/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
 share/mariadb/test/suite/innodb/r/innodb_multi_update.result
 share/mariadb/test/suite/innodb/r/innodb_mysql.result
@@ -3607,18 +3647,22 @@ share/mariadb/test/suite/innodb/r/innodb_simulate_comp_failures.result
 share/mariadb/test/suite/innodb/r/innodb_simulate_comp_failures_small.result
 share/mariadb/test/suite/innodb/r/innodb_timeout_rollback.result
 share/mariadb/test/suite/innodb/r/innodb_trx_weight.result
+share/mariadb/test/suite/innodb/r/innodb_uninstall.result
 share/mariadb/test/suite/innodb/r/insert_debug.result
 share/mariadb/test/suite/innodb/r/mdev-117.result
 share/mariadb/test/suite/innodb/r/multi_repair-7404.result
 share/mariadb/test/suite/innodb/r/row_lock.result
 share/mariadb/test/suite/innodb/r/sp_temp_table.result
 share/mariadb/test/suite/innodb/r/strict_mode.result
+share/mariadb/test/suite/innodb/r/xa_recovery.result
+share/mariadb/test/suite/innodb/t/add_constraint.test
 share/mariadb/test/suite/innodb/t/auto_increment_dup.test
 share/mariadb/test/suite/innodb/t/binlog_consistent.test
 share/mariadb/test/suite/innodb/t/blob-update-debug.test
 share/mariadb/test/suite/innodb/t/blob_unique2pk.test
 share/mariadb/test/suite/innodb/t/count_distinct.test
 share/mariadb/test/suite/innodb/t/create-index.test
+share/mariadb/test/suite/innodb/t/dropdb.test
 share/mariadb/test/suite/innodb/t/foreign-keys.test
 share/mariadb/test/suite/innodb/t/group_commit.test
 share/mariadb/test/suite/innodb/t/group_commit_binlog_pos-master.opt
@@ -3648,7 +3692,10 @@ share/mariadb/test/suite/innodb/t/innodb-changed-pages-master.opt
 share/mariadb/test/suite/innodb/t/innodb-changed-pages.test
 share/mariadb/test/suite/innodb/t/innodb-consistent-master.opt
 share/mariadb/test/suite/innodb/t/innodb-consistent.test
+share/mariadb/test/suite/innodb/t/innodb-dict.test
+share/mariadb/test/suite/innodb/t/innodb-fk-warnings.test
 share/mariadb/test/suite/innodb/t/innodb-fk.test
+share/mariadb/test/suite/innodb/t/innodb-fkcheck.test
 share/mariadb/test/suite/innodb/t/innodb-index.test
 share/mariadb/test/suite/innodb/t/innodb-index_ucs2.test
 share/mariadb/test/suite/innodb/t/innodb-lock.test
@@ -3733,13 +3780,15 @@ share/mariadb/test/suite/innodb/t/innodb_bug60049-master.opt
 share/mariadb/test/suite/innodb/t/innodb_bug60049.test
 share/mariadb/test/suite/innodb/t/innodb_bug60196-master.opt
 share/mariadb/test/suite/innodb/t/innodb_bug60196.test
-share/mariadb/test/suite/innodb/t/innodb_bug60229-master.opt
 share/mariadb/test/suite/innodb/t/innodb_bug60229.test
+share/mariadb/test/suite/innodb/t/innodb_bug68148.test
 share/mariadb/test/suite/innodb/t/innodb_corrupt_bit.test
 share/mariadb/test/suite/innodb/t/innodb_file_format.test
 share/mariadb/test/suite/innodb/t/innodb_gis.test
 share/mariadb/test/suite/innodb/t/innodb_information_schema.test
 share/mariadb/test/suite/innodb/t/innodb_information_schema_buffer.test
+share/mariadb/test/suite/innodb/t/innodb_information_schema_tables.opt
+share/mariadb/test/suite/innodb/t/innodb_information_schema_tables.test
 share/mariadb/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 share/mariadb/test/suite/innodb/t/innodb_lock_wait_timeout_1.test
 share/mariadb/test/suite/innodb/t/innodb_multi_update.test
@@ -3756,12 +3805,15 @@ share/mariadb/test/suite/innodb/t/innodb_simulate_comp_failures_small.test
 share/mariadb/test/suite/innodb/t/innodb_timeout_rollback-master.opt
 share/mariadb/test/suite/innodb/t/innodb_timeout_rollback.test
 share/mariadb/test/suite/innodb/t/innodb_trx_weight.test
+share/mariadb/test/suite/innodb/t/innodb_uninstall.opt
+share/mariadb/test/suite/innodb/t/innodb_uninstall.test
 share/mariadb/test/suite/innodb/t/insert_debug.test
 share/mariadb/test/suite/innodb/t/mdev-117.test
 share/mariadb/test/suite/innodb/t/multi_repair-7404.test
 share/mariadb/test/suite/innodb/t/row_lock.test
 share/mariadb/test/suite/innodb/t/sp_temp_table.test
 share/mariadb/test/suite/innodb/t/strict_mode.test
+share/mariadb/test/suite/innodb/t/xa_recovery.test
 share/mariadb/test/suite/innodb_zip/r/innodb-create-options.result
 share/mariadb/test/suite/innodb_zip/r/innodb-zip.result
 share/mariadb/test/suite/innodb_zip/r/innodb_bug36169.result
@@ -3933,13 +3985,9 @@ share/mariadb/test/suite/jp/t/jp_create_tbl_sjis.test
 share/mariadb/test/suite/jp/t/jp_create_tbl_ucs2.test
 share/mariadb/test/suite/jp/t/jp_create_tbl_ujis.test
 share/mariadb/test/suite/jp/t/jp_create_tbl_utf8.test
-share/mariadb/test/suite/jp/t/jp_enum_sjis-master.opt
 share/mariadb/test/suite/jp/t/jp_enum_sjis.test
-share/mariadb/test/suite/jp/t/jp_enum_ucs2-master.opt
 share/mariadb/test/suite/jp/t/jp_enum_ucs2.test
-share/mariadb/test/suite/jp/t/jp_enum_ujis-master.opt
 share/mariadb/test/suite/jp/t/jp_enum_ujis.test
-share/mariadb/test/suite/jp/t/jp_enum_utf8-master.opt
 share/mariadb/test/suite/jp/t/jp_enum_utf8.test
 share/mariadb/test/suite/jp/t/jp_insert_sjis.test
 share/mariadb/test/suite/jp/t/jp_insert_ucs2.test
@@ -4154,6 +4202,8 @@ share/mariadb/test/suite/mtr2/combinations
 share/mariadb/test/suite/mtr2/overlay.inc
 share/mariadb/test/suite/mtr2/single.result
 share/mariadb/test/suite/mtr2/single.test
+share/mariadb/test/suite/ndb/r/ndb_restore_discover.result
+share/mariadb/test/suite/ndb/t/ndb_restore_discover.test
 share/mariadb/test/suite/optimizer_unfixed_bugs/README.txt
 share/mariadb/test/suite/optimizer_unfixed_bugs/disabled.def
 share/mariadb/test/suite/optimizer_unfixed_bugs/r/bug36981.result
@@ -4627,7 +4677,6 @@ share/mariadb/test/suite/perfschema/include/privilege.inc
 share/mariadb/test/suite/perfschema/include/setup_helper.inc
 share/mariadb/test/suite/perfschema/include/start_server_common.inc
 share/mariadb/test/suite/perfschema/include/upgrade_check.inc
-share/mariadb/test/suite/perfschema/r/aggregate.result
 share/mariadb/test/suite/perfschema/r/all_instances.result
 share/mariadb/test/suite/perfschema/r/bad_option_1.result
 share/mariadb/test/suite/perfschema/r/bad_option_2.result
@@ -4709,7 +4758,6 @@ share/mariadb/test/suite/perfschema/r/start_server_off.result
 share/mariadb/test/suite/perfschema/r/start_server_on.result
 share/mariadb/test/suite/perfschema/r/tampered_perfschema_table1.result
 share/mariadb/test/suite/perfschema/r/thread_cache.result
-share/mariadb/test/suite/perfschema/t/aggregate.test
 share/mariadb/test/suite/perfschema/t/all_instances.test
 share/mariadb/test/suite/perfschema/t/bad_option_1.test
 share/mariadb/test/suite/perfschema/t/bad_option_2.test
@@ -4840,6 +4888,7 @@ share/mariadb/test/suite/plugins/r/qc_info.result
 share/mariadb/test/suite/plugins/r/qc_info_priv.result
 share/mariadb/test/suite/plugins/r/server_audit.result
 share/mariadb/test/suite/plugins/r/sql_error_log.result
+share/mariadb/test/suite/plugins/r/thread_pool_server_audit.result
 share/mariadb/test/suite/plugins/r/unix_socket.result
 share/mariadb/test/suite/plugins/suite.pm
 share/mariadb/test/suite/plugins/t/audit_null.test
@@ -4863,6 +4912,8 @@ share/mariadb/test/suite/plugins/t/qc_info_priv.test
 share/mariadb/test/suite/plugins/t/server_audit.opt
 share/mariadb/test/suite/plugins/t/server_audit.test
 share/mariadb/test/suite/plugins/t/sql_error_log.test
+share/mariadb/test/suite/plugins/t/thread_pool_server_audit.opt
+share/mariadb/test/suite/plugins/t/thread_pool_server_audit.test
 share/mariadb/test/suite/plugins/t/unix_socket.test
 share/mariadb/test/suite/rpl/README
 share/mariadb/test/suite/rpl/disabled.def
@@ -4900,6 +4951,7 @@ share/mariadb/test/suite/rpl/r/rpl_auto_increment_11932.result
 share/mariadb/test/suite/rpl/r/rpl_auto_increment_bug33029.result
 share/mariadb/test/suite/rpl/r/rpl_auto_increment_bug45679.result
 share/mariadb/test/suite/rpl/r/rpl_auto_increment_update_failure.result
+share/mariadb/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
 share/mariadb/test/suite/rpl/r/rpl_begin_commit_rollback.result
 share/mariadb/test/suite/rpl/r/rpl_binlog_corruption.result
 share/mariadb/test/suite/rpl/r/rpl_binlog_errors.result
@@ -5038,6 +5090,7 @@ share/mariadb/test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
 share/mariadb/test/suite/rpl/r/rpl_nondeterministic_functions.result
 share/mariadb/test/suite/rpl/r/rpl_not_null_innodb.result
 share/mariadb/test/suite/rpl/r/rpl_not_null_myisam.result
+share/mariadb/test/suite/rpl/r/rpl_old_decimal.result
 share/mariadb/test/suite/rpl/r/rpl_optimize.result
 share/mariadb/test/suite/rpl/r/rpl_packet.result
 share/mariadb/test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result
@@ -5198,6 +5251,7 @@ share/mariadb/test/suite/rpl/r/rpl_temporary_errors.result
 share/mariadb/test/suite/rpl/r/rpl_test_framework.result
 share/mariadb/test/suite/rpl/r/rpl_timezone.result
 share/mariadb/test/suite/rpl/r/rpl_tmp_table_and_DDL.result
+share/mariadb/test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result
 share/mariadb/test/suite/rpl/r/rpl_trigger.result
 share/mariadb/test/suite/rpl/r/rpl_trunc_temp.result
 share/mariadb/test/suite/rpl/r/rpl_truncate_2myisam.result
@@ -5205,6 +5259,7 @@ share/mariadb/test/suite/rpl/r/rpl_truncate_3innodb.result
 share/mariadb/test/suite/rpl/r/rpl_typeconv.result
 share/mariadb/test/suite/rpl/r/rpl_typeconv_innodb.result
 share/mariadb/test/suite/rpl/r/rpl_udf.result
+share/mariadb/test/suite/rpl/r/rpl_unsafe_statements.result
 share/mariadb/test/suite/rpl/r/rpl_user.result
 share/mariadb/test/suite/rpl/r/rpl_user_variables.result
 share/mariadb/test/suite/rpl/r/rpl_variables.result
@@ -5238,6 +5293,7 @@ share/mariadb/test/suite/rpl/t/rpl_auto_increment_11932.test
 share/mariadb/test/suite/rpl/t/rpl_auto_increment_bug33029.test
 share/mariadb/test/suite/rpl/t/rpl_auto_increment_bug45679.test
 share/mariadb/test/suite/rpl/t/rpl_auto_increment_update_failure.test
+share/mariadb/test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
 share/mariadb/test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 share/mariadb/test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 share/mariadb/test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -5352,6 +5408,7 @@ share/mariadb/test/suite/rpl/t/rpl_innodb-master.opt
 share/mariadb/test/suite/rpl/t/rpl_innodb_bug28430-master.opt
 share/mariadb/test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
 share/mariadb/test/suite/rpl/t/rpl_innodb_bug28430.test
+share/mariadb/test/suite/rpl/t/rpl_innodb_bug30888.opt
 share/mariadb/test/suite/rpl/t/rpl_innodb_bug30888.test
 share/mariadb/test/suite/rpl/t/rpl_innodb_mixed_ddl.test
 share/mariadb/test/suite/rpl/t/rpl_innodb_mixed_dml.test
@@ -5430,6 +5487,7 @@ share/mariadb/test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
 share/mariadb/test/suite/rpl/t/rpl_nondeterministic_functions.test
 share/mariadb/test/suite/rpl/t/rpl_not_null_innodb.test
 share/mariadb/test/suite/rpl/t/rpl_not_null_myisam.test
+share/mariadb/test/suite/rpl/t/rpl_old_decimal.test
 share/mariadb/test/suite/rpl/t/rpl_optimize.test
 share/mariadb/test/suite/rpl/t/rpl_packet-master.opt
 share/mariadb/test/suite/rpl/t/rpl_packet-slave.opt
@@ -5632,6 +5690,7 @@ share/mariadb/test/suite/rpl/t/rpl_timezone-master.opt
 share/mariadb/test/suite/rpl/t/rpl_timezone-slave.opt
 share/mariadb/test/suite/rpl/t/rpl_timezone.test
 share/mariadb/test/suite/rpl/t/rpl_tmp_table_and_DDL.test
+share/mariadb/test/suite/rpl/t/rpl_tmp_table_and_DDL_innodb.test
 share/mariadb/test/suite/rpl/t/rpl_trigger.test
 share/mariadb/test/suite/rpl/t/rpl_trunc_temp.test
 share/mariadb/test/suite/rpl/t/rpl_truncate_2myisam.test
@@ -5640,6 +5699,7 @@ share/mariadb/test/suite/rpl/t/rpl_typeconv-slave.opt
 share/mariadb/test/suite/rpl/t/rpl_typeconv.test
 share/mariadb/test/suite/rpl/t/rpl_typeconv_innodb.test
 share/mariadb/test/suite/rpl/t/rpl_udf.test
+share/mariadb/test/suite/rpl/t/rpl_unsafe_statements.test
 share/mariadb/test/suite/rpl/t/rpl_user.test
 share/mariadb/test/suite/rpl/t/rpl_user_variables.test
 share/mariadb/test/suite/rpl/t/rpl_variables.test
@@ -7294,6 +7354,7 @@ share/mariadb/test/t/ctype_binary.test
 share/mariadb/test/t/ctype_collate.test
 share/mariadb/test/t/ctype_cp1250_ch.test
 share/mariadb/test/t/ctype_cp1251.test
+share/mariadb/test/t/ctype_cp850.test
 share/mariadb/test/t/ctype_cp932.test
 share/mariadb/test/t/ctype_cp932_binlog_row.test
 share/mariadb/test/t/ctype_cp932_binlog_stm.test
@@ -7366,6 +7427,7 @@ share/mariadb/test/t/drop.test
 share/mariadb/test/t/drop_bad_db_type.test
 share/mariadb/test/t/drop_debug.test
 share/mariadb/test/t/dyncol.test
+share/mariadb/test/t/empty_server_name-8224.test
 share/mariadb/test/t/empty_table.test
 share/mariadb/test/t/empty_user_table.test
 share/mariadb/test/t/endspace.test
@@ -7519,6 +7581,7 @@ share/mariadb/test/t/innodb_mysql_lock2.test
 share/mariadb/test/t/innodb_mysql_sync.test
 share/mariadb/test/t/innodb_utf8.test
 share/mariadb/test/t/insert.test
+share/mariadb/test/t/insert_innodb.test
 share/mariadb/test/t/insert_notembedded.test
 share/mariadb/test/t/insert_select.test
 share/mariadb/test/t/insert_update.test
@@ -7578,6 +7641,7 @@ share/mariadb/test/t/long_tmpdir-master.opt
 share/mariadb/test/t/long_tmpdir-master.sh
 share/mariadb/test/t/long_tmpdir.test
 share/mariadb/test/t/lowercase_fs_off.test
+share/mariadb/test/t/lowercase_fs_on.test
 share/mariadb/test/t/lowercase_mixed_tmpdir-master.opt
 share/mariadb/test/t/lowercase_mixed_tmpdir-master.sh
 share/mariadb/test/t/lowercase_mixed_tmpdir.test
@@ -7587,8 +7651,6 @@ share/mariadb/test/t/lowercase_mixed_tmpdir_innodb.test
 share/mariadb/test/t/lowercase_table-master.opt
 share/mariadb/test/t/lowercase_table.test
 share/mariadb/test/t/lowercase_table2.test
-share/mariadb/test/t/lowercase_table3-master.opt
-share/mariadb/test/t/lowercase_table3.test
 share/mariadb/test/t/lowercase_table4-master.opt
 share/mariadb/test/t/lowercase_table4.test
 share/mariadb/test/t/lowercase_table_grant-master.opt
@@ -7601,7 +7663,6 @@ share/mariadb/test/t/lowercase_view-master.opt
 share/mariadb/test/t/lowercase_view.test
 share/mariadb/test/t/mdev316.test
 share/mariadb/test/t/mdev375.test
-share/mariadb/test/t/mdev6830-master.opt
 share/mariadb/test/t/mdev6830.test
 share/mariadb/test/t/mdl_sync-master.opt
 share/mariadb/test/t/mdl_sync.test
@@ -7611,8 +7672,6 @@ share/mariadb/test/t/merge_debug.test
 share/mariadb/test/t/merge_innodb.test
 share/mariadb/test/t/merge_mmap-master.opt
 share/mariadb/test/t/merge_mmap.test
-share/mariadb/test/t/merge_recover-master.opt
-share/mariadb/test/t/merge_recover.test
 share/mariadb/test/t/metadata.test
 share/mariadb/test/t/mix2_myisam.test
 share/mariadb/test/t/mix2_myisam_ucs2.test
@@ -7637,10 +7696,13 @@ share/mariadb/test/t/myisam.test
 share/mariadb/test/t/myisam_crash_before_flush_keys-master.opt
 share/mariadb/test/t/myisam_crash_before_flush_keys.test
 share/mariadb/test/t/myisam_debug.test
+share/mariadb/test/t/myisam_enable_keys-10506.test
 share/mariadb/test/t/myisam_icp.test
 share/mariadb/test/t/myisam_icp_notembedded.test
 share/mariadb/test/t/myisam_mrr.test
 share/mariadb/test/t/myisam_optimize.test
+share/mariadb/test/t/myisam_recover-master.opt
+share/mariadb/test/t/myisam_recover.test
 share/mariadb/test/t/myisampack.test
 share/mariadb/test/t/mysql-bug41486.test
 share/mariadb/test/t/mysql-bug45236.test
@@ -7804,6 +7866,7 @@ share/mariadb/test/t/ps_3innodb-master.opt
 share/mariadb/test/t/ps_3innodb.test
 share/mariadb/test/t/ps_4heap.test
 share/mariadb/test/t/ps_5merge.test
+share/mariadb/test/t/ps_change_master.test
 share/mariadb/test/t/ps_ddl.test
 share/mariadb/test/t/ps_ddl1.test
 share/mariadb/test/t/ps_grant.test
@@ -7819,6 +7882,7 @@ share/mariadb/test/t/query_cache_ps_ps_prot.test
 share/mariadb/test/t/query_cache_with_views.test
 share/mariadb/test/t/quick_select_4161.test
 share/mariadb/test/t/range.test
+share/mariadb/test/t/range_innodb.test
 share/mariadb/test/t/range_mrr_icp.test
 share/mariadb/test/t/range_vs_index_merge.test
 share/mariadb/test/t/range_vs_index_merge_innodb.test
@@ -7839,6 +7903,7 @@ share/mariadb/test/t/row.test
 share/mariadb/test/t/rowid_order_innodb.test
 share/mariadb/test/t/rpl_mysqldump_slave.test
 share/mariadb/test/t/schema.test
+share/mariadb/test/t/second_frac-9175.test
 share/mariadb/test/t/secure_file_priv_win-master.opt
 share/mariadb/test/t/secure_file_priv_win.test
 share/mariadb/test/t/select.test
@@ -7848,12 +7913,14 @@ share/mariadb/test/t/select_jcl6.test
 share/mariadb/test/t/select_pkeycache-master.opt
 share/mariadb/test/t/select_pkeycache.test
 share/mariadb/test/t/select_safe.test
+share/mariadb/test/t/set_password_plugin-9835.test
 share/mariadb/test/t/shm-master.opt
 share/mariadb/test/t/shm.test
 share/mariadb/test/t/show_bad_definer-5553.test
 share/mariadb/test/t/show_check-master.opt
 share/mariadb/test/t/show_check.test
 share/mariadb/test/t/show_profile.test
+share/mariadb/test/t/show_row_order-9226.test
 share/mariadb/test/t/signal.test
 share/mariadb/test/t/signal_code.test
 share/mariadb/test/t/signal_demo1.test
@@ -7874,6 +7941,7 @@ share/mariadb/test/t/sp-destruct.test
 share/mariadb/test/t/sp-dynamic.test
 share/mariadb/test/t/sp-error.test
 share/mariadb/test/t/sp-fib.test
+share/mariadb/test/t/sp-group.test
 share/mariadb/test/t/sp-innodb.test
 share/mariadb/test/t/sp-lock.test
 share/mariadb/test/t/sp-no-code.test
@@ -7893,13 +7961,19 @@ share/mariadb/test/t/sp_trans_log.test
 share/mariadb/test/t/sql_mode.test
 share/mariadb/test/t/ssl-big.test
 share/mariadb/test/t/ssl.test
+share/mariadb/test/t/ssl_7937.combinations
+share/mariadb/test/t/ssl_7937.test
 share/mariadb/test/t/ssl_8k_key-master.opt
 share/mariadb/test/t/ssl_8k_key.test
 share/mariadb/test/t/ssl_and_innodb.test
+share/mariadb/test/t/ssl_ca.test
+share/mariadb/test/t/ssl_cert_verify.test
 share/mariadb/test/t/ssl_cipher-master.opt
 share/mariadb/test/t/ssl_cipher.test
 share/mariadb/test/t/ssl_compress.test
 share/mariadb/test/t/ssl_connect.test
+share/mariadb/test/t/ssl_timeout-9836.opt
+share/mariadb/test/t/ssl_timeout-9836.test
 share/mariadb/test/t/stack-crash.test
 share/mariadb/test/t/status-master.opt
 share/mariadb/test/t/status.test
@@ -7973,6 +8047,7 @@ share/mariadb/test/t/trigger-compat.test
 share/mariadb/test/t/trigger-trans.test
 share/mariadb/test/t/trigger.test
 share/mariadb/test/t/trigger_notembedded.test
+share/mariadb/test/t/truncate-stale-6500.test
 share/mariadb/test/t/truncate.test
 share/mariadb/test/t/truncate_coverage.test
 share/mariadb/test/t/type_binary.test
@@ -7999,6 +8074,7 @@ share/mariadb/test/t/type_varchar.test
 share/mariadb/test/t/type_year.test
 share/mariadb/test/t/udf.test
 share/mariadb/test/t/udf_debug_sync.test
+share/mariadb/test/t/udf_notembedded.test
 share/mariadb/test/t/udf_query_cache.test
 share/mariadb/test/t/udf_skip_grants-master.opt
 share/mariadb/test/t/udf_skip_grants.test
@@ -8010,6 +8086,7 @@ share/mariadb/test/t/unsafe_binlog_innodb-master.opt
 share/mariadb/test/t/unsafe_binlog_innodb.test
 share/mariadb/test/t/update.test
 share/mariadb/test/t/update_ignore_216.test
+share/mariadb/test/t/update_innodb.test
 share/mariadb/test/t/upgrade.test
 share/mariadb/test/t/user_limits-master.opt
 share/mariadb/test/t/user_limits.test
@@ -8026,6 +8103,7 @@ share/mariadb/test/t/view.test
 share/mariadb/test/t/view_alias.test
 share/mariadb/test/t/view_grant.test
 share/mariadb/test/t/wait_timeout.test
+share/mariadb/test/t/wait_timeout_not_windows.test
 share/mariadb/test/t/warnings-master.opt
 share/mariadb/test/t/warnings.test
 share/mariadb/test/t/warnings_debug.test
author	bsiegert <bsiegert>	2016-09-23 18:40:39 +0000
committer	bsiegert <bsiegert>	2016-09-23 18:40:39 +0000
commit	53e4e4d634ab0374483390b8b686f2ac09c11cf5 (patch)
tree	9a6c03d3885f58936cd4b59141e610a5381cc25d
parent	08cc721104f4f58b6a01db9010861412ec5f96f1 (diff)
download	pkgsrc-53e4e4d634ab0374483390b8b686f2ac09c11cf5.tar.gz