[Pkg-mysql-commits] [mariadb-5.5] 03/04: Merged with upstream 5.5.38
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Tue Jun 17 16:28:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch master
in repository mariadb-5.5.
commit 166c4de090da035acff7792c6eb783b85a101673
Merge: 9c2c898 16eb389
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date: Tue Jun 17 16:25:18 2014 +0300
Merged with upstream 5.5.38
CMakeLists.txt | 12 +-
Docs/INFO_SRC | 10 +-
EXCEPTIONS-CLIENT | 136 +
VERSION | 2 +-
client/mysqldump.c | 31 +-
client/mysqltest.cc | 57 +-
cmake/build_configurations/mysql_release.cmake | 3 -
cmake/os/WindowsCache.cmake | 3 +-
dbug/CMakeLists.txt | 2 +
debian/additions/mysql_tableinfo.1 | 322 -
debian/changelog | 6 +
debian/mariadb-client-5.5.links | 3 +
debian/rules | 2 +-
include/errmsg.h | 6 +-
include/my_global.h | 1 +
include/my_time.h | 9 +-
libmysql/CMakeLists.txt | 5 +
libmysql/errmsg.c | 4 +-
libmysql/libmysql.c | 8 +-
libmysqld/emb_qcache.cc | 9 +-
libmysqld/lib_sql.cc | 14 +-
man/CMakeLists.txt | 6 +-
man/aria_chk.1 | 245 +
man/aria_dump_log.1 | 54 +
man/aria_ftdump.1 | 29 +
man/aria_pack.1 | 76 +
man/aria_read_log.1 | 108 +
man/mysql_fix_privilege_tables.1 | 175 -
man/mysqladmin.1 | 4 +-
man/mysqlbinlog.1 | 103 +-
man/mysqldump.1 | 3 -
man/mysqlman.1 | 15 -
man/mysqlmanager.8 | 2078 -
mysql-test/collections/default.experimental | 1 -
mysql-test/include/ctype_common.inc | 8 +
mysql-test/include/ctype_numconv.inc | 11 +
mysql-test/r/cast.result | 16 +-
mysql-test/r/ctype_big5.result | 9 +
mysql-test/r/ctype_binary.result | 17 +
mysql-test/r/ctype_cp1250_ch.result | 18 +
mysql-test/r/ctype_cp1251.result | 27 +
mysql-test/r/ctype_euckr.result | 9 +
mysql-test/r/ctype_gb2312.result | 9 +
mysql-test/r/ctype_gbk.result | 9 +
mysql-test/r/ctype_latin1.result | 119 +
mysql-test/r/ctype_uca.result | 9 +
mysql-test/r/ctype_ucs.result | 26 +
mysql-test/r/ctype_ucs2_query_cache.result | 6 +
mysql-test/r/ctype_utf16_uca.result | 9 +
mysql-test/r/ctype_utf32_uca.result | 9 +
mysql-test/r/ctype_utf8.result | 17 +
mysql-test/r/derived.result | 14 +
mysql-test/r/dyncol.result | 31 +-
mysql-test/r/fulltext.result | 45 +
mysql-test/r/func_str.result | 31 +-
mysql-test/r/func_time.result | 12 +-
mysql-test/r/group_by.result | 9 +
mysql-test/r/having.result | 29 +
mysql-test/r/loaddata.result | 12 +
mysql-test/r/multi_update.result | 29 +
mysql-test/r/myisam-metadata.result | 1 +
mysql-test/r/myisampack.result | 54 +
mysql-test/r/mysql_upgrade.result | 83 +
mysql-test/r/mysqldump.result | 4 +
mysql-test/r/outfile_loaddata.result | 16 +
mysql-test/r/partition_pruning.result | 52 +
mysql-test/r/range.result | 54 +
mysql-test/r/range_mrr_icp.result | 54 +
mysql-test/r/subselect_sj2.result | 30 +
mysql-test/r/subselect_sj2_jcl6.result | 30 +
mysql-test/r/subselect_sj2_mat.result | 30 +
mysql-test/r/type_date.result | 46 +
mysql-test/r/type_datetime.result | 49 +
mysql-test/r/type_time.result | 28 +
mysql-test/r/type_time_hires.result | 14 +-
mysql-test/r/union.result | 13 +-
mysql-test/r/view.result | 238 +-
mysql-test/r/xml.result | 20 +-
.../suite/binlog/r/binlog_row_ctype_cp932.result | 9 +
.../suite/binlog/r/binlog_stm_ctype_cp932.result | 9 +
.../suite/binlog/r/binlog_truncate_kill.result | 33 +
.../suite/binlog/t/binlog_truncate_kill.test | 57 +
.../suite/funcs_1/datadict/processlist_val.inc | 4 +-
mysql-test/suite/funcs_1/r/innodb_func_view.result | 28 +-
mysql-test/suite/funcs_1/r/memory_func_view.result | 28 +-
mysql-test/suite/funcs_1/r/myisam_func_view.result | 28 +-
.../funcs_1/r/processlist_priv_no_prot.result | 30 +-
.../suite/funcs_1/r/processlist_priv_ps.result | 30 +-
.../suite/funcs_1/r/processlist_val_no_prot.result | 14 +-
.../suite/funcs_1/r/processlist_val_ps.result | 14 +-
mysql-test/suite/innodb/r/count_distinct.result | 12 +
.../suite/innodb/r/innodb-changed-pages.result | 72 +
mysql-test/suite/innodb/t/count_distinct.test | 15 +
.../suite/innodb/t/innodb-changed-pages-master.opt | 1 +
.../suite/innodb/t/innodb-changed-pages.test | 63 +
mysql-test/suite/plugins/r/sql_error_log.result | 2 +
mysql-test/suite/plugins/t/sql_error_log.test | 2 +
.../suite/rpl/r/rpl_row_create_select.result | 28 +
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | 4 +-
mysql-test/suite/rpl/t/rpl_row_create_select.test | 28 +
mysql-test/t/ctype_cp1251.test | 8 +
mysql-test/t/ctype_latin1.test | 4 +
mysql-test/t/ctype_ucs2_query_cache.test | 1 +
mysql-test/t/derived.test | 19 +
mysql-test/t/dyncol.test | 7 +
mysql-test/t/fulltext.test | 39 +
mysql-test/t/func_str.test | 28 +
mysql-test/t/func_time.test | 5 +
mysql-test/t/group_by.test | 11 +
mysql-test/t/having.test | 36 +
mysql-test/t/loaddata.test | 21 +
mysql-test/t/multi_update.test | 41 +
mysql-test/t/myisam-metadata.test | 1 +
mysql-test/t/myisampack.test | 47 +
mysql-test/t/mysql_upgrade.test | 62 +
mysql-test/t/mysqldump.test | 15 +
mysql-test/t/outfile_loaddata.test | 4 +
mysql-test/t/partition_pruning.test | 57 +
mysql-test/t/range.test | 39 +
mysql-test/t/subselect_sj2.test | 29 +
mysql-test/t/type_date.test | 28 +
mysql-test/t/type_datetime.test | 37 +
mysql-test/t/type_time.test | 17 +
mysql-test/t/union.test | 12 +-
mysql-test/t/view.test | 248 +-
mysql-test/t/xml.test | 14 +-
mysys/file_logger.c | 24 +-
mysys/my_thr_init.c | 3 +
packaging/rpm-oel/filter-provides.sh | 0
packaging/rpm-oel/filter-requires.sh | 0
packaging/rpm-oel/mysql.spec.in | 89 +-
packaging/solaris/CMakeLists.txt | 6 +-
plugin/server_audit/server_audit.c | 2 +-
scripts/mysql_install_db.pl.in | 2 +-
scripts/mysql_install_db.sh | 2 +-
sql-common/client.c | 30 +-
sql-common/my_time.c | 12 +-
sql/CMakeLists.txt | 2 +-
sql/field.cc | 44 +-
sql/handler.cc | 4 +
sql/handler.h | 2 +
sql/item.cc | 30 +-
sql/item_cmpfunc.cc | 6 +-
sql/item_func.cc | 43 +-
sql/item_strfunc.cc | 14 +-
sql/item_timefunc.cc | 43 +-
sql/lock.cc | 2 +-
sql/opt_range.cc | 11 +
sql/protocol.cc | 11 +-
sql/protocol.h | 8 +-
sql/share/errmsg-utf8.txt | 4 +-
sql/sp_head.cc | 3 +
sql/sql_admin.cc | 6 +-
sql/sql_base.cc | 123 +-
sql/sql_class.cc | 3 +-
sql/sql_class.h | 5 +-
sql/sql_derived.cc | 17 +-
sql/sql_error.h | 11 +-
sql/sql_load.cc | 64 +-
sql/sql_parse.cc | 1 -
sql/sql_plugin.cc | 3 +-
sql/sql_select.cc | 38 +-
sql/sql_show.cc | 239 +-
sql/sql_string.cc | 36 +
sql/sql_string.h | 3 +
sql/sql_time.cc | 72 +-
sql/sql_time.h | 5 +-
sql/sql_truncate.cc | 51 +-
sql/sql_truncate.h | 10 +-
sql/sql_update.cc | 15 +-
sql/sql_yacc.cc | 4384 +-
sql/sql_yacc.h | 4 +-
sql/table.cc | 26 +
sql/table.h | 3 +-
storage/archive/ha_archive.cc | 3 +-
storage/innobase/btr/btr0cur.c | 285 +-
storage/innobase/btr/btr0pcur.c | 21 +-
storage/innobase/fil/fil0fil.c | 15 +
storage/innobase/include/btr0cur.h | 22 +
storage/innobase/include/fil0fil.h | 8 +
storage/innobase/row/row0ins.c | 17 +-
storage/innobase/srv/srv0start.c | 24 +-
storage/maria/maria_chk.c | 2 +-
storage/myisam/ha_myisam.cc | 3 +-
storage/myisam/mi_open.c | 7 +-
storage/myisam/myisampack.c | 11 +-
storage/myisammrg/ha_myisammrg.cc | 18 +
storage/myisammrg/ha_myisammrg.h | 1 +
storage/tokudb/CMakeLists.txt | 15 +-
storage/tokudb/README.md | 15 +-
storage/tokudb/ft-index/CMakeLists.txt | 8 +-
storage/tokudb/ft-index/buildheader/make_tdb.cc | 12 +-
.../ft-index/cmake/merge_archives_unix.cmake.in | 49 +-
.../cmake_modules/TokuBuildTagDatabases.cmake | 6 +-
.../ft-index/cmake_modules/TokuMergeLibs.cmake | 2 +-
.../ft-index/cmake_modules/TokuSetupCTest.cmake | 2 -
storage/tokudb/ft-index/ft/CMakeLists.txt | 3 -
.../tokudb/ft-index/ft/background_job_manager.cc | 5 +-
storage/tokudb/ft-index/ft/block_table.cc | 6 +-
storage/tokudb/ft-index/ft/bndata.cc | 642 +-
storage/tokudb/ft-index/ft/bndata.h | 290 +-
storage/tokudb/ft-index/ft/cachetable-internal.h | 2 +
storage/tokudb/ft-index/ft/cachetable.cc | 156 +-
storage/tokudb/ft-index/ft/cachetable.h | 45 +-
storage/tokudb/ft-index/ft/checkpoint.cc | 4 +
storage/tokudb/ft-index/ft/checkpoint.h | 2 +
.../ft-index/ft/checksum-benchmarks/Makefile | 3 -
.../ft-index/ft/checksum-benchmarks/adler32.cc | 236 -
.../tokudb/ft-index/ft/compression-ratio/Makefile | 3 -
.../tokudb/ft-index/ft/compression-ratio/cratio.cc | 195 -
storage/tokudb/ft-index/ft/fifo.cc | 7 +-
storage/tokudb/ft-index/ft/fifo.h | 15 +-
.../tokudb/ft-index/ft/ft-cachetable-wrappers.cc | 137 +-
.../tokudb/ft-index/ft/ft-cachetable-wrappers.h | 82 +-
storage/tokudb/ft-index/ft/ft-flusher.cc | 80 +-
storage/tokudb/ft-index/ft/ft-flusher.h | 4 +-
storage/tokudb/ft-index/ft/ft-hot-flusher.cc | 37 +-
storage/tokudb/ft-index/ft/ft-internal.h | 55 +-
storage/tokudb/ft-index/ft/ft-node-deserialize.cc | 4 +-
storage/tokudb/ft-index/ft/ft-ops.cc | 905 +-
storage/tokudb/ft-index/ft/ft-ops.h | 74 +-
storage/tokudb/ft-index/ft/ft-search.h | 5 +-
storage/tokudb/ft-index/ft/ft-serialize.cc | 11 +-
storage/tokudb/ft-index/ft/ft-test-helpers.cc | 81 +-
storage/tokudb/ft-index/ft/ft-verify.cc | 110 +-
storage/tokudb/ft-index/ft/ft.cc | 62 +-
storage/tokudb/ft-index/ft/ft.h | 6 +-
storage/tokudb/ft-index/ft/ft_layout_version.h | 7 +-
storage/tokudb/ft-index/ft/ft_node-serialize.cc | 147 +-
storage/tokudb/ft-index/ft/ftloader-internal.h | 28 +-
storage/tokudb/ft-index/ft/ftloader.cc | 72 +-
storage/tokudb/ft-index/ft/ftloader.h | 2 +-
storage/tokudb/ft-index/ft/fttypes.h | 10 +-
storage/tokudb/ft-index/ft/ftverify.cc | 1 -
.../tokudb/ft-index/ft/hash-benchmarks/Makefile | 4 -
.../hash-benchmark-manually-open.cc | 378 -
.../ft-index/ft/hash-benchmarks/hash-benchmark.cc | 1205 -
storage/tokudb/ft-index/ft/le-cursor.h | 4 +-
storage/tokudb/ft-index/ft/leafentry.h | 3 +-
.../tokudb/ft-index/ft/locking-benchmarks/Makefile | 4 -
.../ft/locking-benchmarks/mfence-benchmark.cc | 217 -
.../ft/locking-benchmarks/process_locks.cc | 233 -
.../ft/locking-benchmarks/pthread-locks.cc | 272 -
.../ft/locking-benchmarks/trylock-rdtsc.cc | 247 -
.../ft-index/ft/locking-benchmarks/trylock.cc | 213 -
storage/tokudb/ft-index/ft/log-internal.h | 8 +-
storage/tokudb/ft-index/ft/log.h | 9 +-
storage/tokudb/ft-index/ft/logcursor.cc | 3 -
storage/tokudb/ft-index/ft/logformat.cc | 18 +-
storage/tokudb/ft-index/ft/logger.cc | 19 +-
storage/tokudb/ft-index/ft/omt.cc | 230 -
storage/tokudb/ft-index/ft/omt.h | 416 -
storage/tokudb/ft-index/ft/quicklz.cc | 1 +
storage/tokudb/ft-index/ft/rbuf.h | 6 +-
storage/tokudb/ft-index/ft/recover.cc | 93 +-
storage/tokudb/ft-index/ft/recover.h | 4 +-
storage/tokudb/ft-index/ft/roll.cc | 4 +-
storage/tokudb/ft-index/ft/rollback-apply.cc | 6 +-
.../tokudb/ft-index/ft/rollback-ct-callbacks.cc | 6 +-
storage/tokudb/ft-index/ft/rollback.cc | 10 +-
.../tokudb/ft-index/ft/rollback_log_node_cache.cc | 2 +-
storage/tokudb/ft-index/ft/sub_block.cc | 9 +-
.../ft/tests/cachetable-checkpoint-pending.cc | 4 -
.../ft/tests/cachetable-checkpointer-class.cc | 3 +
.../tokudb/ft-index/ft/tests/cachetable-test.cc | 8 -
.../ft-index/ft/tests/{omt-test.cc => dmt-test.cc} | 467 +-
storage/tokudb/ft-index/ft/tests/dmt-test2.cc | 373 +
storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc | 76 +-
storage/tokudb/ft-index/ft/tests/ft-clock-test.cc | 119 +-
.../ft-index/ft/tests/ft-serialize-benchmark.cc | 180 +-
.../ft/tests/ft-serialize-sub-block-test.cc | 22 +-
.../tokudb/ft-index/ft/tests/ft-serialize-test.cc | 411 +-
.../tokudb/ft-index/ft/tests/ft-test-cursor-2.cc | 10 +-
storage/tokudb/ft-index/ft/tests/ft-test-cursor.cc | 166 +-
storage/tokudb/ft-index/ft/tests/ft-test-header.cc | 2 +-
storage/tokudb/ft-index/ft/tests/ft-test.cc | 118 +-
.../ft/tests/ftloader-test-bad-generate.cc | 6 +-
.../ft/tests/ftloader-test-extractor-errors.cc | 6 +-
.../ft-index/ft/tests/ftloader-test-extractor.cc | 8 +-
.../ft/tests/ftloader-test-merge-files-dbufio.cc | 6 +-
.../tokudb/ft-index/ft/tests/ftloader-test-open.cc | 6 +-
.../ft/tests/ftloader-test-writer-errors.cc | 2 +-
.../ft-index/ft/tests/ftloader-test-writer.cc | 6 +-
storage/tokudb/ft-index/ft/tests/ftloader-test.cc | 2 +-
storage/tokudb/ft-index/ft/tests/is_empty.cc | 26 +-
storage/tokudb/ft-index/ft/tests/keyrange.cc | 4 +-
.../tokudb/ft-index/ft/tests/le-cursor-provdel.cc | 18 +-
.../tokudb/ft-index/ft/tests/le-cursor-right.cc | 32 +-
storage/tokudb/ft-index/ft/tests/le-cursor-walk.cc | 16 +-
storage/tokudb/ft-index/ft/tests/make-tree.cc | 44 +-
storage/tokudb/ft-index/ft/tests/mempool-115.cc | 14 +-
storage/tokudb/ft-index/ft/tests/minicron-test.cc | 4 +-
storage/tokudb/ft-index/ft/tests/msnfilter.cc | 64 +-
.../tokudb/ft-index/ft/tests/orthopush-flush.cc | 28 +-
storage/tokudb/ft-index/ft/tests/shortcut.cc | 12 +-
.../ft/tests/test-checkpoint-during-flush.cc | 32 +-
.../ft/tests/test-checkpoint-during-merge.cc | 44 +-
.../ft/tests/test-checkpoint-during-rebalance.cc | 46 +-
.../ft/tests/test-checkpoint-during-split.cc | 56 +-
.../ft/tests/test-dirty-flushes-on-cleaner.cc | 90 +-
.../ft-index/ft/tests/test-flushes-on-cleaner.cc | 102 +-
.../ft-index/ft/tests/test-hot-with-bounds.cc | 14 +-
.../ft-index/ft/tests/test-leafentry-nested.cc | 16 +-
.../ft-index/ft/tests/test-merges-on-cleaner.cc | 70 +-
.../ft/tests/test-oldest-referenced-xid-flush.cc | 21 +-
.../ft-index/ft/tests/test-pick-child-to-flush.cc | 2 +-
storage/tokudb/ft-index/ft/tests/test.h | 2 +-
storage/tokudb/ft-index/ft/tests/test1308a.cc | 2 +-
storage/tokudb/ft-index/ft/tests/test3681.cc | 4 +-
storage/tokudb/ft-index/ft/tests/test3884.cc | 67 +-
storage/tokudb/ft-index/ft/tests/test4244.cc | 9 +-
.../ft/tests/test_block_allocator_merge.cc | 25 +-
storage/tokudb/ft-index/ft/tests/test_logcursor.cc | 8 +-
storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc | 42 +-
.../tokudb/ft-index/ft/tests/verify-bad-pivots.cc | 38 +-
.../tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc | 28 +-
.../tokudb/ft-index/ft/tests/verify-dup-pivots.cc | 38 +-
.../ft-index/ft/tests/verify-misrouted-msgs.cc | 44 +-
.../ft-index/ft/tests/verify-unsorted-leaf.cc | 28 +-
.../ft-index/ft/tests/verify-unsorted-pivots.cc | 38 +-
.../ft-index/ft/tests/xid_lsn_independent.cc | 8 +-
storage/tokudb/ft-index/ft/tokuftdump.cc | 10 +-
storage/tokudb/ft-index/ft/txn_manager.cc | 21 -
storage/tokudb/ft-index/ft/ule-internal.h | 3 +-
storage/tokudb/ft-index/ft/ule.cc | 83 +-
storage/tokudb/ft-index/ft/wbuf.h | 19 +-
.../ft-index/ft/worker-thread-benchmarks/Makefile | 14 -
.../ft/worker-thread-benchmarks/threadpool.cc | 166 -
.../ft/worker-thread-benchmarks/threadpool.h | 136 -
.../ft/worker-thread-benchmarks/worker-test.cc | 261 -
.../ft/worker-thread-benchmarks/worker-test.cilk | 74 -
.../ft/worker-thread-benchmarks/workqueue.h | 207 -
.../ft/x1764-speedup/x1764-speedup-test.cc | 175 -
storage/tokudb/ft-index/ft/xids-internal.h | 10 -
storage/tokudb/ft-index/ft/xids.h | 2 -
storage/tokudb/ft-index/include/CMakeLists.txt | 4 -
storage/tokudb/ft-index/include/tdb-internal.h | 110 -
storage/tokudb/ft-index/locktree/lock_request.cc | 2 +-
storage/tokudb/ft-index/locktree/lock_request.h | 2 +-
storage/tokudb/ft-index/locktree/locktree.cc | 130 +-
storage/tokudb/ft-index/locktree/locktree.h | 692 +-
storage/tokudb/ft-index/locktree/manager.cc | 202 +-
.../ft-index/locktree/tests/lock_request_killed.cc | 17 +-
.../locktree/tests/lock_request_not_killed.cc | 17 +-
.../locktree/tests/lock_request_start_deadlock.cc | 30 +-
.../locktree/tests/lock_request_start_pending.cc | 23 +-
.../tests/lock_request_wait_time_callback.cc | 16 +-
.../ft-index/locktree/tests/locktree_conflicts.cc | 25 +-
.../locktree/tests/locktree_create_destroy.cc | 25 +-
.../tests/locktree_escalation_1big7lt_1small.cc | 31 +-
.../locktree/tests/locktree_escalation_2big_1lt.cc | 8 +-
.../locktree/tests/locktree_escalation_2big_2lt.cc | 8 +-
.../tests/locktree_escalation_impossible.cc | 4 +-
.../locktree/tests/locktree_escalation_stalls.cc | 10 +-
.../ft-index/locktree/tests/locktree_infinity.cc | 55 +-
.../ft-index/locktree/tests/locktree_misc.cc | 28 +-
.../locktree/tests/locktree_overlapping_relock.cc | 31 +-
.../locktree/tests/locktree_simple_lock.cc | 6 +-
.../tests/locktree_single_txnid_optimization.cc | 23 +-
.../locktree/tests/manager_create_destroy.cc | 13 +-
.../locktree/tests/manager_locktree_map.cc | 2 +-
.../ft-index/locktree/tests/manager_params.cc | 2 +-
.../locktree/tests/manager_reference_release_lt.cc | 2 +-
.../ft-index/locktree/tests/manager_status.cc | 3 +-
.../ft-index/locktree/tests/range_buffer_test.cc | 2 +-
storage/tokudb/ft-index/portability/CMakeLists.txt | 11 +-
.../ft-index/portability/huge_page_detection.cc | 24 +-
.../ft-index/portability/huge_page_detection.h | 96 -
storage/tokudb/ft-index/portability/memory.cc | 40 +-
.../{toku_include => portability}/memory.h | 18 +-
storage/tokudb/ft-index/portability/os_malloc.cc | 2 +-
storage/tokudb/ft-index/portability/portability.cc | 2 +-
.../ft-index/{toku_include => portability}/rdtsc.h | 0
.../tests/test-cache-line-boundary-fails.cc | 8 +-
.../ft-index/portability/tests/test-fsync.cc | 4 -
.../ft-index/portability/tests/test-hugepage.cc | 10 +-
.../tokudb/ft-index/portability/tests/test-xid.cc | 2 +-
storage/tokudb/ft-index/portability/toku_assert.cc | 86 +-
.../{toku_include => portability}/toku_assert.h | 16 +-
storage/tokudb/ft-index/portability/toku_atomic.h | 3 +-
.../tokudb/ft-index/portability/toku_byteswap.h | 2 +-
.../{toku_include => portability}/toku_config.h.in | 0
storage/tokudb/ft-index/portability/toku_crash.h | 7 -
.../{toku_include => portability}/toku_htod.h | 2 +-
storage/tokudb/ft-index/portability/toku_htonl.h | 1 -
.../{toku_include => portability}/toku_list.h | 0
.../{toku_include => portability}/toku_os.h | 13 +-
.../tokudb/ft-index/portability/toku_os_types.h | 20 +-
.../toku_portability.h | 93 +-
.../tokudb/ft-index/portability/toku_pthread.cc | 2 +-
.../toku_race_tools.h | 2 +-
storage/tokudb/ft-index/portability/toku_random.h | 2 +-
storage/tokudb/ft-index/portability/toku_time.h | 2 +-
.../ft-index/scripts/watch.stress-tests.bash | 2 +-
storage/tokudb/ft-index/src/indexer-undo-do.cc | 10 +-
storage/tokudb/ft-index/src/indexer.cc | 43 +-
storage/tokudb/ft-index/src/loader.cc | 12 +-
storage/tokudb/ft-index/src/tests/CMakeLists.txt | 378 +-
.../src/tests/bdb-simple-deadlock-detect.cc | 300 -
.../src/tests/bdb-simple-deadlock-nowait.cc | 177 -
.../src/tests/bdb-simple-deadlock-on-the-fly.cc | 292 -
storage/tokudb/ft-index/src/tests/bdb.suppressions | 87 -
.../ft-index/src/tests/big-nested-abort-abort.cc | 4 -
.../ft-index/src/tests/big-nested-abort-commit.cc | 3 -
.../ft-index/src/tests/big-nested-commit-abort.cc | 3 -
.../ft-index/src/tests/big-nested-commit-commit.cc | 5 -
.../ft-index/src/tests/blocking-first-empty.cc | 8 -
.../tokudb/ft-index/src/tests/blocking-first.cc | 8 -
storage/tokudb/ft-index/src/tests/blocking-last.cc | 8 -
.../src/tests/blocking-next-prev-deadlock.cc | 14 -
.../ft-index/src/tests/blocking-next-prev.cc | 10 -
.../ft-index/src/tests/blocking-prelock-range.cc | 2 -
.../ft-index/src/tests/blocking-put-timeout.cc | 23 -
.../ft-index/src/tests/blocking-put-wakeup.cc | 2 -
storage/tokudb/ft-index/src/tests/blocking-put.cc | 2 -
.../ft-index/src/tests/blocking-set-range-0.cc | 8 -
.../ft-index/src/tests/blocking-set-range-n.cc | 8 -
.../src/tests/blocking-set-range-reverse-0.cc | 6 -
storage/tokudb/ft-index/src/tests/blocking-set.cc | 8 -
.../ft-index/src/tests/blocking-table-lock.cc | 2 -
storage/tokudb/ft-index/src/tests/checkpoint1.cc | 2 -
.../ft-index/src/tests/checkpoint_fairness.cc | 2 -
.../tokudb/ft-index/src/tests/checkpoint_stress.cc | 7 +-
.../tokudb/ft-index/src/tests/cilktests/Makefile | 40 -
.../tokudb/ft-index/src/tests/cilktests/bar2.cilk | 22 -
.../tokudb/ft-index/src/tests/cilktests/foo.cilk | 41 -
.../tokudb/ft-index/src/tests/cilktests/foo2.cpp | 131 -
.../tokudb/ft-index/src/tests/cilktests/get.cilk | 27 -
.../src/tests/cilktests/measurecilkrun.cilk | 106 -
.../tokudb/ft-index/src/tests/create-datadir.cc | 11 -
.../src/tests/cursor-more-than-a-leaf-provdel.cc | 8 -
.../src/tests/db-put-simple-deadlock-threads.cc | 12 -
.../ft-index/src/tests/db-put-simple-deadlock.cc | 15 +-
.../ft-index/src/tests/db-put-simple-lockwait.cc | 4 -
.../ft-index/src/tests/db-put-update-deadlock.cc | 20 -
storage/tokudb/ft-index/src/tests/dump-env.cc | 8 -
storage/tokudb/ft-index/src/tests/filesize.cc | 4 -
.../ft-index/src/tests/hotindexer-undo-do-test.cc | 4 +-
storage/tokudb/ft-index/src/tests/inflate.cc | 4 -
storage/tokudb/ft-index/src/tests/inflate2.cc | 4 -
.../src/tests/loader-blobs-create-leaf.c.notyet | 149 -
.../src/tests/medium-nested-commit-commit.cc | 3 -
.../src/tests/recover-compare-db-descriptor.cc | 10 -
.../ft-index/src/tests/recover-compare-db.cc | 8 -
.../src/tests/recover-fcreate-basementnodesize.cc | 7 -
.../ft-index/src/tests/recover-fcreate-nodesize.cc | 7 -
.../ft-index/src/tests/recover-missing-dbfile-2.cc | 6 -
.../ft-index/src/tests/recover-missing-dbfile.cc | 6 -
.../recover-upgrade-db-descriptor-multihandle.cc | 10 -
.../src/tests/recover-upgrade-db-descriptor.cc | 10 -
.../tokudb/ft-index/src/tests/recovery_stress.cc | 4 +-
storage/tokudb/ft-index/src/tests/root_fifo_2.cc | 4 -
storage/tokudb/ft-index/src/tests/rowsize.cc | 7 +-
storage/tokudb/ft-index/src/tests/simple.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/test.h | 44 +-
storage/tokudb/ft-index/src/tests/test1426.cc | 196 -
storage/tokudb/ft-index/src/tests/test1753.cc | 4 -
storage/tokudb/ft-index/src/tests/test1842.cc | 5 -
storage/tokudb/ft-index/src/tests/test3039.cc | 6 -
storage/tokudb/ft-index/src/tests/test3219.cc | 2 +-
.../tokudb/ft-index/src/tests/test4573-logtrim.cc | 2 +-
storage/tokudb/ft-index/src/tests/test5092.cc | 2 -
storage/tokudb/ft-index/src/tests/test938.cc | 2 -
storage/tokudb/ft-index/src/tests/test938c.cc | 2 -
storage/tokudb/ft-index/src/tests/test_abort1.cc | 20 -
storage/tokudb/ft-index/src/tests/test_abort2.cc | 7 -
storage/tokudb/ft-index/src/tests/test_abort3.cc | 4 -
storage/tokudb/ft-index/src/tests/test_abort4.cc | 4 -
storage/tokudb/ft-index/src/tests/test_abort5.cc | 4 -
.../ft-index/src/tests/test_abort_delete_first.cc | 8 +-
storage/tokudb/ft-index/src/tests/test_archive1.cc | 7 -
.../ft-index/src/tests/test_blobs_leaf_split.cc | 4 -
.../tokudb/ft-index/src/tests/test_cachesize.cc | 9 -
.../ft-index/src/tests/test_cursor_delete2.cc | 4 +-
.../ft-index/src/tests/test_db_dbt_mem_behavior.cc | 2 -
.../tokudb/ft-index/src/tests/test_db_delete.cc | 13 -
.../src/tests/test_db_env_open_nocreate.cc | 29 -
.../src/tests/test_db_env_open_open_close.cc | 11 -
.../ft-index/src/tests/test_db_env_set_lg_dir.cc | 5 -
.../ft-index/src/tests/test_db_env_set_tmp_dir.cc | 5 -
.../ft-index/src/tests/test_db_env_strdup_null.cc | 3 -
.../ft-index/src/tests/test_db_get_put_flags.cc | 9 -
.../tokudb/ft-index/src/tests/test_db_remove.cc | 4 -
.../src/tests/test_db_txn_locks_nonheaviside.cc | 18 +-
.../tests/test_db_txn_locks_read_uncommitted.cc | 25 -
.../ft-index/src/tests/test_env_close_flags.cc | 10 -
.../src/tests/test_env_create_db_create.cc | 6 -
.../ft-index/src/tests/test_env_open_flags.cc | 6 -
....cc => test_equal_keys_with_different_bytes.cc} | 79 +-
.../ft-index/src/tests/test_groupcommit_count.cc | 12 -
.../ft-index/src/tests/test_locktree_close.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log1.cc | 5 -
storage/tokudb/ft-index/src/tests/test_log10.cc | 11 -
.../tokudb/ft-index/src/tests/test_log1_abort.cc | 8 -
storage/tokudb/ft-index/src/tests/test_log7.cc | 5 -
storage/tokudb/ft-index/src/tests/test_log8.cc | 4 -
storage/tokudb/ft-index/src/tests/test_log9.cc | 4 -
storage/tokudb/ft-index/src/tests/test_logflush.cc | 4 -
storage/tokudb/ft-index/src/tests/test_logmax.cc | 4 -
.../ft-index/src/tests/test_reverse_compare_fun.cc | 10 -
.../ft-index/src/tests/test_set_func_malloc.cc | 3 -
.../tokudb/ft-index/src/tests/test_txn_abort7.cc | 6 -
.../tokudb/ft-index/src/tests/test_txn_abort8.cc | 156 -
.../tokudb/ft-index/src/tests/test_txn_abort9.cc | 162 -
.../tokudb/ft-index/src/tests/test_txn_commit8.cc | 156 -
.../ft-index/src/tests/test_txn_cursor_last.cc | 10 +-
.../tokudb/ft-index/src/tests/test_txn_nested1.cc | 73 -
.../ft-index/src/tests/test_txn_nested_abort4.cc | 4 -
.../tokudb/ft-index/src/tests/test_weakxaction.cc | 6 -
..._txn_close_open_commit.cc => time_create_db.cc} | 139 +-
.../tokudb/ft-index/src/tests/upgrade-test-1.cc | 2 +-
storage/tokudb/ft-index/src/ydb-internal.h | 11 +-
storage/tokudb/ft-index/src/ydb.cc | 244 +-
storage/tokudb/ft-index/src/ydb_cursor.cc | 43 +-
storage/tokudb/ft-index/src/ydb_db.cc | 16 +-
storage/tokudb/ft-index/src/ydb_db.h | 2 +-
storage/tokudb/ft-index/src/ydb_lib.cc | 35 +-
storage/tokudb/ft-index/src/ydb_load.h | 2 +-
storage/tokudb/ft-index/src/ydb_row_lock.cc | 12 +-
storage/tokudb/ft-index/src/ydb_write.cc | 28 +-
.../tokudb/ft-index/toku_include/CMakeLists.txt | 17 -
storage/tokudb/ft-index/toku_include/old-db.h | 276 -
storage/tokudb/ft-index/tools/CMakeLists.txt | 11 +
.../ft-index/{utils => tools}/parseTraceFiles.py | 0
storage/tokudb/ft-index/{utils => tools}/pmprof | 0
.../ft-index/{utils => tools}/tokudb_common.h | 0
.../{utils => tools}/tokudb_common_funcs.h | 14 -
.../ft-index/{utils => tools}/tokudb_dump.cc | 9 -
.../tokudb/ft-index/{utils => tools}/tokudb_gen.cc | 7 -
.../ft-index/{utils => tools}/tokudb_load.cc | 0
storage/tokudb/ft-index/util/CMakeLists.txt | 2 +
storage/tokudb/ft-index/util/context.h | 2 +-
storage/tokudb/ft-index/util/dmt.cc | 1265 +
storage/tokudb/ft-index/util/dmt.h | 728 +
storage/tokudb/ft-index/util/doubly_linked_list.h | 2 +-
storage/tokudb/ft-index/util/fmutex.h | 109 +
storage/tokudb/ft-index/util/kibbutz.cc | 6 +-
storage/tokudb/ft-index/{ft => util}/memarena.cc | 60 +-
storage/tokudb/ft-index/{ft => util}/memarena.h | 23 +-
storage/tokudb/ft-index/util/mempool.cc | 61 +-
storage/tokudb/ft-index/util/mempool.h | 36 +-
storage/tokudb/ft-index/util/omt.cc | 2 +-
storage/tokudb/ft-index/util/scoped_malloc.cc | 2 +-
.../tokudb/ft-index/{ft => util}/tests/omt-test.cc | 482 +-
.../ft-index/{ft => util}/tests/x1764-test.cc | 36 +-
storage/tokudb/ft-index/{ft => util}/x1764.cc | 12 +-
storage/tokudb/ft-index/{ft => util}/x1764.h | 12 +-
storage/tokudb/ft-index/utils/CMakeLists.txt | 21 -
storage/tokudb/ha_tokudb.cc | 475 +-
storage/tokudb/ha_tokudb.h | 40 +-
storage/tokudb/ha_tokudb_admin.cc | 4 +-
storage/tokudb/ha_tokudb_alter_56.cc | 28 +-
storage/tokudb/ha_tokudb_mrr_maria.cc | 2 +-
storage/tokudb/ha_tokudb_update.cc | 6 -
storage/tokudb/hatoku_cmp.h | 18 +-
storage/tokudb/hatoku_defines.h | 44 +-
storage/tokudb/hatoku_hton.cc | 306 +-
storage/tokudb/hatoku_hton.h | 77 +-
.../tokudb/r/change_column_all_1000_1.result | 5000 +-
.../tokudb/r/change_column_all_1000_10.result | 65584 ++++++++++--------
.../mysql-test/tokudb/r/ctype_cp1250_ch.result | 18 +
.../r/information-schema-global-status.result | 4 +
.../mysql-test/tokudb/t/change_column_all.py | 99 +-
.../tokudb/t/change_column_all_1000_1.test | 5001 +-
.../tokudb/t/change_column_all_1000_10.test | 67883 ++++++++++---------
.../tokudb/t/i_s_tokudb_lock_waits_released.test | 6 +-
.../tokudb/t/i_s_tokudb_lock_waits_timeout.test | 6 +-
.../tokudb/t/i_s_tokudb_locks_released.test | 6 +-
.../tokudb_alter_table/r/hcad_clustering.result | 6 +-
.../tokudb_alter_table/r/hcad_clustering2.result | 6 +-
.../tokudb_alter_table/r/other_alter2.result | 5 +-
.../tokudb_alter_table/t/hcad_clustering.test | 6 +-
.../tokudb_alter_table/t/hcad_clustering2.test | 6 +-
.../tokudb_alter_table/t/other_alter2.test | 3 +-
.../tokudb_bugs/r/lock_uniq_key_empty.result | 26 +
.../tokudb_bugs/r/lock_uniq_key_left.result | 32 +
.../tokudb_bugs/r/lock_uniq_key_middle.result | 32 +
.../tokudb_bugs/r/lock_uniq_key_right.result | 32 +
.../mysql-test/tokudb_bugs/r/mdev4533.result | 5 +
.../mysql-test/tokudb_bugs/r/mdev5932.result | 26 +
.../tokudb_bugs/r/rpl_mixed_replace_into.result | 21 +
.../tokudb_bugs/r/rpl_row_replace_into.result | 21 +
.../tokudb_bugs/r/rpl_stmt_replace_into.result | 21 +
.../mysql-test/tokudb_bugs/r/simple_icp.result | 2 +-
.../tokudb_bugs/t/lock_uniq_key_empty.test | 41 +
.../tokudb_bugs/t/lock_uniq_key_left.test | 43 +
.../tokudb_bugs/t/lock_uniq_key_middle.test | 43 +
.../tokudb_bugs/t/lock_uniq_key_right.test | 43 +
.../tokudb/mysql-test/tokudb_bugs/t/mdev4533.test | 9 +
.../tokudb/mysql-test/tokudb_bugs/t/mdev5932.test | 41 +
.../tokudb_bugs/t/rpl_mixed_replace_into.test | 25 +
.../tokudb_bugs/t/rpl_row_replace_into.test | 25 +
.../tokudb_bugs/t/rpl_stmt_replace_into.test | 25 +
storage/tokudb/scripts/atc.readme | 2 +-
storage/tokudb/scripts/common.sh | 5 +-
storage/tokudb/scripts/make.mysql.bash | 16 +-
storage/tokudb/scripts/make.mysql.debug.env.bash | 25 +-
.../scripts/nightly.mysql.build.and.test.bash | 6 +-
storage/tokudb/scripts/run.sql.bench.bash | 19 +-
storage/tokudb/scripts/sql.bench.summary.py | 75 -
storage/tokudb/scripts/tokutek.make.mysql.bash | 2 +-
storage/tokudb/tokudb_card.h | 16 +-
storage/xtradb/CMakeLists.txt | 1 +
storage/xtradb/btr/btr0cur.c | 285 +-
storage/xtradb/btr/btr0pcur.c | 21 +-
storage/xtradb/buf/buf0buf.c | 4 +-
storage/xtradb/fil/fil0fil.c | 43 +-
storage/xtradb/handler/ha_innodb.cc | 22 +-
storage/xtradb/handler/ha_innodb.h | 1 +
storage/xtradb/handler/handler0alter.cc | 2 +-
storage/xtradb/handler/i_s.cc | 59 +-
storage/xtradb/include/btr0cur.h | 22 +
storage/xtradb/include/fil0fil.h | 8 +
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/row/row0ins.c | 6 +-
storage/xtradb/row/row0upd.c | 6 +-
storage/xtradb/srv/srv0start.c | 29 +-
strings/xml.c | 9 +-
support-files/CMakeLists.txt | 3 +-
{sql => support-files}/db.opt | 0
.../{mysql.5.5.37.spec => mysql.5.5.38.spec} | 4 +-
tests/CMakeLists.txt | 1 +
unittest/mysys/CMakeLists.txt | 13 -
unittest/{mysys => sql}/CMakeLists.txt | 10 +-
unittest/{mysys => sql}/explain_filename-t.cc | 0
win/packaging/heidisql.cmake | 4 +-
630 files changed, 93668 insertions(+), 85048 deletions(-)
diff --cc debian/changelog
index 7c00639,0af9e63..dd9a25b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,82 -1,23 +1,88 @@@
-mariadb-5.5 (5.5.1) unstable; urgency=low
++mariadb-5.5 (5.5.38-1) unstable; urgency=low
+
- * Initial release.
++ * New upstream release.
+
- -- Kristian Nielsen <knielsen at askmonty.org> Fri, 6 Jan 2012 15:17:23 -0100
++ -- Otto Kekäläinen <otto at seravo.fi> Tue, 17 Jun 2014 16:24:35 +0300
+
-mariadb-5.3 (5.3.0) unstable; urgency=low
+mariadb-5.5 (5.5.37-1) unstable; urgency=low
- * Initial release.
+ * New upstream release, fixing the following security issues:
+ * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
+ - CVE-2014-0384
+ - CVE-2014-2419
+ - CVE-2014-2430
+ - CVE-2014-2431
+ - CVE-2014-2432
+ - CVE-2014-2436
+ - CVE-2014-2438
+ - CVE-2014-2440
+ * Re-enabled TokuDB with "if arch amd64" in d/rules
+ * Applied patch to log init output better
+ (Closes https://mariadb.atlassian.net/browse/MDEV-5957)
- -- Sergei Golubchik <serg at askmonty.org> Mon, 1 Nov 2010 09:16:01 -0100
+ -- Otto Kekäläinen <otto at seravo.fi> Thu, 17 Apr 2014 20:55:22 +0300
-mariadb-5.2 (5.2.0) unstable; urgency=low
+mariadb-5.5 (5.5.36-1) unstable; urgency=low
- * Initial release.
+ [ Otto Kekäläinen ]
+ * New upstream release.
+ * Updated Danish debconf translation (Closes: #739750).
+ * d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
+ (Closes: #739841).
+ * d/control: Update for use of virtual-* packages for switching to/from
+ MySQL alternatives.
- -- Kristian Nielsen <knielsen at askmonty.org> Wed, 17 Mar 2010 12:54:51 -0100
+ [ James Page ]
+ * d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
+ * d/control: Add libjemalloc-dev to BD's.
-mariadb-5.1 (5.1.0) unstable; urgency=low
+ -- Otto Kekäläinen <otto at seravo.fi> Sun, 02 Mar 2014 01:38:26 +0200
- * Initial release.
+mariadb-5.5 (5.5.35-1) unstable; urgency=low
- -- Peter Lieverdink <peter at openquery.com> Tue, 29 Sep 2009 17:05:03 +1000
+ [ Otto Kekäläinen ]
+ * New upstream release, fixing the following security issues:
+ - Buffer overflow in client/mysql.cc (Closes: #737597).
+ - CVE-2014-0001
+ - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
+ - CVE-2013-5891
+ - CVE-2013-5908
+ - CVE-2014-0386
+ - CVE-2014-0393
+ - CVE-2014-0401
+ - CVE-2014-0402
+ - CVE-2014-0412
+ - CVE-2014-0420
+ - CVE-2014-0437
+ * Upstream https://mariadb.atlassian.net/browse/MDEV-4902
+ fixes compatibility with Bison 3.0 (Closes: #733002)
+ * Updated Russian debconf translation (Closes: #734426)
+ * Updated Japanese debconf translation (Closes: #735284)
+ * Updated French debconf translation (Closes: #736480)
+ * Renamed SONAME properly (Closes: #732967)
+
+ -- James Page <jamespage at debian.org> Mon, 17 Feb 2014 16:51:52 +0000
+
+mariadb-5.5 (5.5.32-1) unstable; urgency=low
+
+ [ Otto Kekäläinen ]
+ * Initial package for Debian (Closes: #565308), based on upstream
+ packaging:
+ - mariadb-5.3 by Sergei Golubchik
+ - mariadb-5.2 by Kristian Nielsen
+ - mariadb-5.1 by Peter Lieverdink
+ * Bring packaging up-to-date inline with mysql-5.5 packaging.
+ * Refine control file and tidy lintian warnings
+ * Rename libmysqlclient18 -> libmariadbclient18.
+ * Add suitable Breaks/Replaces/Provides to support migration
+ to/from mysql-server-5.5.
+ * Plus multiple other updates based on feedback from Debian maintainers
+
+ [ James Page ]
+ * d/control,rules: Cherry picked fix from mysql-5.5 packaging to disable
+ x86 assembler in taocrypt on i386 architectures, removing need for
+ gcc-4.4 dependency.
+ * d/control: Add myself to uploaders.
+ * d/control: Update Vcs fields for new location on git.debian.org.
+
+ -- Otto Kekäläinen <otto at seravo.fi> Tue, 24 Sept 2013 15:09:51 +0300
diff --cc debian/rules
index aa74895,0000000..88d2fd6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,216 -1,0 +1,216 @@@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+export DEB_BUILD_HARDENING=1
+
+TMP:=$(CURDIR)/debian/tmp/
+
+ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
+
+ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
+ TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
+endif
+
+# Skip TokuDB if arch is not amd64
+ifneq ($(ARCH), amd64)
+ TOKUDB_OPT="-DWITHOUT_TOKUDB=true"
+endif
+
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
+
+DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+DISTRIBUTION := $(shell lsb_release -i -s)
+RELEASE := $(shell lsb_release -r -s)
+
+MAKE_TEST_TARGET:=test-force
+ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
+# make test-bt is the testsuite run by the MySQL build team
+# before a release, but it is long
+ MAKE_TEST_TARGET:=test-bt
+endif
+
+USE_ASSEMBLER:=--enable-assembler
+
+ifneq (,$(filter $(ARCH), amd64 kfreebsd-amd64 i386 kfreebsd-i386 ia64 s390 s390x))
+ TESTSUITE_FAIL_CMD:=exit 1
+else
+ TESTSUITE_FAIL_CMD:=true
+endif
+
+SHARED_LIBS_DIR := $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/
+
+BUILDDIR := builddir
+builddir = $(BUILDDIR)
+
+# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
+# so it is disabled by default although, according to MySQL, it brings >10%
+# performance gain if enabled. See #299382.
+ifeq ($(STATIC_MYSQLD), 1)
+ USE_STATIC_MYSQLD:=--with-mysqld-ldflags=-all-static
+endif
+
+override_dh_auto_clean:
+ @echo "RULES.$@"
+ dh_testdir
+ dh_testroot
+ [ ! -d mysql-test/var ] || rm -rf mysql-test/var
+ rm -rf $(BUILDDIR)
+ debconf-updatepo
+
+override_dh_auto_configure: configure-stamp
+
+override_dh_prep:
+ # Don't clean /tmp/ away, it is needed by all binary packages
+
+# We explicitly set -DINSTALL_SUPPORTFILESDIR as it is incorrect in upstream
+# sources (will be fixed in 5.5.30).
+configure-stamp:
+ @echo "RULES.$@"
+ dh_testdir
+
+ # Rename shared libraries SONAME and filenames
+ # libmysqlclient18.so > libmariadbclient18.so etc
+ sed -i 's/mysqlclient/mariadbclient/g' client/CMakeLists.txt tests/CMakeLists.txt scripts/CMakeLists.txt
+ sed -i 's/mysqlclient/mariadbclient/g' libmysql/CMakeLists.txt libmysql/libmysql_versions.ld.in
+ sed -i 's/mysqlclient/mariadbclient/g' man/mysql_config.1
+ sed -i 's/mysqlclient/mariadbclient/g' scripts/make_win_bin_dist scripts/mysql_config.sh scripts/mysql_config.pl.in
+ # Patch 44_scripts__mysql_config__libs also contains 'mysqlclient' but is compatible with this
+ # Stuff in storage/ndb/* is not compiled, no need to sed it.
+ # Neither does RPM packaging related files or comments in other code need sedding.
+
+ ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
- sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
++ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \
+ CC=$${MYSQL_BUILD_CC:-gcc} \
+ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
+ CXX=$${MYSQL_BUILD_CXX:-g++} \
+ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ $(USE_STATIC_MYSQLD) \
+ -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
+ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+ -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" $(TOKUDB_OPT) \
+ -DBUILD_CONFIG=mysql_release \
+ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DDEB=1 ..'
+ touch $@
+
+override_dh_auto_build: build-stamp
+
+build-stamp:
+ @echo "RULES.$@"
+ cd $(builddir) && $(MAKE) $(AM_EXTRA_MAKEFLAGS)
+ touch $@
+
+override_dh_auto_test:
+ @echo "RULES.$@"
+ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+ cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ;
+endif
+
+override_dh_auto_install: auto_install-stamp
+
+auto_install-stamp:
+ @echo "RULES.$@"
+ dh_testdir
+ dh_testroot
+
+ # If TokuDB plugin was built
+ # add it to the server install list.
+ [ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md' >> debian/mariadb-server-5.5.install
+
+ # some self written manpages which hopefully
+ # gets overwritten sooner or later with upstreams
+ mkdir -p $(TMP)/usr/share/man/man1/
+ mkdir -p $(TMP)/usr/share/man/man8/
+ cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
+ mkdir -p $(TMP)/etc/mysql/conf.d/
+ cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
+
+ # make install (trailing slash needed for innobase)
+ cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/
+
+ # After installing, remove rpath to make lintian happy.
+ set +e; \
+ find ./debian/tmp/ -type f -print0 \
+ | xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \
+ | fgrep RPATH= \
+ | cut -d: -f 1 \
+ | xargs --no-run-if-empty chrpath -d; \
+ set -e
+
+ # libmysqlclient-dev: forgotten header file since 3.23.25?
+ cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
+ cp include/my_dir.h $(TMP)/usr/include/mysql/
+
+ # mariadb-common: MariaDB-specific config stuff.
+ install -d $(TMP)/etc/mysql/conf.d
+ install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf
+
+ # mariadb-client
+ install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
+ install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
+ install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
+
+ # mariadb-server
+ rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
+ $(TMP)/usr/share/mysql/mysql-log-rotate \
+ $(TMP)/usr/share/mysql/mysql.server \
+ $(TMP)/usr/share/mysql/binary-configure
+ nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
+ # Below didn't work, use more explicit command above
+ # nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > debian/mysqld.sym.gz
+ mkdir -p $(TMP)/etc/mysql/conf.d/
+ install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
+ install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
+ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
+ mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5
+ install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
+ install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
+
+ # install AppArmor profile
+ install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
+
+ # install Apport hook
+ install -D -m 644 debian/mariadb-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
+
+ # mariadb-test
+ mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql
+ touch $@
+
+override_dh_installlogrotate-arch:
+ dh_installlogrotate --name mysql-server
+
+# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
+# started which might depend on a running database server.
+override_dh_installinit-arch:
+ dh_installinit --name=mysql -- defaults 19 21
+
+override_dh_installcron-arch:
+ dh_installcron --name mysql-server
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
+
+binary: binary-indep binary-arch
+
+get-orig-source:
+ uscan --force-download --verbose
+
+%:
+ dh $@ --parallel
+
+# vim: ts=8
--
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