[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.46' into ubuntu-14.04
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Wed Nov 4 06:38:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.
commit 6ee6a27112f881ab3bf0a9b8fa250931bcfbbb40
Merge: cf36a34 a90934f
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Tue Nov 3 11:35:40 2015 +0200
Merge tag 'upstream/5.5.46' into ubuntu-14.04
Upstream version 5.5.46
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/CMakeLists.txt | 3 +-
client/mysql_upgrade.c | 3 +-
client/mysqlbinlog.cc | 7 +
client/mysqlimport.c | 19 +-
client/mysqlslap.c | 49 +-
cmake/os/Windows.cmake | 10 +-
extra/yassl/README | 29 +
extra/yassl/include/openssl/ssl.h | 2 +-
extra/yassl/include/yassl_error.hpp | 3 +-
extra/yassl/src/buffer.cpp | 2 +-
extra/yassl/src/handshake.cpp | 2 +
extra/yassl/src/ssl.cpp | 29 +-
extra/yassl/src/yassl_error.cpp | 4 +
extra/yassl/src/yassl_imp.cpp | 15 +-
extra/yassl/taocrypt/src/asn.cpp | 9 +-
extra/yassl/taocrypt/src/rsa.cpp | 4 +
extra/yassl/testsuite/cipher-test.sh | 1 +
mysql-test/disabled.def | 3 +-
.../binlog_tests/mix_innodb_myisam_binlog.test | 2 +-
mysql-test/include/restart_mysqld.inc | 17 +-
mysql-test/mysql-test-run.pl | 1 +
mysql-test/r/func_gconcat.result | 16 +
mysql-test/r/func_if.result | 17 +
mysql-test/r/func_misc.result | 211 ++
mysql-test/r/information_schema2.result | 24 +-
mysql-test/r/innodb_load_xa.result | 2 +
mysql-test/r/loadxml.result | 27 +
mysql-test/r/lowercase_fs_on.result | 3 +
mysql-test/r/lowercase_table3.result | 11 -
...{merge_recover.result => myisam_recover.result} | 57 +-
mysql-test/r/mysqldump.result | 29 +-
mysql-test/r/partition_error.result | 2 +-
mysql-test/r/sp-group.result | 156 ++
mysql-test/r/subselect.result | 70 +-
mysql-test/r/subselect_mat.result | 18 +
mysql-test/r/subselect_no_mat.result | 70 +-
mysql-test/r/subselect_no_opts.result | 70 +-
mysql-test/r/subselect_no_scache.result | 70 +-
mysql-test/r/subselect_no_semijoin.result | 70 +-
mysql-test/r/subselect_sj_mat.result | 18 +
mysql-test/r/update.result | 15 +
mysql-test/r/view.result | 50 +
mysql-test/std_data/bug16171518_1.dat | 59 +
mysql-test/std_data/bug16171518_2.dat | 12 +
.../suite/binlog/r/binlog_mysqlbinlog_row.result | 6 +-
.../binlog/r/binlog_mysqlbinlog_row_innodb.result | 72 +-
.../binlog/r/binlog_mysqlbinlog_row_myisam.result | 72 +-
.../binlog/r/binlog_row_mix_innodb_myisam.result | 2 +-
.../binlog/r/binlog_stm_mix_innodb_myisam.result | 4 +-
.../iuds/r/strings_charsets_update_delete.result | Bin 112951 -> 113361 bytes
mysql-test/suite/innodb/r/add_constraint.result | 13 +
.../suite/innodb/r/innodb-fk-warnings.result | 105 +
mysql-test/suite/innodb/r/innodb-fk.result | 3 +
mysql-test/suite/innodb/r/innodb_bug68148.result | 36 +
mysql-test/suite/innodb/r/innodb_uninstall.result | 22 +
mysql-test/suite/innodb/t/add_constraint.test | 21 +
mysql-test/suite/innodb/t/innodb-fk-warnings.test | 130 ++
.../suite/innodb/t/innodb_bug60229-master.opt | 1 -
mysql-test/suite/innodb/t/innodb_bug60229.test | 4 +
mysql-test/suite/innodb/t/innodb_bug68148.test | 41 +
mysql-test/suite/innodb/t/innodb_uninstall.opt | 3 +
mysql-test/suite/innodb/t/innodb_uninstall.test | 58 +
mysql-test/suite/innodb/t/xa_recovery.test | 6 +
mysql-test/suite/jp/t/jp_enum_sjis-master.opt | 1 -
mysql-test/suite/jp/t/jp_enum_sjis.test | 4 +
mysql-test/suite/jp/t/jp_enum_ucs2-master.opt | 1 -
mysql-test/suite/jp/t/jp_enum_ucs2.test | 4 +
mysql-test/suite/jp/t/jp_enum_ujis-master.opt | 1 -
mysql-test/suite/jp/t/jp_enum_ujis.test | 4 +
mysql-test/suite/jp/t/jp_enum_utf8-master.opt | 1 -
mysql-test/suite/jp/t/jp_enum_utf8.test | 4 +
mysql-test/suite/ndb/r/ndb_restore_discover.result | 33 +
mysql-test/suite/ndb/t/ndb_restore_discover.test | 70 +
mysql-test/suite/perfschema/r/query_cache.result | 4 +-
mysql-test/suite/perfschema/t/query_cache.test | 2 +
.../suite/plugins/r/feedback_plugin_load.result | 7 +-
.../suite/plugins/r/feedback_plugin_send.result | 7 +-
.../suite/plugins/t/feedback_plugin_load.test | 19 +-
.../suite/plugins/t/feedback_plugin_send.test | 9 +
mysql-test/suite/rpl/r/rpl_alter.result | 105 +
.../rpl/r/show_status_stop_slave_race-7126.result | 2 +
mysql-test/suite/rpl/t/rpl_alter.test | 53 +
mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt | 1 +
.../rpl/t/show_status_stop_slave_race-7126.test | 7 +
mysql-test/t/func_gconcat.test | 11 +
mysql-test/t/func_if.test | 14 +
mysql-test/t/func_misc.test | 204 ++
mysql-test/t/information_schema2.test | 19 +-
mysql-test/t/innodb_load_xa.test | 3 +
mysql-test/t/loadxml.test | 14 +
mysql-test/t/lowercase_fs_on.test | 38 +
mysql-test/t/lowercase_table3-master.opt | 1 -
mysql-test/t/lowercase_table3.test | 37 -
...ecover-master.opt => myisam_recover-master.opt} | 0
.../t/{merge_recover.test => myisam_recover.test} | 77 +-
mysql-test/t/mysql_upgrade.test | 1 -
mysql-test/t/mysqldump.test | 36 +-
mysql-test/t/partition_error.test | 2 +-
mysql-test/t/sp-group.test | 187 ++
mysql-test/t/subselect.test | 76 +-
mysql-test/t/subselect_sj_mat.test | 17 +-
mysql-test/t/update.test | 15 +
mysql-test/t/view.test | 65 +
mysys/ptr_cmp.c | 3 +-
regex/regcomp.c | 24 +-
sql/field.cc | 3 +-
sql/field.h | 19 +-
sql/field_conv.cc | 16 +-
sql/item.cc | 56 +-
sql/item.h | 7 +-
sql/item_cmpfunc.cc | 53 +-
sql/item_func.cc | 71 +-
sql/item_func.h | 39 +-
sql/item_subselect.cc | 34 +-
sql/item_subselect.h | 6 +
sql/item_sum.cc | 14 +-
sql/item_sum.h | 1 +
sql/log.cc | 33 +-
sql/log_event.cc | 25 +-
sql/mysqld.cc | 34 +-
sql/opt_range.cc | 17 +-
sql/opt_subselect.cc | 49 +-
sql/partition_info.cc | 16 +-
sql/rpl_handler.cc | 54 +-
sql/rpl_utility.cc | 21 +-
sql/slave.cc | 10 +-
sql/sql_acl.cc | 43 +-
sql/sql_base.cc | 73 +-
sql/sql_class.cc | 4 +
sql/sql_class.h | 16 +-
sql/sql_handler.cc | 37 +-
sql/sql_handler.h | 5 +-
sql/sql_insert.cc | 56 +-
sql/sql_lex.cc | 2 +-
sql/sql_lex.h | 2 -
sql/sql_load.cc | 13 +-
sql/sql_parse.cc | 35 +-
sql/sql_select.cc | 19 +-
sql/sql_select.h | 4 +
sql/sql_show.cc | 20 +-
sql/sql_table.cc | 6 +
sql/sql_test.cc | 7 +-
sql/sql_union.cc | 3 +-
sql/sql_yacc.cc | 2164 ++++++++++----------
sql/sql_yacc.yy | 12 +
sql/table.cc | 2 +-
storage/innobase/CMakeLists.txt | 18 +-
storage/innobase/btr/btr0cur.c | 31 +-
storage/innobase/dict/dict0crea.c | 143 +-
storage/innobase/dict/dict0dict.c | 539 ++++-
storage/innobase/handler/ha_innodb.cc | 27 +
storage/innobase/include/dict0crea.h | 11 +
storage/innobase/include/ha_prototypes.h | 9 +
storage/innobase/include/os0sync.h | 152 +-
storage/innobase/include/row0purge.h | 13 +-
storage/innobase/include/sync0sync.h | 9 +-
storage/innobase/include/sync0sync.ic | 9 +-
storage/innobase/lock/lock0lock.c | 10 +-
storage/innobase/os/os0file.c | 13 +-
storage/innobase/row/row0purge.c | 93 +-
storage/perfschema/pfs_timer.cc | 43 +-
.../tokudb/ft-index/util}/tests/sm-basic.cc | 0
.../ft-index/util}/tests/sm-crash-double-free.cc | 0
.../tokudb/mysql-test/tokudb_bugs}/r/db805.result | 0
.../tokudb/mysql-test/tokudb_bugs}/r/db806.result | 0
.../tokudb/mysql-test/tokudb_bugs}/r/db811.result | 0
.../tokudb/mysql-test/tokudb_bugs}/r/db811s.result | 0
.../tokudb/mysql-test/tokudb_bugs}/r/db823.result | 0
.../tokudb/mysql-test/tokudb_bugs}/t/db805.test | 0
.../tokudb/mysql-test/tokudb_bugs}/t/db806.test | 0
.../tokudb/mysql-test/tokudb_bugs}/t/db811.test | 0
.../tokudb/mysql-test/tokudb_bugs}/t/db811s.test | 0
.../tokudb/mysql-test/tokudb_bugs}/t/db823.test | 0
storage/xtradb/buf/buf0buf.c | 6 +-
storage/xtradb/dict/dict0crea.c | 143 +-
storage/xtradb/dict/dict0dict.c | 542 ++++-
storage/xtradb/handler/ha_innodb.cc | 60 +-
storage/xtradb/include/dict0crea.h | 11 +
storage/xtradb/include/ha_prototypes.h | 9 +
storage/xtradb/include/row0purge.h | 14 +-
storage/xtradb/include/srv0srv.h | 1 -
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/os/os0file.c | 13 +-
storage/xtradb/row/row0purge.c | 94 +-
storage/xtradb/srv/srv0srv.c | 1 -
storage/xtradb/srv/srv0start.c | 4 +-
storage/xtradb/sync/sync0arr.c | 7 +-
storage/xtradb/trx/trx0trx.c | 4 +-
support-files/mysql.spec.sh | 14 +-
vio/viosslfactories.c | 47 +-
win/packaging/ca/CustomAction.cpp | 2 +
193 files changed, 6348 insertions(+), 1934 deletions(-)
--
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