[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.53' into ubuntu-14.04

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

otto pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.

commit 97817fb5d3d40280a41fe971f30f032bb1098923
Merge: fa322ef ad9e667
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Mon Oct 31 23:47:04 2016 +0200

    Merge tag 'upstream/5.5.53' into ubuntu-14.04
    
    Upstream version 5.5.53

 Docs/INFO_SRC                                      |  10 +-
 VERSION                                            |   2 +-
 client/mysql.cc                                    |  56 +++----
 client/mysqldump.c                                 |  60 +++++--
 client/mysqltest.cc                                |   4 -
 extra/yassl/README                                 |  18 +++
 extra/yassl/certs/dsa-cert.pem                     |  38 ++---
 extra/yassl/include/openssl/ssl.h                  |   2 +-
 extra/yassl/src/ssl.cpp                            |  60 +++++--
 extra/yassl/taocrypt/include/aes.hpp               |  58 +++++++
 extra/yassl/taocrypt/include/integer.hpp           |   3 +
 extra/yassl/taocrypt/src/aes.cpp                   | 172 +++++++++++++--------
 extra/yassl/taocrypt/src/asn.cpp                   |  24 +--
 extra/yassl/taocrypt/src/dsa.cpp                   |  16 +-
 extra/yassl/taocrypt/test/test.cpp                 |   3 +
 extra/yassl/testsuite/test.hpp                     |   2 +-
 include/my_global.h                                |   3 +-
 mysql-test/lib/My/CoreDump.pm                      |   6 +-
 mysql-test/lib/My/Platform.pm                      |  49 +++++-
 mysql-test/lib/mtr_io.pl                           |   9 +-
 mysql-test/r/mysql.result                          |   8 +
 mysql-test/r/mysql_not_windows.result              |   6 +
 mysql-test/r/mysqldump-nl.result                   | 126 +++++++++++++++
 mysql-test/r/mysqltest.result                      |   6 -
 mysql-test/suite/plugins/r/server_audit.result     |   3 -
 .../plugins/r/thread_pool_server_audit.result      |   3 -
 mysql-test/t/mysql.test                            |   8 +
 mysql-test/t/mysql_not_windows.test                |   9 ++
 mysql-test/t/mysqldump-nl.test                     |  38 +++++
 mysql-test/t/mysqltest.test                        |   9 --
 mysys/my_fopen.c                                   |   6 +-
 plugin/feedback/utils.cc                           |  13 +-
 plugin/server_audit/server_audit.c                 |   5 +-
 scripts/mysqld_safe.sh                             |   6 +-
 sql/log.cc                                         |   2 +-
 sql/parse_file.h                                   |   6 +-
 sql/sql_plugin.cc                                  | 151 ++++++++----------
 storage/xtradb/btr/btr0btr.c                       |   4 +-
 storage/xtradb/handler/ha_innodb.cc                | 107 +++++++++++--
 storage/xtradb/include/buf0buf.h                   |  14 +-
 storage/xtradb/include/buf0buf.ic                  |  14 ++
 storage/xtradb/include/srv0srv.h                   |   8 +
 storage/xtradb/include/univ.i                      |   4 +-
 storage/xtradb/log/log0log.c                       |   9 +-
 storage/xtradb/log/log0online.c                    |  12 +-
 storage/xtradb/log/log0recv.c                      |   2 +-
 storage/xtradb/mach/mach0data.c                    |  13 +-
 storage/xtradb/srv/srv0srv.c                       |  42 +++--
 support-files/mysql.server.sh                      |   2 +-
 tests/async_queries.c                              |   2 +-
 50 files changed, 876 insertions(+), 357 deletions(-)

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git