3444 Tor Didriksen 2011-10-17
Remove -icc- build files
removed:
BUILD/compile-pentium-icc
BUILD/compile-pentium-icc-valgrind-max
BUILD/compile-pentium-icc-yassl
3443 Tor Didriksen 2011-10-17
WL#5825 Using C++ Standard Library with MySQL code
Handle review comments.
@ cmake/configure.pl
typo
@ cmake/os/Windows.cmake
typo
@ include/my_pthread.h
avoid empty macro definitions
@ include/mysql/psi/mysql_thread.h
Use trylock for fast mutexes.
@ sql/filesort.cc
cosmetics
@ sql/item_cmpfunc.cc
use std::max rather than MY_MAX
@ sql/mysqld.cc
cleanup
@ sql/opt_range.cc
cosmetics
@ sql/sql_const.h
Use unsigned constants, to avoid casting when using XXX_SORT_MEMORY
@ sql/sql_plugin.h
comment
modified:
cmake/configure.pl
cmake/os/Windows.cmake
include/my_pthread.h
include/mysql/psi/mysql_thread.h
sql/filesort.cc
sql/item_cmpfunc.cc
sql/mysqld.cc
sql/opt_range.cc
sql/sql_const.h
sql/sql_plugin.h
3442 Tor Didriksen 2011-10-13 [merge]
merge trunk => wl5825
removed:
mysql-test/collections/default.release
mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
mysql-test/r/join_cache_bka_nobnl.result
mysql-test/r/join_nested_bka_nobnl.result
mysql-test/r/join_outer_bka_nobnl.result
mysql-test/r/select_all_bka_nobnl.result
mysql-test/r/select_icp_mrr_bka_nobnl.result
mysql-test/r/select_none_bka_nobnl.result
mysql-test/r/subquery_all_bka_nobnl.result
mysql-test/r/subquery_nomat_nosj_bka_nobnl.result
mysql-test/r/subquery_none_bka_nobnl.result
mysql-test/r/subquery_sj_all_bka_nobnl.result
mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result
mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result
mysql-test/r/subquery_sj_innodb_all_bka_nobnl.result
mysql-test/r/subquery_sj_innodb_none_bka_nobnl.result
mysql-test/r/subquery_sj_loosescan_bka_nobnl.result
mysql-test/r/subquery_sj_mat_bka_nobnl.result
mysql-test/r/subquery_sj_none_bka_nobnl.result
mysql-test/suite/rpl/r/rpl_insert_duplicate.result
mysql-test/suite/rpl/r/rpl_insert_select.result
mysql-test/suite/rpl/t/rpl_insert_duplicate.test
mysql-test/suite/rpl/t/rpl_insert_select.test
mysql-test/t/join_cache_bka_nobnl.test
mysql-test/t/join_nested_bka_nobnl.test
mysql-test/t/join_outer_bka_nobnl.test
mysql-test/t/select_all_bka_nobnl.test
mysql-test/t/select_icp_mrr_bka_nobnl.test
mysql-test/t/select_none_bka_nobnl.test
mysql-test/t/subquery_all_bka_nobnl.test
mysql-test/t/subquery_nomat_nosj_bka_nobnl.test
mysql-test/t/subquery_none_bka_nobnl.test
mysql-test/t/subquery_sj_all_bka_nobnl.test
mysql-test/t/subquery_sj_dupsweed_bka_nobnl.test
mysql-test/t/subquery_sj_firstmatch_bka_nobnl.test
mysql-test/t/subquery_sj_innodb_all_bka_nobnl.test
mysql-test/t/subquery_sj_innodb_none_bka_nobnl.test
mysql-test/t/subquery_sj_loosescan_bka_nobnl.test
mysql-test/t/subquery_sj_mat_bka_nobnl.test
mysql-test/t/subquery_sj_none_bka_nobnl.test
added:
mysql-test/collections/default.release.in
mysql-test/r/join_cache_bka_nixbnl.result
mysql-test/r/join_nested_bka_nixbnl.result
mysql-test/r/join_outer_bka_nixbnl.result
mysql-test/r/select_all_bka_nixbnl.result
mysql-test/r/select_icp_mrr_bka_nixbnl.result
mysql-test/r/select_none_bka_nixbnl.result
mysql-test/r/subquery_all_bka_nixbnl.result
mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
mysql-test/r/subquery_none_bka_nixbnl.result
mysql-test/r/subquery_sj_all_bka_nixbnl.result
mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
mysql-test/r/subquery_sj_innodb_all_bka_nixbnl.result
mysql-test/r/subquery_sj_innodb_none_bka_nixbnl.result
mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
mysql-test/r/subquery_sj_mat_bka_nixbnl.result
mysql-test/r/subquery_sj_none_bka_nixbnl.result
mysql-test/std_data/bug11747887-bin.000002
mysql-test/std_data/bug48633.ARM
mysql-test/std_data/bug48633.ARZ
mysql-test/std_data/bug48633.frm
mysql-test/suite/innodb/t/innodb_bug47167-master.opt
mysql-test/suite/innodb/t/innodb_file_format-master.opt
mysql-test/suite/rpl/r/binlog-hexdump.result
mysql-test/suite/rpl/r/rpl_general_log.result
mysql-test/suite/rpl/r/rpl_replicate_rewrite_db.result
mysql-test/suite/rpl/t/binlog-hexdump.test
mysql-test/suite/rpl/t/rpl_general_log.test
mysql-test/suite/rpl/t/rpl_replicate_rewrite_db.test
mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result
mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result
mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result
mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test
mysql-test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt
mysql-test/suite/sys_vars/t/innodb_monitor_disable_basic.test
mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test
mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test
mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test
mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
mysql-test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test
mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
mysql-test/suite/sys_vars/t/innodb_sync_array_size_basic.test
mysql-test/t/join_cache_bka_nixbnl.test
mysql-test/t/join_nested_bka_nixbnl.test
mysql-test/t/join_outer_bka_nixbnl.test
mysql-test/t/select_all_bka_nixbnl.test
mysql-test/t/select_icp_mrr_bka_nixbnl.test
mysql-test/t/select_none_bka_nixbnl.test
mysql-test/t/subquery_all_bka_nixbnl.test
mysql-test/t/subquery_nomat_nosj_bka_nixbnl.test
mysql-test/t/subquery_none_bka_nixbnl.test
mysql-test/t/subquery_sj_all_bka_nixbnl.test
mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test
mysql-test/t/subquery_sj_firstmatch_bka_nixbnl.test
mysql-test/t/subquery_sj_innodb_all_bka_nixbnl.test
mysql-test/t/subquery_sj_innodb_none_bka_nixbnl.test
mysql-test/t/subquery_sj_loosescan_bka_nixbnl.test
mysql-test/t/subquery_sj_mat_bka_nixbnl.test
mysql-test/t/subquery_sj_none_bka_nixbnl.test
modified:
.bzrignore
VERSION
client/mysqltest.cc
cmake/create_initial_db.cmake.in
include/heap.h
include/my_pthread.h
libmysql/authentication_win/handshake_client.cc
libmysqld/lib_sql.cc
mysql-test/CMakeLists.txt
mysql-test/collections/README
mysql-test/collections/default.experimental
mysql-test/extra/rpl_tests/rpl_insert_id.test
mysql-test/extra/rpl_tests/rpl_insert_ignore.test
mysql-test/include/commit.inc
mysql-test/include/explain_non_select.inc
mysql-test/include/icp_tests.inc
mysql-test/include/mrr_tests.inc
mysql-test/include/mtr_check.sql
mysql-test/include/subquery.inc
mysql-test/include/subquery_sj.inc
mysql-test/lib/My/CoreDump.pm
mysql-test/mysql-test-run.pl
mysql-test/r/archive.result
mysql-test/r/commit_1innodb.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf8.result
mysql-test/r/derived.result
mysql-test/r/error_simulation.result
mysql-test/r/group_by.result
mysql-test/r/having.result
mysql-test/r/heap.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/innodb_explain_non_select_all.result
mysql-test/r/innodb_explain_non_select_none.result
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_all.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/innodb_mrr.result
mysql-test/r/innodb_mrr_all.result
mysql-test/r/innodb_mrr_cost.result
mysql-test/r/innodb_mrr_cost_all.result
mysql-test/r/innodb_mrr_cost_icp.result
mysql-test/r/innodb_mrr_icp.result
mysql-test/r/innodb_mrr_none.result
mysql-test/r/join_cache_bka.result
mysql-test/r/join_cache_bkaunique.result
mysql-test/r/join_cache_nojb.result
mysql-test/r/join_nested_bka.result
mysql-test/r/join_outer.result
mysql-test/r/join_outer_bka.result
mysql-test/r/myisam_explain_non_select_all.result
mysql-test/r/myisam_explain_non_select_none.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/myisam_icp_none.result
mysql-test/r/myisam_mrr.result
mysql-test/r/myisam_mrr_all.result
mysql-test/r/myisam_mrr_cost.result
mysql-test/r/myisam_mrr_cost_all.result
mysql-test/r/myisam_mrr_cost_icp.result
mysql-test/r/myisam_mrr_icp.result
mysql-test/r/myisam_mrr_none.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/optimizer_switch.result
mysql-test/r/partition.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_innodb_plugin.result
mysql-test/r/partition_myisam.result
mysql-test/r/select_all_bka.result
mysql-test/r/select_icp_mrr_bka.result
mysql-test/r/select_none_bka.result
mysql-test/r/show_check.result
mysql-test/r/subquery_all_bka.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_bka.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_bka.result
mysql-test/r/subquery_sj_all.result
mysql-test/r/subquery_sj_all_bka.result
mysql-test/r/subquery_sj_all_bkaunique.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_bka.result
mysql-test/r/subquery_sj_dupsweed_bkaunique.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_bka.result
mysql-test/r/subquery_sj_firstmatch_bkaunique.result
mysql-test/r/subquery_sj_innodb_all_bka.result
mysql-test/r/subquery_sj_innodb_all_bkaunique.result
mysql-test/r/subquery_sj_innodb_none_bka.result
mysql-test/r/subquery_sj_innodb_none_bkaunique.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_bka.result
mysql-test/r/subquery_sj_loosescan_bkaunique.result
mysql-test/r/subquery_sj_mat.result
mysql-test/r/subquery_sj_mat_bka.result
mysql-test/r/subquery_sj_mat_bkaunique.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/subquery_sj_none_bka.result
mysql-test/r/subquery_sj_none_bkaunique.result
mysql-test/suite/binlog/r/binlog_stm_blackhole.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/engines/funcs/r/de_calendar_range.result
mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result
mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result
mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result
mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result
mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result
mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result
mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result
mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result
mysql-test/suite/engines/funcs/r/up_calendar_range.result
mysql-test/suite/engines/funcs/t/de_calendar_range.test
mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test
mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test
mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test
mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test
mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test
mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test
mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test
mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test
mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test
mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test
mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test
mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test
mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test
mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test
mysql-test/suite/engines/funcs/t/up_calendar_range.test
mysql-test/suite/innodb/r/innodb_bug52745.result
mysql-test/suite/innodb/r/innodb_bug53591.result
mysql-test/suite/innodb/r/innodb_file_format.result
mysql-test/suite/innodb/r/innodb_index_large_prefix.result
mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
mysql-test/suite/innodb/t/innodb-autoinc-44030.test
mysql-test/suite/innodb/t/innodb-autoinc.test
mysql-test/suite/innodb/t/innodb-create-options.test
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/innodb/t/innodb-zip.test
mysql-test/suite/innodb/t/innodb_bug36172.test
mysql-test/suite/innodb/t/innodb_bug52745.test
mysql-test/suite/innodb/t/innodb_bug53591.test
mysql-test/suite/innodb/t/innodb_bug56680.test
mysql-test/suite/innodb/t/innodb_file_format.test
mysql-test/suite/innodb/t/innodb_index_large_prefix.test
mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
mysql-test/suite/opt_trace/include/general.inc
mysql-test/suite/opt_trace/include/general2.inc
mysql-test/suite/opt_trace/include/range.inc
mysql-test/suite/opt_trace/include/subquery.inc
mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
mysql-test/suite/opt_trace/r/charset.result
mysql-test/suite/opt_trace/r/filesort_pq.result
mysql-test/suite/opt_trace/r/general2_no_prot.result
mysql-test/suite/opt_trace/r/general2_ps_prot.result
mysql-test/suite/opt_trace/r/general_no_prot_all.result
mysql-test/suite/opt_trace/r/general_no_prot_none.result
mysql-test/suite/opt_trace/r/general_ps_prot_all.result
mysql-test/suite/opt_trace/r/general_ps_prot_none.result
mysql-test/suite/opt_trace/r/range_no_prot.result
mysql-test/suite/opt_trace/r/range_ps_prot.result
mysql-test/suite/opt_trace/r/security_no_prot.result
mysql-test/suite/opt_trace/r/security_ps_prot.result
mysql-test/suite/opt_trace/r/subquery_no_prot.result
mysql-test/suite/opt_trace/r/subquery_ps_prot.result
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/r/rpl_insert_ignore.result
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_parallel_ddl.result
mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
mysql-test/suite/rpl/r/rpl_row_event_max_size.result
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_parallel_ddl.test
mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test
mysql-test/suite/rpl/t/rpl_row_event_max_size.test
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
mysql-test/t/archive.test
mysql-test/t/ctype_utf16.test
mysql-test/t/ctype_utf32.test
mysql-test/t/ctype_utf8.test
mysql-test/t/derived.test
mysql-test/t/error_simulation.test
mysql-test/t/file_contents.test
mysql-test/t/group_by.test
mysql-test/t/heap.test
mysql-test/t/join_cache_bka.test
mysql-test/t/join_cache_bkaunique.test
mysql-test/t/join_cache_nojb.test
mysql-test/t/join_nested_bka.test
mysql-test/t/join_outer.test
mysql-test/t/join_outer_bka.test
mysql-test/t/partition.test
mysql-test/t/partition_innodb.test
mysql-test/t/partition_innodb_plugin.test
mysql-test/t/partition_myisam.test
mysql-test/t/select_all_bka.test
mysql-test/t/select_icp_mrr_bka.test
mysql-test/t/select_none_bka.test
mysql-test/t/show_check.test
mysql-test/t/subquery_all_bka.test
mysql-test/t/subquery_nomat_nosj_bka.test
mysql-test/t/subquery_none_bka.test
mysql-test/t/subquery_sj_all_bka.test
mysql-test/t/subquery_sj_all_bkaunique.test
mysql-test/t/subquery_sj_dupsweed_bka.test
mysql-test/t/subquery_sj_dupsweed_bkaunique.test
mysql-test/t/subquery_sj_firstmatch.test
mysql-test/t/subquery_sj_firstmatch_bka.test
mysql-test/t/subquery_sj_firstmatch_bkaunique.test
mysql-test/t/subquery_sj_innodb_all_bka.test
mysql-test/t/subquery_sj_innodb_all_bkaunique.test
mysql-test/t/subquery_sj_innodb_none_bka.test
mysql-test/t/subquery_sj_innodb_none_bkaunique.test
mysql-test/t/subquery_sj_loosescan_bka.test
mysql-test/t/subquery_sj_loosescan_bkaunique.test
mysql-test/t/subquery_sj_mat_bka.test
mysql-test/t/subquery_sj_mat_bkaunique.test
mysql-test/t/subquery_sj_none_bka.test
mysql-test/t/subquery_sj_none_bkaunique.test
mysql-test/valgrind.supp
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysqld_safe.sh
sql/event_scheduler.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.h
sql/item_buff.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/item_sum.cc
sql/item_sum.h
sql/log_event.cc
sql/mysqld.cc
sql/opt_explain.cc
sql/opt_range.cc
sql/opt_trace.cc
sql/opt_trace.h
sql/opt_trace2server.cc
sql/rpl_info_file.cc
sql/rpl_master.cc
sql/rpl_rli_pdb.cc
sql/rpl_slave.cc
sql/share/errmsg-utf8.txt
sql/sp_head.cc
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.h
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_table.cc
sql/sys_vars.cc
sql/table.cc
sql/udf_example.cc
storage/archive/azio.c
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/heap/ha_heap.cc
storage/heap/hp_create.c
storage/heap/hp_info.c
storage/innobase/btr/btr0cur.c
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0stats.c
storage/innobase/ha/ha0ha.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/i_s.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0cur.h
storage/innobase/include/btr0cur.ic
storage/innobase/include/btr0sea.h
storage/innobase/include/btr0types.h
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0types.h
storage/innobase/include/ha0ha.h
storage/innobase/include/ha0ha.ic
storage/innobase/include/row0upd.ic
storage/innobase/include/sync0rw.h
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0sync.h
storage/innobase/include/ut0crc32.h
storage/innobase/os/os0file.c
storage/innobase/page/page0page.c
storage/innobase/rem/rem0rec.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/ut/ut0crc32.c
storage/myisam/ha_myisam.cc
storage/perfschema/table_ews_by_thread_by_event_name.cc
storage/perfschema/table_socket_summary_by_event_name.cc
storage/perfschema/table_socket_summary_by_instance.cc
storage/perfschema/table_socket_summary_by_instance.h
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/gunit/opt_trace-t.cc
unittest/gunit/sql_list-t.cc
unittest/mysys/my_atomic-t.c
=== removed file 'BUILD/compile-pentium-icc'
--- a/BUILD/compile-pentium-icc 2011-10-11 04:27:52 +0000
+++ b/BUILD/compile-pentium-icc 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2005 MySQL AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Note that we can't use ccache with icc as the generated .deps file will
-# then contain wrong information
-CC=icc
-CXX=icpc
-CXXLD="$CXX -static-libcxa"
-export CC CXX CXXLD
-
-c_warnings=""
-cxx_warnings=""
-extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"
-
-# Use -no-ipo if you get this error
-# IPO link: can not find "-lstdc++_shared"
-# icpc: error: problem during multi-file optimization compilation (code 1)
-extra_flags="$extra_flags -no-ipo"
-extra_configs="$pentium_configs $static_link"
-
-. "$path/FINISH.sh"
=== removed file 'BUILD/compile-pentium-icc-valgrind-max'
--- a/BUILD/compile-pentium-icc-valgrind-max 2011-10-11 04:27:52 +0000
+++ b/BUILD/compile-pentium-icc-valgrind-max 1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Note that we can't use ccache with icc as the generated .deps file will
-# then contain wrong information
-CC=icc
-CXX=icpc
-export CC CXX
-
-extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
-
-# Disable following warnings as these are generated by header files:
-# 161 unrecognized pragma
-# 444 destructor for base class xxx is not virtual
-# 279 controlling expression is constant
-# 810 conversion from ulonglong to ulong with cast
-# 981 operands are evaluated in unspecified order
-# 1292 warning for unknown 'attribute' options
-# 1469 "xxx" clobber ignored
-# 1572 floating-point equality and inequality comparisons are unreliable
-
-# In C++
-# 869 parameter "xxx" was never referenced
-# (Problem with virtual functions)
-# 874 support for placement delete is disabled
-
-c_warnings="-Wall -Wcheck -wd161,444,279,810,981,1292,1469,1572"
-cxx_warnings="$c_warnings -wd869,874"
-extra_configs="$pentium_configs $debug_configs $valgrind_configs"
-
-. "$path/FINISH.sh"
=== removed file 'BUILD/compile-pentium-icc-yassl'
--- a/BUILD/compile-pentium-icc-yassl 2011-10-11 04:27:52 +0000
+++ b/BUILD/compile-pentium-icc-yassl 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2005 MySQL AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Note that we can't use ccache with icc as the generated .deps file will
-# then contain wrong information
-CC=icc
-CXX=icpc
-CXXLD="$CXX -static-libcxa"
-export CC CXX CXXLD
-
-c_warnings=""
-cxx_warnings=""
-extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"
-
-# Use -no-ipo if you get this error
-# IPO link: can not find "-lstdc++_shared"
-# icpc: error: problem during multi-file optimization compilation (code 1)
-extra_flags="$extra_flags -no-ipo"
-extra_configs="$pentium_configs $static_link --with-yassl"
-
-. "$path/FINISH.sh"
=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl 2011-10-11 04:27:52 +0000
+++ b/cmake/configure.pl 2011-10-17 10:28:01 +0000
@@ -56,7 +56,7 @@ sub set_installdir
# CMake understands CC and CXX env.variables correctly, if they contain 1 or 2 tokens
# e.g CXX=g++ and CXX="ccache g++" are ok. However it could have a problem if there
-# (recognizing ++) with more tokens ,e.g CXX="ccache g++ --pipe".
+# (recognizing g++) with more tokens ,e.g CXX="ccache g++ --pipe".
# The problem is simply fixed by splitting compiler and flags, e.g
# CXX="ccache g++ --pipe" => CXX=ccache g++ CXXFLAGS=--pipe
=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake 2011-10-11 04:27:52 +0000
+++ b/cmake/os/Windows.cmake 2011-10-17 10:28:01 +0000
@@ -84,7 +84,7 @@ IF(MSVC)
CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
- SET("${flag}" "${${flag}} /EHcs")
+ SET("${flag}" "${${flag}} /EHsc")
ENDFOREACH()
# Fix CMake's predefined huge stack size
=== modified file 'include/my_pthread.h'
--- a/include/my_pthread.h 2011-10-13 07:26:28 +0000
+++ b/include/my_pthread.h 2011-10-17 10:28:01 +0000
@@ -529,8 +529,8 @@ void safe_mutex_end(FILE *file);
#elif defined(MY_PTHREAD_FASTMUTEX)
-#define safe_mutex_assert_owner(mp)
-#define safe_mutex_assert_not_owner(mp)
+#define safe_mutex_assert_owner(mp) do {} while (0)
+#define safe_mutex_assert_not_owner(mp) do {} while (0)
#define my_cond_timedwait(A,B,C) pthread_cond_timedwait((A), &(B)->mutex, (C))
#define my_cond_wait(A,B) pthread_cond_wait((A), &(B)->mutex)
=== modified file 'include/mysql/psi/mysql_thread.h'
--- a/include/mysql/psi/mysql_thread.h 2011-10-11 04:27:52 +0000
+++ b/include/mysql/psi/mysql_thread.h 2011-10-17 10:28:01 +0000
@@ -698,7 +698,7 @@ static inline int inline_mysql_mutex_try
#ifdef SAFE_MUTEX
result= safe_mutex_lock(&that->m_mutex, TRUE, src_file, src_line);
#elif defined(MY_PTHREAD_FASTMUTEX)
- result= my_pthread_fastmutex_lock(&that->m_mutex);
+ result= pthread_mutex_trylock(&that->m_mutex.mutex);
#else
result= pthread_mutex_trylock(&that->m_mutex);
#endif
@@ -710,7 +710,7 @@ static inline int inline_mysql_mutex_try
#ifdef SAFE_MUTEX
result= safe_mutex_lock(&that->m_mutex, TRUE, src_file, src_line);
#elif defined(MY_PTHREAD_FASTMUTEX)
- result= my_pthread_fastmutex_lock(&that->m_mutex);
+ result= pthread_mutex_trylock(&that->m_mutex.mutex);
#else
result= pthread_mutex_trylock(&that->m_mutex);
#endif
=== modified file 'sql/filesort.cc'
--- a/sql/filesort.cc 2011-10-11 04:27:52 +0000
+++ b/sql/filesort.cc 2011-10-17 10:28:01 +0000
@@ -37,6 +37,10 @@
#include "debug_sync.h"
#include "opt_trace.h"
+#include <algorithm>
+using std::max;
+using std::min;
+
/* functions defined in this file */
static void make_char_array(FILESORT_INFO *info, uint fields, uint length);
@@ -272,11 +276,11 @@ ha_rows filesort(THD *thd, TABLE *table,
DBUG_PRINT("info", ("filesort PQ is not applicable"));
const ulong min_sort_memory=
- std::max<uint>(MIN_SORT_MEMORY, param.sort_length * MERGEBUFF2);
+ max(MIN_SORT_MEMORY, param.sort_length * MERGEBUFF2);
while (memory_available >= min_sort_memory)
{
- ulong keys= memory_available / (param.rec_length + sizeof(char*));
- param.max_keys_per_buffer= std::min<uint>(num_rows, keys);
+ ha_rows keys= memory_available / (param.rec_length + sizeof(char*));
+ param.max_keys_per_buffer= static_cast<uint>(min(num_rows, keys));
make_char_array(&table_sort, param.max_keys_per_buffer, param.rec_length);
if (table_sort.sort_keys)
break;
@@ -1403,7 +1407,7 @@ uint read_to_buffer(IO_CACHE *fromfile,
register uint count;
uint length;
- if ((count= std::min<uint>((ha_rows) buffpek->max_keys,buffpek->count)))
+ if ((count=(uint) min((ha_rows) buffpek->max_keys,buffpek->count)))
{
if (mysql_file_pread(fromfile->file, (uchar*) buffpek->base,
(length= rec_length*count),
@@ -1667,7 +1671,7 @@ int merge_buffers(Sort_param *param, IO_
!= -1 && error != 0);
end:
- lastbuff->count= std::min<ha_rows>(org_max_rows-max_rows, param->max_rows);
+ lastbuff->count= min(org_max_rows-max_rows, param->max_rows);
lastbuff->file_pos= to_start_filepos;
err:
delete_queue(&queue);
=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc 2011-10-13 07:26:28 +0000
+++ b/sql/item_cmpfunc.cc 2011-10-17 10:28:01 +0000
@@ -27,6 +27,7 @@
#include "sql_parse.h" // check_stack_overrun
#include "sql_time.h" // make_truncated_value_warning
+#include <algorithm>
using std::min;
using std::max;
@@ -644,7 +645,7 @@ int Arg_comparator::set_compare_func(Ite
{
if ((*a)->decimals < NOT_FIXED_DEC && (*b)->decimals < NOT_FIXED_DEC)
{
- precision= 5 / log_10[MY_MAX((*a)->decimals, (*b)->decimals) + 1];
+ precision= 5 / log_10[max((*a)->decimals, (*b)->decimals) + 1];
if (func == &Arg_comparator::compare_real)
func= &Arg_comparator::compare_real_fixed;
else if (func == &Arg_comparator::compare_e_real)
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2011-10-13 07:26:28 +0000
+++ b/sql/mysqld.cc 2011-10-17 10:28:01 +0000
@@ -7213,7 +7213,6 @@ static void print_help()
sys_var_add_options(&all_options, sys_var::PARSE_EARLY);
add_plugin_options(&all_options, &mem_root);
std::sort(all_options.begin(), all_options.end(), std::less<my_option>());
- //sort_dynamic(&all_options, (qsort_cmp) option_cmp);
add_terminator(&all_options);
my_print_help(&all_options[0]);
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc 2011-10-13 07:26:28 +0000
+++ b/sql/opt_range.cc 2011-10-17 10:28:01 +0000
@@ -1052,7 +1052,7 @@ SEL_TREE::SEL_TREE(SEL_TREE *arg, RANGE_
{
keys_map= arg->keys_map;
type= arg->type;
- for (unsigned int idx= 0; idx < MAX_KEY; idx++)
+ for (uint idx= 0; idx < MAX_KEY; idx++)
{
if ((keys[idx]= arg->keys[idx]))
keys[idx]->increment_use_count(1);
=== modified file 'sql/sql_const.h'
--- a/sql/sql_const.h 2011-08-29 12:08:58 +0000
+++ b/sql/sql_const.h 2011-10-17 10:28:01 +0000
@@ -67,8 +67,8 @@
#define MAX_SELECT_NESTING (sizeof(nesting_map)*8-1)
-#define MAX_SORT_MEMORY 2048*1024
-#define MIN_SORT_MEMORY 32*1024
+#define MAX_SORT_MEMORY (2048U * 1024U)
+#define MIN_SORT_MEMORY (32U * 1024U)
/* Some portable defines */
=== modified file 'sql/sql_plugin.h'
--- a/sql/sql_plugin.h 2011-10-11 04:27:52 +0000
+++ b/sql/sql_plugin.h 2011-10-17 10:28:01 +0000
@@ -33,7 +33,7 @@
#include "m_string.h" /* LEX_STRING */
#include "my_alloc.h" /* MEM_ROOT */
-#include "my_getopt.h"
+#include "my_getopt.h" /* my_option */
class sys_var;
enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5825-stl branch (tor.didriksen:3442 to 3444) | Tor Didriksen | 17 Oct |
