pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2016Q2]: pkgsrc/databases Pullup ticket #5103 - requested by maya



details:   https://anonhg.NetBSD.org/pkgsrc/rev/72516bfdd280
branches:  pkgsrc-2016Q2
changeset: 408894:72516bfdd280
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Fri Sep 23 18:40:39 2016 +0000

description:
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

diffstat:

 databases/mariadb55-client/Makefile                            |    3 +-
 databases/mariadb55-client/Makefile.common                     |    4 +-
 databases/mariadb55-client/distinfo                            |   14 +-
 databases/mariadb55-client/patches/patch-include_my__context.h |    6 +-
 databases/mariadb55-client/patches/patch-vio_viosslfactories.c |  123 ----------
 databases/mariadb55-server/Makefile                            |    3 +-
 databases/mariadb55-server/PLIST                               |  110 +++++++-
 7 files changed, 108 insertions(+), 155 deletions(-)

diffs (truncated from 864 to 300 lines):

diff -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-client/Makefile
--- a/databases/mariadb55-client/Makefile       Sun Sep 18 16:19:05 2016 +0000
+++ b/databases/mariadb55-client/Makefile       Fri Sep 23 18:40:39 2016 +0000
@@ -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 -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-client/Makefile.common
--- a/databases/mariadb55-client/Makefile.common        Sun Sep 18 16:19:05 2016 +0000
+++ b/databases/mariadb55-client/Makefile.common        Fri Sep 23 18:40:39 2016 +0000
@@ -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 -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-client/distinfo
--- a/databases/mariadb55-client/distinfo       Sun Sep 18 16:19:05 2016 +0000
+++ b/databases/mariadb55-client/distinfo       Fri Sep 23 18:40:39 2016 +0000
@@ -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_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-strtoll.c) = 53a3c0172487ee68f621328b16aa1742af4ae737
 SHA1 (patch-strtoull.c) = 7126be697036a588d29e21a6e1a472863d285f4a
 SHA1 (patch-vio_viosocket.c) = bf6d57ee04db57b7ac508b18653b0955ef8a6a2b
-SHA1 (patch-vio_viosslfactories.c) = a2e38d211d6dfdbf83d729f195bf81b8c7620103
diff -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-client/patches/patch-include_my__context.h
--- a/databases/mariadb55-client/patches/patch-include_my__context.h    Sun Sep 18 16:19:05 2016 +0000
+++ b/databases/mariadb55-client/patches/patch-include_my__context.h    Fri Sep 23 18:40:39 2016 +0000
@@ -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 @@
 -#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 -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-client/patches/patch-vio_viosslfactories.c
--- a/databases/mariadb55-client/patches/patch-vio_viosslfactories.c    Sun Sep 18 16:19:05 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost>
-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 -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-server/Makefile
--- a/databases/mariadb55-server/Makefile       Sun Sep 18 16:19:05 2016 +0000
+++ b/databases/mariadb55-server/Makefile       Fri Sep 23 18:40:39 2016 +0000
@@ -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 -r 7193ba76b276 -r 72516bfdd280 databases/mariadb55-server/PLIST
--- a/databases/mariadb55-server/PLIST  Sun Sep 18 16:19:05 2016 +0000
+++ b/databases/mariadb55-server/PLIST  Fri Sep 23 18:40:39 2016 +0000
@@ -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_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_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_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_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/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_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.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_3innodb.result
 share/mariadb/test/r/ps_4heap.result
 share/mariadb/test/r/ps_5merge.result
+share/mariadb/test/r/ps_change_master.result



Home | Main Index | Thread Index | Old Index