[Pkg-mysql-commits] [mariadb-5.5] 02/05: Merge tag 'upstream/5.5.43' into ubuntu-14.04
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Tue May 5 20:27:34 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 f7f0aa7dc852bdecd2ec6e619aa5fc8c200af770
Merge: b8782b1 1d7e28f
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Tue May 5 09:14:07 2015 +0300
Merge tag 'upstream/5.5.43' into ubuntu-14.04
Upstream version 5.5.43
Conflicts:
debian/dist/Ubuntu/mariadb-server-5.5.postinst
debian/mariadb-server-5.5.install
.gitattributes | 5 +
.gitignore | 232 +
CMakeLists.txt | 10 +-
Docs/INFO_SRC | 12 +-
VERSION | 2 +-
client/mysql_upgrade.c | 83 +-
client/mysqladmin.cc | 3 +
client/mysqlcheck.c | 232 +-
client/mysqltest.cc | 2 +-
cmake/compile_flags.cmake | 8 +-
cmake/cpack_rpm.cmake | 1 +
cmake/cpack_source_ignore_files.cmake | 5 +-
cmake/info_macros.cmake.in | 47 +-
cmake/info_src.cmake | 8 +-
cmake/maintainer.cmake | 4 +-
cmake/make_dist.cmake.in | 41 +-
cmake/plugin.cmake | 7 -
debian/dist/Ubuntu/mariadb-server-5.5.files.in | 2 +-
extra/yassl/README | 10 +
extra/yassl/examples/client/client.cpp | 11 +-
extra/yassl/examples/server/server.cpp | 23 +-
extra/yassl/include/openssl/ssl.h | 2 +-
extra/yassl/include/yassl_int.hpp | 21 +
extra/yassl/src/yassl_imp.cpp | 29 +-
extra/yassl/src/yassl_int.cpp | 76 +
extra/yassl/taocrypt/src/asn.cpp | 8 +-
extra/yassl/taocrypt/src/integer.cpp | 10 +-
extra/yassl/testsuite/cipher-test.sh | 130 +
extra/yassl/testsuite/test.hpp | 42 +-
include/myisamchk.h | 1 +
include/mysql.h | 7 +
include/mysql.h.pp | 3 +
include/welcome_copyright_notice.h | 6 +-
libmysql/CMakeLists.txt | 5 +
libmysql/libmysql.c | 20 +-
mysql-test/extra/binlog_tests/database.test | 35 +
mysql-test/include/ctype_utf8_ilseq.inc | 114 +
mysql-test/lib/My/SafeProcess/Base.pm | 1 +
mysql-test/lib/My/SafeProcess/safe_process.cc | 21 +-
mysql-test/lib/generate-ssl-certs.sh | 30 +
mysql-test/mysql-test-run.pl | 30 +-
mysql-test/r/blackhole.result | 7 +
mysql-test/r/create.result | 2 +-
mysql-test/r/ctype_uca.result | 412 +
mysql-test/r/ctype_uca_innodb.result | 218 +
mysql-test/r/ctype_utf8.result | 628 +
mysql-test/r/derived.result | 12 +
mysql-test/r/derived_opt.result | 40 +-
mysql-test/r/derived_view.result | 6 +-
mysql-test/r/error_simulation.result | 21 +
mysql-test/r/file_contents.result | 2 +-
mysql-test/r/filesort_bad_i_s-7585.result | 9 +
mysql-test/r/frm_bad_row_type-7333.result | 14 +
mysql-test/r/func_gconcat.result | 12 +
mysql-test/r/gis.result | 15 +-
mysql-test/r/group_by.result | 10 +
mysql-test/r/having.result | 31 +
mysql-test/r/information_schema.result | 15 +
mysql-test/r/log_errchk.result | 5 +-
mysql-test/r/log_tables_upgrade.result | 7 +-
mysql-test/r/multi_update.result | 194 +
mysql-test/r/mysql_upgrade.result | 61 +-
mysql-test/r/mysql_upgrade_ssl.result | 7 +-
mysql-test/r/mysql_upgrade_view.result | 234 +
mysql-test/r/mysqlcheck.result | 11 +-
mysql-test/r/openssl_1.result | 4 +-
mysql-test/r/processlist.result | 5 +-
mysql-test/r/select_jcl6.result | 4 +-
mysql-test/r/sp-destruct.result | 4 +
mysql-test/r/sp-innodb.result | 108 +
mysql-test/r/subselect_extra.result | 2 +-
mysql-test/r/subselect_extra_no_semijoin.result | 2 +-
mysql-test/r/subselect_sj.result | 9 +
mysql-test/r/subselect_sj2.result | 84 +
.../r/subselect_sj2_jcl6,innodb_plugin.rdiff | 9 +
mysql-test/r/subselect_sj2_jcl6.result | 88 +-
mysql-test/r/subselect_sj2_mat.result | 84 +
mysql-test/r/subselect_sj_jcl6.result | 9 +
mysql-test/r/table_elim.result | 32 +
mysql-test/r/table_keyinfo-6838.result | 12 +
mysql-test/r/trigger-trans.result | 25 +
mysql-test/r/uniques_crash-7912.result | 11 +
mysql-test/r/view.result | 17 +-
mysql-test/std_data/bad_row_type.MYD | 0
mysql-test/std_data/bad_row_type.MYI | Bin 0 -> 1024 bytes
mysql-test/std_data/bad_row_type.frm | Bin 0 -> 1760 bytes
mysql-test/std_data/cacert.pem | 96 +-
mysql-test/std_data/client-cert.pem | 106 +-
mysql-test/std_data/client-key.pem | 26 +-
mysql-test/std_data/mysql_upgrade/event.MYD | 0
mysql-test/std_data/mysql_upgrade/event.MYI | Bin 0 -> 2048 bytes
mysql-test/std_data/mysql_upgrade/event.frm | Bin 0 -> 10223 bytes
mysql-test/std_data/mysql_upgrade/v1.frm | 15 +
mysql-test/std_data/mysql_upgrade/v1badcheck.frm | 15 +
mysql-test/std_data/mysql_upgrade/v2.frm | 15 +
mysql-test/std_data/mysql_upgrade/v3.frm | 15 +
mysql-test/std_data/mysql_upgrade/v4.frm | 16 +
mysql-test/std_data/server-cert.pem | 111 +-
mysql-test/std_data/server-key.pem | 26 +-
mysql-test/std_data/server8k-cert.pem | 185 +-
mysql-test/std_data/server8k-key.pem | 110 +-
mysql-test/suite/binlog/r/binlog_database.result | 69 +-
.../r/temptable_uservar_disconnect-7938.result | 8 +
.../t/temptable_uservar_disconnect-7938.test | 17 +
mysql-test/suite/innodb/r/binlog_consistent.result | 11 +-
mysql-test/suite/innodb/r/innodb-fk.result | 32 +
mysql-test/suite/innodb/r/innodb-mdev-7513.result | 204 +
mysql-test/suite/innodb/r/multi_repair-7404.result | 21 +
mysql-test/suite/innodb/t/binlog_consistent.test | 33 +-
mysql-test/suite/innodb/t/innodb-fk.test | 40 +
mysql-test/suite/innodb/t/innodb-mdev-7513.test | 220 +
mysql-test/suite/innodb/t/innodb_corrupt_bit.test | 10 +-
mysql-test/suite/innodb/t/multi_repair-7404.test | 18 +
mysql-test/suite/percona/innodb_sys_index.result | 3 -
mysql-test/suite/percona/innodb_sys_index.test | 1 -
mysql-test/suite/plugins/r/server_audit.result | 183 +-
mysql-test/suite/plugins/t/server_audit.test | 61 +-
mysql-test/suite/rpl/r/rpl_drop_db_fail.result | 16 +
mysql-test/suite/rpl/r/rpl_special_charset.result | 7 +
.../rpl/r/show_status_stop_slave_race-7126.result | 2 +
mysql-test/suite/rpl/t/rpl_drop_db_fail.test | 34 +
mysql-test/suite/rpl/t/rpl_special_charset.opt | 1 +
mysql-test/suite/rpl/t/rpl_special_charset.test | 25 +
.../rpl/t/show_status_stop_slave_race-7126.test | 12 +
.../sys_vars/r/stored_program_cache_basic.result | 6 +-
.../sys_vars/r/stored_program_cache_func.result | 52 +
.../r/transaction_alloc_block_size_basic.result | 28 +-
.../r/transaction_prealloc_size_basic.result | 8 +-
.../sys_vars/t/stored_program_cache_func.test | 43 +
.../t/transaction_alloc_block_size_basic.test | 14 +-
.../t/transaction_prealloc_size_basic.test | 6 +-
mysql-test/t/blackhole.test | 10 +
mysql-test/t/ctype_uca.test | 11 +
mysql-test/t/ctype_uca_innodb.test | 25 +
mysql-test/t/ctype_utf8.test | 20 +
mysql-test/t/derived.test | 14 +-
mysql-test/t/error_simulation-master.opt | 1 +
mysql-test/t/error_simulation.test | 36 +
mysql-test/t/file_contents.test | 8 +-
mysql-test/t/filesort_bad_i_s-7585.test | 14 +
mysql-test/t/frm_bad_row_type-7333.test | 14 +
mysql-test/t/func_gconcat.test | 18 +
mysql-test/t/gis.test | 16 +-
mysql-test/t/group_by.test | 11 +
mysql-test/t/having.test | 34 +
mysql-test/t/information_schema.test | 17 +
mysql-test/t/log_errchk.test | 15 +-
mysql-test/t/multi_update.test | 206 +
mysql-test/t/mysql_upgrade_view.test | 132 +
mysql-test/t/mysqladmin.test | 6 +
mysql-test/t/mysqlcheck.test | 14 +-
mysql-test/t/openssl_1.test | 4 +-
mysql-test/t/processlist.test | 18 +-
mysql-test/t/sp-destruct.test | 8 +
mysql-test/t/sp-innodb.test | 117 +
mysql-test/t/subselect_sj.test | 11 +
mysql-test/t/subselect_sj2.test | 71 +
mysql-test/t/table_elim.test | 31 +
mysql-test/t/table_keyinfo-6838.test | 18 +
mysql-test/t/trigger-trans.test | 54 +
mysql-test/t/uniques_crash-7912.test | 26 +
mysql-test/t/view.test | 32 +
mysys/my_context.c | 13 +-
packaging/WiX/custom_ui.wxs | 4 +-
plugin/server_audit/server_audit.c | 678 +-
scripts/mysql_install_db.pl.in | 4 +-
scripts/mysql_install_db.sh | 4 +-
scripts/mysqld_safe.sh | 17 +-
sql-bench/test-table-elimination.sh | 2 +-
sql-common/client.c | 17 +-
sql/CMakeLists.txt | 11 +-
sql/field.h | 8 +
sql/handler.cc | 4 +-
sql/handler.h | 9 +-
sql/item.cc | 28 +-
sql/item.h | 28 +-
sql/item_func.cc | 13 +-
sql/item_geofunc.cc | 8 +
sql/item_geofunc.h | 2 +-
sql/item_strfunc.h | 1 -
sql/lex.h | 1 +
sql/log.cc | 37 +-
sql/mysqld.cc | 23 +-
sql/opt_subselect.cc | 53 +-
sql/opt_subselect.h | 2 +-
sql/slave.cc | 22 +-
sql/sp.cc | 6 +-
sql/sql_admin.cc | 39 +-
sql/sql_base.cc | 20 +-
sql/sql_class.cc | 31 +-
sql/sql_class.h | 11 +-
sql/sql_db.cc | 6 +-
sql/sql_delete.cc | 7 +-
sql/sql_derived.cc | 7 +-
sql/sql_lex.cc | 37 +-
sql/sql_lex.h | 2 +
sql/sql_plugin.cc | 2 +-
sql/sql_select.cc | 60 +-
sql/sql_select.h | 14 +-
sql/sql_table.cc | 23 +-
sql/sql_truncate.cc | 8 +-
sql/sql_update.cc | 2 +-
sql/sql_view.cc | 159 +-
sql/sql_view.h | 2 +
sql/sql_yacc.cc | 35351 ++++++++++---------
sql/sql_yacc.h | 1138 +-
sql/sql_yacc.yy | 48 +-
sql/structs.h | 1 +
sql/sys_vars.cc | 10 +-
sql/table.cc | 110 +-
sql/table.h | 21 +-
sql/udf_example.c | 5 +-
sql/uniques.cc | 11 +-
storage/federated/ha_federated.cc | 8 +-
storage/innobase/dict/dict0dict.c | 22 +-
storage/innobase/handler/ha_innodb.cc | 29 +-
storage/innobase/ibuf/ibuf0ibuf.c | 8 +
storage/innobase/include/dict0dict.h | 2 +-
storage/innobase/rem/rem0rec.c | 2 +-
storage/oqgraph/CMakeLists.txt | 1 +
storage/tokudb/CMakeLists.txt | 26 +-
storage/tokudb/README.md | 37 +-
.../doc2/sysbench.update.ma10.tokudb754.loglog.png | Bin 0 -> 7209 bytes
.../tokudb/doc2/sysbench.update.ma10.tokudb754.png | Bin 0 -> 7527 bytes
.../doc2/sysbench.update.ma55.tokudb753.binlog.png | Bin 0 -> 6723 bytes
.../doc2/sysbench.update.ma55.tokudb753.loglog.png | Bin 0 -> 7367 bytes
.../tokudb/doc2/sysbench.update.ma55.tokudb753.png | Bin 0 -> 7561 bytes
.../doc2/sysbench.update.my55.tokudb753.loglog.png | Bin 0 -> 6899 bytes
.../doc2/sysbench.update.ps56.tokudb754.loglog.png | Bin 0 -> 7008 bytes
.../tokudb/doc2/sysbench.update.ps56.tokudb754.png | Bin 0 -> 7434 bytes
storage/tokudb/ft-index/buildheader/make_tdb.cc | 8 +-
storage/tokudb/ft-index/ft/ft-internal.h | 3 +-
storage/tokudb/ft-index/ft/ft-ops.cc | 18 +-
storage/tokudb/ft-index/ft/ft.cc | 5 +
storage/tokudb/ft-index/ft/logger/recover.cc | 4 +-
storage/tokudb/ft-index/ft/txn/txn.cc | 4 +-
storage/tokudb/ft-index/ft/txn/txn.h | 2 +-
storage/tokudb/ft-index/locktree/lock_request.cc | 32 +-
storage/tokudb/ft-index/locktree/lock_request.h | 6 +
storage/tokudb/ft-index/locktree/locktree.cc | 1 +
.../tests/lock_request_start_retry_race.cc} | 167 +-
storage/tokudb/ft-index/src/tests/recover-5146.cc | 2 +-
storage/tokudb/ft-index/src/tests/test-prepare.cc | 2 +-
storage/tokudb/ft-index/src/tests/test-prepare2.cc | 2 +-
storage/tokudb/ft-index/src/tests/test-prepare3.cc | 2 +-
.../tokudb/ft-index/src/tests/test-xa-prepare.cc | 2 +-
storage/tokudb/ft-index/src/tests/test5092.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_5015.cc | 2 +-
.../ft-index/src/tests/test_cursor_interrupt.cc | 4 +-
.../ft-index/src/tests/test_stress_hot_indexing.cc | 2 +-
.../tests/test_txn_close_before_prepare_commit.cc | 2 +-
.../src/tests/threaded_stress_test_helpers.h | 2 +-
.../tokudb/ft-index/src/tests/xa-dirty-commit.cc | 2 +-
.../tokudb/ft-index/src/tests/xa-dirty-rollback.cc | 2 +-
.../ft-index/src/tests/xa-txn-discard-abort.cc | 2 +-
.../ft-index/src/tests/xa-txn-discard-commit.cc | 2 +-
storage/tokudb/ft-index/src/ydb_cursor.cc | 2 +-
storage/tokudb/ft-index/src/ydb_row_lock.cc | 1 +
storage/tokudb/ft-index/src/ydb_txn.cc | 21 +-
storage/tokudb/ft-index/tools/CMakeLists.txt | 2 +-
storage/tokudb/ft-index/tools/tokuftdump.cc | 473 +-
storage/tokudb/ha_tokudb.cc | 88 +-
storage/tokudb/ha_tokudb.h | 2 +-
storage/tokudb/ha_tokudb_admin.cc | 86 +-
storage/tokudb/ha_tokudb_alter_56.cc | 4 +-
storage/tokudb/hatoku_defines.h | 3 +
storage/tokudb/hatoku_hton.cc | 152 +-
storage/tokudb/hatoku_hton.h | 24 +-
storage/tokudb/mysql-test/rpl/disabled.def | 3 +
.../rpl/r/rpl_tokudb_read_only_ff.result | 14 +
.../rpl/r/rpl_tokudb_read_only_ft.result | 14 +
.../rpl/r/rpl_tokudb_read_only_tf.result | 14 +
.../rpl/r/rpl_tokudb_read_only_tt.result | 14 +
.../rpl/t/rpl_tokudb_read_only_ff-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_read_only_ff.test | 53 +
.../rpl/t/rpl_tokudb_read_only_ft-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_read_only_ft.test | 53 +
.../rpl/t/rpl_tokudb_read_only_tf-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_read_only_tf.test | 53 +
.../rpl/t/rpl_tokudb_read_only_tt-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_read_only_tt.test | 53 +
.../tokudb/r/change_column_varchar.result | 1 +
.../r/information-schema-global-status.result | 1 +
.../mysql-test/tokudb/t/bf_create_select.test | 8 +-
.../tokudb/t/bf_create_select_hash_part.test | 8 +-
.../tokudb/t/bf_create_select_range_part.test | 8 +-
.../mysql-test/tokudb/t/bf_create_temp_select.test | 8 +-
storage/tokudb/mysql-test/tokudb/t/bf_delete.test | 7 +-
.../mysql-test/tokudb/t/bf_insert_select.test | 6 +-
.../tokudb/t/bf_insert_select_dup_key.test | 8 +-
.../mysql-test/tokudb/t/bf_replace_select.test | 7 +-
.../mysql-test/tokudb/t/bf_select_hash_part.test | 8 +-
.../mysql-test/tokudb/t/bf_select_range_part.test | 8 +-
.../mysql-test/tokudb/t/change_column_varchar.test | 1 +
.../mysql-test/tokudb_bugs/r/5733_tokudb.result | 2 +-
.../tokudb/mysql-test/tokudb_bugs/r/db762.result | 7 +
.../tokudb/mysql-test/tokudb_bugs/r/db766.result | 7 +
.../tokudb/mysql-test/tokudb_bugs/r/db768.result | 10 +
.../tokudb/mysql-test/tokudb_bugs/r/db771.result | 11 +
.../tokudb_bugs/r/db788-optimize-index-name.result | 16 +
.../tokudb/mysql-test/tokudb_bugs/r/db801.result | 18 +
.../tokudb/mysql-test/tokudb_bugs/r/db817.result | 33 +
.../mysql-test/tokudb_bugs/r/memcache_dirty.result | 14 -
.../mysql-test/tokudb_bugs/t/5585-master.opt | 1 +
.../mysql-test/tokudb_bugs/t/5733_tokudb.test | 15 +-
storage/tokudb/mysql-test/tokudb_bugs/t/db762.test | 13 +
storage/tokudb/mysql-test/tokudb_bugs/t/db766.test | 12 +
storage/tokudb/mysql-test/tokudb_bugs/t/db768.test | 12 +
storage/tokudb/mysql-test/tokudb_bugs/t/db771.test | 13 +
.../tokudb_bugs/t/db788-optimize-index-name.test | 21 +
storage/tokudb/mysql-test/tokudb_bugs/t/db801.test | 50 +
storage/tokudb/mysql-test/tokudb_bugs/t/db817.test | 38 +
.../mysql-test/tokudb_bugs/t/memcache_dirty.test | 25 -
storage/tokudb/scripts/common.sh | 24 +-
storage/tokudb/scripts/make.mysql.bash | 16 +-
storage/tokudb/scripts/make.mysql.debug.env.bash | 12 +-
storage/tokudb/tokudb_card.h | 35 +-
storage/tokudb/tokudb_update_fun.cc | 2 +-
storage/xtradb/CMakeLists.txt | 8 +
storage/xtradb/dict/dict0dict.c | 51 +-
storage/xtradb/handler/ha_innodb.cc | 79 +-
storage/xtradb/ibuf/ibuf0ibuf.c | 6 +
storage/xtradb/include/btr0cur.ic | 4 +-
storage/xtradb/include/dict0dict.h | 10 +-
storage/xtradb/include/dict0dict.ic | 12 +
storage/xtradb/include/os0stacktrace.h | 4 +-
storage/xtradb/include/os0sync.h | 2 +-
storage/xtradb/include/univ.i | 8 +-
storage/xtradb/lock/lock0lock.c | 2 +-
storage/xtradb/log/log0log.c | 2 +-
storage/xtradb/log/log0online.c | 2 +-
storage/xtradb/log/log0recv.c | 4 +-
storage/xtradb/rem/rem0rec.c | 4 +-
storage/xtradb/row/row0mysql.c | 9 +-
storage/xtradb/srv/srv0start.c | 19 +-
strings/ctype-uca.c | 20 +-
support-files/build-tags | 4 +-
support-files/mysql.5.5.41.spec | 2064 --
support-files/mysql.server.sh | 3 +
support-files/rpm/server-postin.sh | 53 +-
support-files/rpm/server-postun.sh | 7 +
vio/viosslfactories.c | 6 +-
win/packaging/heidisql.cmake | 2 +-
win/packaging/heidisql.wxi.in | 28 +-
344 files changed, 27750 insertions(+), 21573 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