[Pkg-mysql-commits] [mariadb-5.5] branch upstream updated (a295acf -> d97fe3f)
Otto Kekäläinen
otto at moszumanska.debian.org
Fri Apr 22 19:20:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
otto pushed a change to branch upstream
in repository mariadb-5.5.
from a295acf Imported Upstream version 5.5.47
new d97fe3f Imported Upstream version 5.5.49
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 3 +
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/client_priv.h | 1 +
client/mysql.cc | 34 +-
client/mysql_upgrade.c | 20 +-
client/mysqladmin.cc | 2 +-
client/mysqlcheck.c | 3 +-
client/mysqldump.c | 2 +-
client/mysqlimport.c | 2 +-
client/mysqlshow.c | 2 +-
client/mysqlslap.c | 2 +-
client/mysqltest.cc | 4 +-
cmake/dtrace.cmake | 3 +
cmake/libutils.cmake | 5 +
cmake/os/Windows.cmake | 11 +-
cmake/os/WindowsCache.cmake | 4 -
cmake/ssl.cmake | 5 +
config.h.cmake | 10 +-
configure.cmake | 31 +-
debian/mariadb-test-5.5.dirs | 2 -
extra/yassl/README | 17 +
extra/yassl/include/crypto_wrapper.hpp | 1 +
extra/yassl/include/openssl/ssl.h | 2 +-
extra/yassl/include/yassl_int.hpp | 8 +-
extra/yassl/src/cert_wrapper.cpp | 9 +-
extra/yassl/src/crypto_wrapper.cpp | 11 +-
extra/yassl/src/ssl.cpp | 14 +-
extra/yassl/src/yassl_imp.cpp | 15 +-
extra/yassl/src/yassl_int.cpp | 46 +-
extra/yassl/taocrypt/include/asn.hpp | 8 +
extra/yassl/taocrypt/src/asn.cpp | 12 +-
extra/yassl/testsuite/test.hpp | 22 +-
include/my_context.h | 2 +-
include/my_global.h | 16 +-
include/my_pthread.h | 2 +
...mysql_nodtrace.h => probes_mysql_nodtrace.h.in} | 0
include/violite.h | 4 +
include/welcome_copyright_notice.h | 6 +-
libmysql/CMakeLists.txt | 46 +-
libmysql/errmsg.c | 2 +-
libmysql/libmysql_versions.ld.in | 16 +-
mysql-test/include/ctype_numconv.inc | 6 +
mysql-test/lib/My/SafeProcess/safe_process_win.cc | 10 +-
mysql-test/r/cache_temporal_4265.result | 13 +
mysql-test/r/case.result | 13 +
mysql-test/r/create.result | 16 +
mysql-test/r/ctype_binary.result | 9 +
mysql-test/r/ctype_cp1251.result | 9 +
mysql-test/r/ctype_cp850.result | 14 +
mysql-test/r/ctype_latin1.result | 9 +
mysql-test/r/ctype_ucs.result | 9 +
mysql-test/r/ctype_utf8.result | 32 +-
mysql-test/r/ctype_utf8mb4.result | 18 +-
mysql-test/r/ctype_utf8mb4_heap.result | 2 +-
mysql-test/r/ctype_utf8mb4_innodb.result | 2 +-
mysql-test/r/ctype_utf8mb4_myisam.result | 2 +-
mysql-test/r/derived.result | 344 ++++++++
mysql-test/r/events_2.result | 4 +-
mysql-test/r/func_math.result | 9 +-
mysql-test/r/func_str.result | 6 +-
mysql-test/r/func_time.result | 35 +
mysql-test/r/insert_innodb.result | 30 +
mysql-test/r/kill_processlist-6619.result | 4 -
mysql-test/r/locale.result | 11 +
mysql-test/r/mdev6830.result | 3 +-
mysql-test/r/merge_innodb.result | 33 +
mysql-test/r/myisam-blob.result | 4 +-
mysql-test/r/mysql_upgrade.result | 2 +-
mysql-test/r/mysql_upgrade_view.result | 15 +
mysql-test/r/mysqld--help.result | 2 +-
mysql-test/r/second_frac-9175.result | 13 +
mysql-test/r/select_debug.result | 2 +-
mysql-test/r/set_password_plugin-9835.result | 158 ++++
mysql-test/r/sp.result | 18 +-
mysql-test/r/ssl_cert_verify.result | 5 +
mysql-test/r/ssl_timeout-9836.result | 7 +
mysql-test/r/subselect.result | 13 +
mysql-test/r/subselect_extra_no_semijoin.result | 8 +-
mysql-test/r/subselect_no_mat.result | 13 +
mysql-test/r/subselect_no_opts.result | 13 +
mysql-test/r/subselect_no_scache.result | 13 +
mysql-test/r/subselect_no_semijoin.result | 13 +
mysql-test/r/subselect_sj.result | 65 ++
mysql-test/r/subselect_sj_jcl6.result | 65 ++
mysql-test/r/type_blob.result | 33 +
mysql-test/r/type_date.result | 35 +
mysql-test/r/type_timestamp.result | 9 +
mysql-test/r/view.result | 20 +-
mysql-test/std_data/ca-cert-verify.pem | 20 +
mysql-test/std_data/server-cert-verify-fail.pem | 19 +
mysql-test/std_data/server-cert-verify-pass.pem | 19 +
mysql-test/std_data/server-key-verify-fail.pem | 27 +
mysql-test/std_data/server-key-verify-pass.pem | 27 +
mysql-test/suite.pm | 2 +-
mysql-test/suite/binlog/r/binlog_row_binlog.result | 2 +-
mysql-test/suite/innodb/r/innodb-dict.result | 40 +
mysql-test/suite/innodb/t/innodb-dict.test | 31 +
.../suite/plugins/r/feedback_plugin_install.result | 1 +
.../suite/plugins/r/feedback_plugin_load.result | 1 +
.../suite/plugins/r/feedback_plugin_send.result | 1 +
mysql-test/suite/plugins/r/server_audit.result | 9 +-
.../plugins/r/thread_pool_server_audit.result | 9 +-
.../rpl/r/rpl_autogen_query_multi_byte_char.result | 29 +
mysql-test/suite/rpl/r/rpl_killed_ddl.result | 10 +
mysql-test/suite/rpl/r/rpl_row_merge_engine.result | 5 +-
.../rpl/r/rpl_tmp_table_and_DDL_innodb.result | 13 +
.../suite/rpl/r/rpl_unsafe_statements.result | 53 ++
.../rpl/t/rpl_autogen_query_multi_byte_char.test | 87 ++
mysql-test/suite/rpl/t/rpl_killed_ddl.test | 40 +-
mysql-test/suite/rpl/t/rpl_row_merge_engine.test | 6 +-
.../suite/rpl/t/rpl_tmp_table_and_DDL_innodb.test | 55 ++
mysql-test/suite/rpl/t/rpl_unsafe_statements.test | 176 +++++
mysql-test/suite/sys_vars/t/secure_file_priv.test | 40 +-
mysql-test/suite/vcol/inc/vcol_ins_upd.inc | 27 +
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result | 26 +
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result | 26 +
mysql-test/suite/vcol/r/vcol_misc.result | 8 +
mysql-test/suite/vcol/t/vcol_misc.test | 7 +
mysql-test/t/cache_temporal_4265.test | 11 +
mysql-test/t/case.test | 9 +
mysql-test/t/create.test | 21 +
mysql-test/t/ctype_cp850.test | 16 +
mysql-test/t/ctype_utf8.test | 14 +-
mysql-test/t/ctype_utf8mb4.test | 12 +
mysql-test/t/derived.test | 290 +++++++
mysql-test/t/events_2.test | 6 +-
mysql-test/t/func_math.test | 8 +
mysql-test/t/func_time.test | 18 +
mysql-test/t/insert_innodb.test | 43 +
mysql-test/t/kill_processlist-6619.test | 2 -
mysql-test/t/locale.test | 9 +
mysql-test/t/mdev6830-master.opt | 1 -
mysql-test/t/mdev6830.test | 10 +-
mysql-test/t/merge_innodb.test | 31 +
mysql-test/t/mysql_upgrade_view.test | 27 +-
mysql-test/t/mysqldump.test | 7 +-
mysql-test/t/second_frac-9175.test | 9 +
mysql-test/t/select_debug.test | 2 +-
mysql-test/t/set_password_plugin-9835.test | 128 +++
mysql-test/t/ssl_cert_verify.test | 43 +
.../ssl_timeout-9836.opt} | 0
mysql-test/t/ssl_timeout-9836.test | 11 +
mysql-test/t/subselect.test | 10 +
mysql-test/t/subselect_sj.test | 69 ++
mysql-test/t/type_blob.test | 25 +
mysql-test/t/type_date.test | 29 +
mysql-test/t/type_timestamp.test | 8 +
mysql-test/t/view.test | 10 +
mysql-test/valgrind.supp | 10 +-
mysys/default.c | 1 +
mysys/file_logger.c | 2 +
mysys/lf_alloc-pin.c | 9 +-
mysys/lf_hash.c | 43 +-
mysys/my_copy.c | 1 -
mysys/my_gethwaddr.c | 2 +-
mysys/my_wincond.c | 3 +-
mysys/string.c | 17 +-
plugin/feedback/feedback.cc | 12 +-
plugin/feedback/feedback.h | 6 +
plugin/feedback/url_base.cc | 45 ++
plugin/feedback/url_http.cc | 49 +-
plugin/semisync/semisync_master.cc | 4 +-
plugin/server_audit/CMakeLists.txt | 5 +-
plugin/server_audit/plugin_audit_v4.h | 561 +++++++++++++
plugin/server_audit/server_audit.c | 880 ++++++++++++++-------
plugin/server_audit/test_audit_v4.c | 162 ++++
sql-common/client.c | 90 ++-
sql/field.cc | 29 +
sql/field.h | 1 +
sql/field_conv.cc | 21 +-
sql/gcalc_slicescan.cc | 266 +++----
sql/gcalc_slicescan.h | 22 +-
sql/gcalc_tools.cc | 6 +-
sql/handler.cc | 4 +-
sql/handler.h | 14 +-
sql/item.cc | 14 +-
sql/item.h | 4 +-
sql/item_cmpfunc.cc | 67 +-
sql/item_cmpfunc.h | 4 +-
sql/item_func.cc | 22 +-
sql/item_func.h | 21 +-
sql/item_geofunc.cc | 22 +-
sql/item_geofunc.h | 6 +-
sql/item_strfunc.cc | 2 +-
sql/item_subselect.cc | 24 -
sql/item_timefunc.cc | 4 +-
sql/log.cc | 2 +-
sql/log_event.cc | 10 +-
sql/mysqld.cc | 26 +-
sql/mysqld.h | 12 +-
sql/opt_subselect.cc | 14 +-
sql/rpl_reporting.cc | 1 +
sql/sql_acl.cc | 35 +-
sql/sql_admin.cc | 14 +-
sql/sql_base.cc | 166 +---
sql/sql_class.cc | 135 +++-
sql/sql_class.h | 16 +-
sql/sql_insert.cc | 15 +-
sql/sql_lex.cc | 15 +-
sql/sql_lex.h | 16 +-
sql/sql_load.cc | 5 +-
sql/sql_locale.cc | 2 +-
sql/sql_select.cc | 107 ++-
sql/sql_select.h | 13 +
sql/sql_show.cc | 27 +-
sql/sql_show.h | 3 +-
sql/sql_table.cc | 47 +-
sql/sql_time.h | 3 +-
sql/sql_update.cc | 20 +-
sql/sql_view.cc | 3 +-
sql/sql_yacc.cc | 18 +-
sql/sql_yacc.yy | 18 +-
storage/innobase/buf/buf0flu.c | 9 +-
storage/innobase/dict/dict0crea.c | 4 +-
storage/innobase/dict/dict0dict.c | 2 +-
storage/innobase/handler/ha_innodb.cc | 2 +-
storage/innobase/include/ha_prototypes.h | 14 +
storage/innobase/include/os0sync.h | 46 +-
storage/innobase/log/log0recv.c | 4 +-
storage/innobase/row/row0mysql.c | 49 ++
storage/innobase/srv/srv0srv.c | 33 +-
storage/myisam/ft_boolean_search.c | 5 +-
storage/myisammrg/ha_myisammrg.cc | 1 +
storage/sphinx/ha_sphinx.cc | 2 +
storage/tokudb/ft-index/buildheader/make_tdb.cc | 4 +-
.../ft-index/cmake_modules/TokuSetupCompiler.cmake | 18 +-
storage/tokudb/ft-index/ft/txn/rollback.cc | 4 +-
storage/tokudb/ft-index/tools/tokudb_dump.cc | 70 --
storage/tokudb/ft-index/util/dmt.h | 8 +-
storage/tokudb/ha_tokudb.cc | 2 +-
storage/xtradb/buf/buf0flu.c | 9 +-
storage/xtradb/dict/dict0dict.c | 2 +-
storage/xtradb/handler/ha_innodb.cc | 16 +-
storage/xtradb/handler/ha_innodb.h | 23 +
storage/xtradb/handler/handler0alter.cc | 16 +
storage/xtradb/include/ha_prototypes.h | 14 +
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/log/log0recv.c | 6 +-
storage/xtradb/row/row0mysql.c | 49 ++
storage/xtradb/srv/srv0srv.c | 33 +-
strings/decimal.c | 3 +-
unittest/my_decimal/CMakeLists.txt | 2 +-
unittest/my_decimal/my_decimal-t.cc | 34 +-
unittest/mysys/CMakeLists.txt | 4 +-
unittest/mysys/dynstring-t.c | 74 ++
unittest/strings/CMakeLists.txt | 2 +-
vio/viosslfactories.c | 4 +
win/packaging/CMakeLists.txt | 61 +-
win/packaging/ca/CMakeLists.txt | 41 +-
250 files changed, 5729 insertions(+), 1424 deletions(-)
rename include/{probes_mysql_nodtrace.h => probes_mysql_nodtrace.h.in} (100%)
create mode 100644 mysql-test/r/ctype_cp850.result
create mode 100644 mysql-test/r/insert_innodb.result
create mode 100644 mysql-test/r/second_frac-9175.result
create mode 100644 mysql-test/r/set_password_plugin-9835.result
create mode 100644 mysql-test/r/ssl_cert_verify.result
create mode 100644 mysql-test/r/ssl_timeout-9836.result
create mode 100644 mysql-test/std_data/ca-cert-verify.pem
create mode 100644 mysql-test/std_data/server-cert-verify-fail.pem
create mode 100644 mysql-test/std_data/server-cert-verify-pass.pem
create mode 100644 mysql-test/std_data/server-key-verify-fail.pem
create mode 100644 mysql-test/std_data/server-key-verify-pass.pem
create mode 100644 mysql-test/suite/innodb/r/innodb-dict.result
create mode 100644 mysql-test/suite/innodb/t/innodb-dict.test
create mode 100644 mysql-test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
create mode 100644 mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL_innodb.result
create mode 100644 mysql-test/suite/rpl/r/rpl_unsafe_statements.result
create mode 100644 mysql-test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
create mode 100644 mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL_innodb.test
create mode 100644 mysql-test/suite/rpl/t/rpl_unsafe_statements.test
create mode 100644 mysql-test/t/ctype_cp850.test
create mode 100644 mysql-test/t/insert_innodb.test
delete mode 100644 mysql-test/t/mdev6830-master.opt
create mode 100644 mysql-test/t/second_frac-9175.test
create mode 100644 mysql-test/t/set_password_plugin-9835.test
create mode 100644 mysql-test/t/ssl_cert_verify.test
copy mysql-test/{suite/sys_vars/t/thread_pool_size_basic.opt => t/ssl_timeout-9836.opt} (100%)
create mode 100644 mysql-test/t/ssl_timeout-9836.test
create mode 100644 plugin/server_audit/plugin_audit_v4.h
create mode 100644 plugin/server_audit/test_audit_v4.c
create mode 100644 unittest/mysys/dynstring-t.c
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list