3332 Christopher Powers 2011-07-24
WL#4896 "Performance Schema Net IO"
- Updated tests to reflect changes to performance_schema_max_stage_classes system var
modified:
mysql-test/r/mysqld--help-win.result
mysql-test/suite/perfschema/r/start_server_no_socket_class.result
mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
3331 Christopher Powers 2011-07-24
WL#4896 "Performance Schema Net IO"
- Fixed IPV6 bug
- Debug socket_instances_func -- why don't TCP connections appear in socket_instances?
modified:
mysql-test/suite/perfschema/t/socket_instances_func.test
storage/perfschema/table_events_waits.cc
storage/perfschema/table_socket_instances.h
3330 Christopher Powers 2011-07-22 [merge]
WL#4896 "Performance Schema Net IO"
Merge with mysql-trunk, pick up changes from other P_S worklogs
added:
mysql-test/include/have_optimizer_trace.inc
mysql-test/suite/opt_trace/
mysql-test/suite/opt_trace/include/
mysql-test/suite/opt_trace/include/bugs.inc
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/security.inc
mysql-test/suite/opt_trace/include/subquery.inc
mysql-test/suite/opt_trace/r/
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/debug.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/opt_trace/t/
mysql-test/suite/opt_trace/t/bugs_no_prot_all.test
mysql-test/suite/opt_trace/t/bugs_no_prot_none.test
mysql-test/suite/opt_trace/t/bugs_ps_prot_all.test
mysql-test/suite/opt_trace/t/bugs_ps_prot_none.test
mysql-test/suite/opt_trace/t/charset.test
mysql-test/suite/opt_trace/t/debug.test
mysql-test/suite/opt_trace/t/general2_no_prot.test
mysql-test/suite/opt_trace/t/general2_ps_prot.test
mysql-test/suite/opt_trace/t/general_no_prot_all.test
mysql-test/suite/opt_trace/t/general_no_prot_none.test
mysql-test/suite/opt_trace/t/general_ps_prot_all.test
mysql-test/suite/opt_trace/t/general_ps_prot_none.test
mysql-test/suite/opt_trace/t/range_no_prot.test
mysql-test/suite/opt_trace/t/range_ps_prot.test
mysql-test/suite/opt_trace/t/security_no_prot.test
mysql-test/suite/opt_trace/t/security_ps_prot.test
mysql-test/suite/opt_trace/t/subquery_no_prot.test
mysql-test/suite/opt_trace/t/subquery_ps_prot.test
mysql-test/suite/opt_trace/validate_json.py
mysql-test/suite/perfschema/include/stage_cleanup.inc
mysql-test/suite/perfschema/include/stage_setup.inc
mysql-test/suite/perfschema/r/stage_mdl_function.result
mysql-test/suite/perfschema/r/stage_mdl_global.result
mysql-test/suite/perfschema/r/stage_mdl_procedure.result
mysql-test/suite/perfschema/r/stage_mdl_table.result
mysql-test/suite/perfschema/t/stage_mdl_function.test
mysql-test/suite/perfschema/t/stage_mdl_global.test
mysql-test/suite/perfschema/t/stage_mdl_procedure.test
mysql-test/suite/perfschema/t/stage_mdl_table.test
mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result
mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result
mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
mysql-test/suite/sys_vars/r/optimizer_trace_basic.result
mysql-test/suite/sys_vars/r/optimizer_trace_features_basic.result
mysql-test/suite/sys_vars/r/optimizer_trace_limit_basic.result
mysql-test/suite/sys_vars/r/optimizer_trace_max_mem_size_basic.result
mysql-test/suite/sys_vars/r/optimizer_trace_offset_basic.result
mysql-test/suite/sys_vars/r/optimizer_trace_offset_max.result
mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
mysql-test/suite/sys_vars/t/innodb_undo_directory_basic.test
mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test
mysql-test/suite/sys_vars/t/innodb_undo_tablespaces_basic.test
mysql-test/suite/sys_vars/t/optimizer_trace_basic.test
mysql-test/suite/sys_vars/t/optimizer_trace_features_basic.test
mysql-test/suite/sys_vars/t/optimizer_trace_limit_basic.test
mysql-test/suite/sys_vars/t/optimizer_trace_max_mem_size_basic.test
mysql-test/suite/sys_vars/t/optimizer_trace_offset_basic.test
mysql-test/suite/sys_vars/t/optimizer_trace_offset_max-master.opt
mysql-test/suite/sys_vars/t/optimizer_trace_offset_max.test
sql/opt_trace.cc
sql/opt_trace.h
sql/opt_trace2server.cc
sql/opt_trace_Doxyfile
sql/opt_trace_context.h
unittest/gunit/opt_trace-t.cc
modified:
.bzrignore
CMakeLists.txt
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqltest.cc
config.h.cmake
configure.cmake
dbug/dbug.c
dbug/dbug_analyze.c
dbug/my_main.c
dbug/tests.c
include/my_getopt.h
include/my_sys.h
include/mysql/plugin.h
include/mysql/plugin_audit.h.pp
include/mysql/plugin_auth.h.pp
include/mysql/plugin_ftparser.h.pp
include/mysql/psi/psi.h
include/mysql/psi/psi_abi_v1.h.pp
libmysqld/examples/CMakeLists.txt
mysql-test/collections/default.daily
mysql-test/collections/default.experimental
mysql-test/collections/default.weekly
mysql-test/extra/rpl_tests/rpl_reset_slave.test
mysql-test/include/subquery.inc
mysql-test/lib/mtr_cases.pm
mysql-test/mysql-test-run.pl
mysql-test/r/archive_gis.result
mysql-test/r/auto_increment.result
mysql-test/r/bench_count_distinct.result
mysql-test/r/bigint.result
mysql-test/r/case.result
mysql-test/r/cast.result
mysql-test/r/compare.result
mysql-test/r/compress.result
mysql-test/r/ctype_binary.result
mysql-test/r/ctype_collate.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf8.result
mysql-test/r/date_formats.result
mysql-test/r/explain.result
mysql-test/r/fulltext.result
mysql-test/r/func_compress.result
mysql-test/r/func_crypt.result
mysql-test/r/func_default.result
mysql-test/r/func_encrypt.result
mysql-test/r/func_gconcat.result
mysql-test/r/func_group.result
mysql-test/r/func_if.result
mysql-test/r/func_in_all.result
mysql-test/r/func_in_icp.result
mysql-test/r/func_in_icp_mrr.result
mysql-test/r/func_in_mrr.result
mysql-test/r/func_in_mrr_cost.result
mysql-test/r/func_in_none.result
mysql-test/r/func_like.result
mysql-test/r/func_math.result
mysql-test/r/func_op.result
mysql-test/r/func_regexp.result
mysql-test/r/func_set.result
mysql-test/r/func_str.result
mysql-test/r/func_system.result
mysql-test/r/func_test.result
mysql-test/r/func_time.result
mysql-test/r/gis.result
mysql-test/r/group_by.result
mysql-test/r/group_min_max.result
mysql-test/r/having.result
mysql-test/r/information_schema.result
mysql-test/r/information_schema_db.result
mysql-test/r/innodb_explain_non_select_all.result
mysql-test/r/innodb_explain_non_select_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/insert_update.result
mysql-test/r/join.result
mysql-test/r/join_nested.result
mysql-test/r/join_nested_jcl6.result
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/merge.result
mysql-test/r/myisam_explain_non_select_all.result
mysql-test/r/myisam_explain_non_select_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/mysqlshow.result
mysql-test/r/named_pipe.result
mysql-test/r/negation_elimination.result
mysql-test/r/null.result
mysql-test/r/olap.result
mysql-test/r/order_by_all.result
mysql-test/r/order_by_icp_mrr.result
mysql-test/r/order_by_none.result
mysql-test/r/partition.result
mysql-test/r/partition_pruning.result
mysql-test/r/ps.result
mysql-test/r/query_cache.result
mysql-test/r/row.result
mysql-test/r/select_all.result
mysql-test/r/select_all_jcl6.result
mysql-test/r/select_icp_mrr.result
mysql-test/r/select_icp_mrr_jcl6.result
mysql-test/r/select_none.result
mysql-test/r/select_none_jcl6.result
mysql-test/r/shm.result
mysql-test/r/ssl.result
mysql-test/r/ssl_compress.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_mat.result
mysql-test/r/subquery_mat_all.result
mysql-test/r/subquery_mat_none.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_jcl6.result
mysql-test/r/subquery_sj_all.result
mysql-test/r/subquery_sj_all_jcl6.result
mysql-test/r/subquery_sj_all_jcl7.result
mysql-test/r/subquery_sj_dupsweed.result
mysql-test/r/subquery_sj_dupsweed_jcl6.result
mysql-test/r/subquery_sj_dupsweed_jcl7.result
mysql-test/r/subquery_sj_firstmatch.result
mysql-test/r/subquery_sj_firstmatch_jcl6.result
mysql-test/r/subquery_sj_firstmatch_jcl7.result
mysql-test/r/subquery_sj_loosescan.result
mysql-test/r/subquery_sj_loosescan_jcl6.result
mysql-test/r/subquery_sj_loosescan_jcl7.result
mysql-test/r/subquery_sj_mat.result
mysql-test/r/subquery_sj_mat_jcl6.result
mysql-test/r/subquery_sj_mat_jcl7.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/subquery_sj_none_jcl6.result
mysql-test/r/subquery_sj_none_jcl7.result
mysql-test/r/subselect_innodb.result
mysql-test/r/type_blob.result
mysql-test/r/type_datetime.result
mysql-test/r/udf.result
mysql-test/r/union.result
mysql-test/r/varbinary.result
mysql-test/r/variables.result
mysql-test/r/view.result
mysql-test/suite/binlog/r/binlog_stm_blackhole.result
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/innodb/r/innodb_bug54044.result
mysql-test/suite/innodb/r/innodb_gis.result
mysql-test/suite/innodb/t/innodb_bug54044.test
mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
mysql-test/suite/perfschema/include/event_aggregate_load.inc
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc
mysql-test/suite/perfschema/include/table_aggregate_load.inc
mysql-test/suite/perfschema/include/table_aggregate_setup.inc
mysql-test/suite/perfschema/r/dml_setup_objects.result
mysql-test/suite/perfschema/r/event_aggregate.result
mysql-test/suite/perfschema/r/information_schema.result
mysql-test/suite/perfschema/r/ortho_iter.result
mysql-test/suite/perfschema/r/pfs_upgrade.result
mysql-test/suite/perfschema/r/privilege_table_io.result
mysql-test/suite/perfschema/r/schema.result
mysql-test/suite/perfschema/r/setup_objects.result
mysql-test/suite/perfschema/r/start_server_innodb.result
mysql-test/suite/perfschema/r/start_server_no_cond_class.result
mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
mysql-test/suite/perfschema/r/start_server_no_file_class.result
mysql-test/suite/perfschema/r/start_server_no_file_inst.result
mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
mysql-test/suite/perfschema/r/start_server_no_stages_history.result
mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
mysql-test/suite/perfschema/r/start_server_no_statement_class.result
mysql-test/suite/perfschema/r/start_server_no_statements_history.result
mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
mysql-test/suite/perfschema/r/start_server_no_table_inst.result
mysql-test/suite/perfschema/r/start_server_no_thread_class.result
mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
mysql-test/suite/perfschema/r/start_server_off.result
mysql-test/suite/perfschema/r/start_server_on.result
mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_off.result
mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
mysql-test/suite/perfschema/r/table_schema.result
mysql-test/suite/perfschema/t/dml_setup_objects.test
mysql-test/suite/perfschema/t/privilege_table_io.test
mysql-test/suite/perfschema/t/setup_objects.test
mysql-test/suite/rpl/r/rpl_get_lock.result
mysql-test/suite/rpl/r/rpl_master_pos_wait.result
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/t/all_vars.test
mysql-test/t/func_if.test
mysql-test/t/func_math.test
mysql-test/t/implicit_commit.test
mysql-test/t/merge.test
mysys/array.c
mysys/my_alloc.c
mysys/my_getopt.c
mysys/my_init.c
mysys/my_malloc.c
mysys/my_static.c
mysys/mysys_priv.h
mysys/psi_noop.cc
mysys/thr_lock.c
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.h
plugin/semisync/semisync_master_plugin.cc
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/binlog.cc
sql/event_queue.cc
sql/event_queue.h
sql/event_scheduler.cc
sql/event_scheduler.h
sql/events.cc
sql/events.h
sql/field.cc
sql/gen_lex_hash.cc
sql/ha_ndbcluster.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_func.cc
sql/item_subselect.cc
sql/item_subselect.h
sql/log_event.cc
sql/mdl.cc
sql/mdl.h
sql/mysqld.cc
sql/mysqld.h
sql/opt_explain.cc
sql/opt_range.cc
sql/opt_range.h
sql/replication.h
sql/rpl_master.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_rli.cc
sql/rpl_slave.cc
sql/set_var.cc
sql/set_var.h
sql/sp_head.cc
sql/sp_head.h
sql/sql_array.h
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_derived.cc
sql/sql_help.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_plugin.h
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_test.cc
sql/sql_test.h
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/sys_vars.h
sql/table.cc
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0rea.c
storage/innobase/dict/dict0crea.c
storage/innobase/fil/fil0fil.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/buf0lru.h
storage/innobase/include/buf0rea.h
storage/innobase/include/os0file.h
storage/innobase/include/os0file.ic
storage/innobase/include/srv0srv.h
storage/innobase/include/trx0rseg.h
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0sys.ic
storage/innobase/include/ut0ut.h
storage/innobase/log/log0recv.c
storage/innobase/os/os0file.c
storage/innobase/row/row0purge.c
storage/innobase/srv/srv0mon.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rseg.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0ut.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_open.c
storage/perfschema/pfs.cc
storage/perfschema/pfs_defaults.cc
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_server.h
storage/perfschema/pfs_setup_object.cc
storage/perfschema/table_setup_objects.cc
storage/perfschema/table_setup_objects.h
strings/decimal.c
support-files/mysql.spec.sh
unittest/gunit/CMakeLists.txt
unittest/gunit/my_decimal-t.cc
unittest/gunit/test_mdl_context_owner.h
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result 2011-07-22 20:08:29 +0000
+++ b/mysql-test/r/mysqld--help-win.result 2011-07-25 03:40:14 +0000
@@ -4,24 +4,24 @@ The following options may be given as th
--defaults-file=# Only read default options from the given file #.
--defaults-extra-file=# Read this file after the global files are read.
- --abort-slave-event-count=#
+ --abort-slave-event-count=#
Option used by mysql-test for debugging and testing of
replication.
- --allow-suspicious-udfs
+ --allow-suspicious-udfs
Allows use of UDFs consisting of only one symbol xxx()
without corresponding xxx_init() or xxx_deinit(). That
also means that one can load any function from any
library, for example exit() from libc.so
-a, --ansi Use ANSI SQL syntax instead of MySQL syntax. This mode
will also set transaction isolation level 'serializable'.
- --auto-increment-increment[=#]
+ --auto-increment-increment[=#]
Auto-increment columns are incremented by this
- --auto-increment-offset[=#]
+ --auto-increment-offset[=#]
Offset added to Auto-increment columns. Used when
auto-increment-increment != 1
--autocommit Set default value for autocommit (0 or 1)
(Defaults to on; use --skip-autocommit to disable.)
- --automatic-sp-privileges
+ --automatic-sp-privileges
Creating and dropping stored procedures alters ACLs
(Defaults to on; use --skip-automatic-sp-privileges to disable.)
--back-log=# The number of outstanding connection requests MySQL can
@@ -32,16 +32,16 @@ The following options may be given as th
--big-tables Allow big result sets by saving all temporary sets on
file (Solves most 'table full' errors)
--bind-address=name IP address to bind to.
- --binlog-cache-size=#
+ --binlog-cache-size=#
The size of the transactional cache for updates to
transactional engines for the binary log. If you often
use transactions containing many statements, you can
increase this to get more performance
- --binlog-checksum=name
+ --binlog-checksum=name
Type of BINLOG_CHECKSUM_ALG. Include checksum for log
events in the binary log. Possible values are NONE and
CRC32; default is NONE.
- --binlog-direct-non-transactional-updates
+ --binlog-direct-non-transactional-updates
Causes updates to non-transactional engines using
statement format to be written directly to binary log.
Before using this option make sure that there are no
@@ -52,7 +52,7 @@ The following options may be given as th
--binlog-do-db=name Tells the master it should log updates for the specified
database, and exclude all others not explicitly
mentioned.
- --binlog-format=name
+ --binlog-format=name
What form of binary logging the master will use: either
ROW for row-based binary logging, STATEMENT for
statement-based binary logging, or MIXED. MIXED is
@@ -64,14 +64,14 @@ The following options may be given as th
binlog-format is MIXED, the format switches to row-based
and back implicitly per each query accessing an
NDBCLUSTER table
- --binlog-ignore-db=name
+ --binlog-ignore-db=name
Tells the master that updates to the given database
should not be logged to the binary log.
- --binlog-row-event-max-size=#
+ --binlog-row-event-max-size=#
The maximum size of a row-based binary log event in
bytes. Rows will be grouped into events smaller than this
size if possible. The value has to be a multiple of 256.
- --binlog-row-image=name
+ --binlog-row-image=name
Controls whether rows should be logged in 'FULL',
'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all
columns in the before and after image are logged.
@@ -82,34 +82,34 @@ The following options may be given as th
the table) is logged in the before image, and only
changed columns are logged in the after image. (Default:
FULL).
- --binlog-rows-query-log-events
+ --binlog-rows-query-log-events
Allow writing of Rows_query_log events into binary log.
- --binlog-stmt-cache-size=#
+ --binlog-stmt-cache-size=#
The size of the statement cache for updates to
non-transactional engines for the binary log. If you
often use statements updating a great number of rows, you
can increase this to get more performance
--bootstrap Used by mysql installation scripts.
- --bulk-insert-buffer-size=#
+ --bulk-insert-buffer-size=#
Size of tree cache used in bulk insert optimisation. Note
that this is a limit per thread!
- --character-set-client-handshake
+ --character-set-client-handshake
Don't ignore client side character set value sent during
handshake.
(Defaults to on; use --skip-character-set-client-handshake to disable.)
- --character-set-filesystem=name
+ --character-set-filesystem=name
Set the filesystem character set.
- -C, --character-set-server=name
+ -C, --character-set-server=name
Set the default character set.
- --character-sets-dir=name
+ --character-sets-dir=name
Directory where character sets are
-r, --chroot=name Chroot mysqld daemon during startup.
- --collation-server=name
+ --collation-server=name
Set the default collation.
- --completion-type=name
+ --completion-type=name
The transaction completion type, one of NO_CHAIN, CHAIN,
RELEASE
- --concurrent-insert[=name]
+ --concurrent-insert[=name]
Use concurrent insert with MyISAM. Possible values are
NEVER, AUTO, ALWAYS
--connect-timeout=# The number of seconds the mysqld server is waiting for a
@@ -119,55 +119,55 @@ The following options may be given as th
--core-file Write core on errors.
-h, --datadir=name Path to the database root directory
--date-format=name The DATE format (ignored)
- --datetime-format=name
+ --datetime-format=name
The DATETIME format (ignored)
- --default-storage-engine=name
+ --default-storage-engine=name
The default storage engine for new tables
- --default-temp-storage-engine=name
+ --default-temp-storage-engine=name
The default storage engine for new explict temporary
tables
- --default-time-zone=name
+ --default-time-zone=name
Set the default time zone.
- --default-week-format=#
+ --default-week-format=#
The default week format used by WEEK() functions
- --delay-key-write[=name]
+ --delay-key-write[=name]
Type of DELAY_KEY_WRITE
- --delayed-insert-limit=#
+ --delayed-insert-limit=#
After inserting delayed_insert_limit rows, the INSERT
DELAYED handler will check if there are any SELECT
statements pending. If so, it allows these to execute
before continuing
- --delayed-insert-timeout=#
+ --delayed-insert-timeout=#
How long a INSERT DELAYED thread should wait for INSERT
statements before terminating
- --delayed-queue-size=#
+ --delayed-queue-size=#
What size queue (in rows) should be allocated for
handling INSERT DELAYED. If the queue becomes full, any
client that does INSERT DELAYED will wait until there is
room in the queue again
- --disconnect-slave-event-count=#
+ --disconnect-slave-event-count=#
Option used by mysql-test for debugging and testing of
replication.
- --div-precision-increment=#
+ --div-precision-increment=#
Precision of the result of '/' operator will be increased
on that value
- --event-scheduler[=name]
+ --event-scheduler[=name]
Enable the event scheduler. Possible values are ON, OFF,
and DISABLED (keep the event scheduler completely
deactivated, it cannot be activated run-time)
-T, --exit-info[=#] Used for debugging. Use at your own risk.
- --expire-logs-days=#
+ --expire-logs-days=#
If non-zero, binary logs will be purged after
expire_logs_days days; possible purges happen at startup
and at binary log rotation
- --external-locking Use system (external) locking (disabled by default).
+ --external-locking Use system (external) locking (disabled by default).
With this option enabled you can run myisamchk to test
(not repair) tables while the MySQL server is running.
Disable with --skip-external-locking.
--flush Flush MyISAM tables to disk between SQL commands
--flush-time=# A dedicated thread is created to flush all tables at the
given interval
- --ft-boolean-syntax=name
+ --ft-boolean-syntax=name
List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
MODE)
--ft-max-word-len=# The maximum length of the word to be included in a
@@ -176,68 +176,68 @@ The following options may be given as th
--ft-min-word-len=# The minimum length of the word to be included in a
FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
after changing this variable
- --ft-query-expansion-limit=#
+ --ft-query-expansion-limit=#
Number of best matches to use for query expansion
- --ft-stopword-file=name
+ --ft-stopword-file=name
Use stopwords from this file instead of built-in list
--gdb Set up signals usable for debugging.
--general-log Log connections and queries to a table or log file.
Defaults logging to a file hostname.log or a table
mysql.general_logif --log-output=TABLE is used
- --general-log-file=name
+ --general-log-file=name
Log connections and queries to given file
- --group-concat-max-len=#
- The maximum length of the result of function
+ --group-concat-max-len=#
+ The maximum length of the result of function
GROUP_CONCAT()
-?, --help Display this help and exit.
- --ignore-builtin-innodb
+ --ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin
--init-connect=name Command(s) that are executed for each new connection
--init-file=name Read SQL commands from this file at startup
--init-slave=name Command(s) that are executed by a slave server each time
the SQL thread starts
- --interactive-timeout=#
+ --interactive-timeout=#
The number of seconds the server waits for activity on an
interactive connection before closing it
- --join-buffer-size=#
+ --join-buffer-size=#
The size of the buffer that is used for full joins
- --keep-files-on-create
+ --keep-files-on-create
Don't overwrite stale .MYD and .MYI even if no directory
is specified
--key-buffer-size=# The size of the buffer used for index blocks for MyISAM
tables. Increase this to get better index handling (for
all reads and multiple writes) to as much as you can
afford
- --key-cache-age-threshold=#
+ --key-cache-age-threshold=#
This characterizes the number of hits a hot block has to
be untouched until it is considered aged enough to be
downgraded to a warm block. This specifies the percentage
ratio of that number of hits to the total number of
blocks in key cache
- --key-cache-block-size=#
+ --key-cache-block-size=#
The default size of key cache blocks
- --key-cache-division-limit=#
+ --key-cache-division-limit=#
The minimum percentage of warm blocks in key cache
-L, --language=name Client error messages in given language. May be given as
a full path. Deprecated. Use --lc-messages-dir instead.
--lc-messages=name Set the language used for the error messages.
- --lc-messages-dir=name
+ --lc-messages-dir=name
Directory where error messages are
- --lc-time-names=name
+ --lc-time-names=name
Set the language used for the month names and the days of
the week.
--local-infile Enable LOAD DATA LOCAL INFILE
(Defaults to on; use --skip-local-infile to disable.)
- --lock-wait-timeout=#
+ --lock-wait-timeout=#
Timeout in seconds to wait for a lock before returning an
error.
--log-bin[=name] Log update queries in binary format. Optional (but
strongly recommended to avoid replication problems if
server's hostname changes) argument should be the chosen
location for the binary log files.
- --log-bin-index=name
+ --log-bin-index=name
File that holds the names for binary log files.
- --log-bin-trust-function-creators
+ --log-bin-trust-function-creators
If set to FALSE (the default), then when --log-bin is
used, creation of a stored function (or trigger) is
allowed only to users having the SUPER privilege and only
@@ -250,7 +250,7 @@ The following options may be given as th
--log-isam[=name] Log all MyISAM changes to file.
--log-output=name Syntax: log-output=value[,value...], where "value" could
be TABLE, FILE or NONE
- --log-queries-not-using-indexes
+ --log-queries-not-using-indexes
Log queries that are executed without benefit of any
index to the slow log if it is open
--log-short-format Don't log extra information to update and slow-query
@@ -258,134 +258,134 @@ The following options may be given as th
--log-slave-updates Tells the slave to log the updates from the slave thread
to the binary log. You will need to turn it on if you
plan to daisy-chain the slaves
- --log-slow-admin-statements
+ --log-slow-admin-statements
Log slow OPTIMIZE, ANALYZE, ALTER and other
administrative statements to the slow log if it is open.
- --log-slow-slave-statements
+ --log-slow-slave-statements
Log slow statements executed by slave thread to the slow
log if it is open.
--log-tc=name Path to transaction coordinator log (used for
transactions that affect more than one storage engine,
when binary log is disabled).
--log-tc-size=# Size of transaction coordinator log.
- -W, --log-warnings[=#]
+ -W, --log-warnings[=#]
Log some not critical warnings to the log file
--long-query-time=# Log all queries that have taken more than long_query_time
seconds to execute to file. The argument will be treated
as a decimal value with microsecond precision
- --low-priority-updates
+ --low-priority-updates
INSERT/DELETE/UPDATE has lower priority than selects
- --lower-case-table-names[=#]
+ --lower-case-table-names[=#]
If set to 1 table names are stored in lowercase on disk
and table names will be case-insensitive. Should be set
to 2 if you are using a case insensitive file system
- --master-info-file=name
+ --master-info-file=name
The location and name of the file that remembers the
master and where the I/O replication thread is in the
master's binlogs.
- --master-info-repository=name
+ --master-info-repository=name
Defines the type of the repository for the master
information.
- --master-retry-count=#
+ --master-retry-count=#
The number of tries the slave will make to connect to the
master before giving up. Deprecated option, use 'CHANGE
MASTER TO master_retry_count = <num>' instead.
- --master-verify-checksum
+ --master-verify-checksum
Force checksum verification of logged events in binary
log before sending them to slaves or printing them in
output of SHOW BINLOG EVENTS. Disabled by default.
- --max-allowed-packet=#
+ --max-allowed-packet=#
Max packet length to send to or receive from the server
- --max-binlog-cache-size=#
+ --max-binlog-cache-size=#
Sets the total size of the transactional cache
- --max-binlog-dump-events=#
+ --max-binlog-dump-events=#
Option used by mysql-test for debugging and testing of
replication.
--max-binlog-size=# Binary log will be rotated automatically when the size
exceeds this value. Will also apply to relay logs if
max_relay_log_size is 0
- --max-binlog-stmt-cache-size=#
+ --max-binlog-stmt-cache-size=#
Sets the total size of the statement cache
- --max-connect-errors=#
+ --max-connect-errors=#
If there is more than this number of interrupted
connections from a host this host will be blocked from
further connections
--max-connections=# The number of simultaneous clients allowed
- --max-delayed-threads=#
+ --max-delayed-threads=#
Don't start more than this number of threads to handle
INSERT DELAYED statements. If set to zero INSERT DELAYED
will be not used
--max-error-count=# Max number of errors/warnings to store for a statement
- --max-heap-table-size=#
+ --max-heap-table-size=#
Don't allow creation of heap tables bigger than this
--max-join-size=# Joins that are probably going to read more than
max_join_size records return an error
- --max-length-for-sort-data=#
+ --max-length-for-sort-data=#
Max number of bytes in sorted records
- --max-prepared-stmt-count=#
+ --max-prepared-stmt-count=#
Maximum number of prepared statements in the server
- --max-relay-log-size=#
+ --max-relay-log-size=#
If non-zero: relay log will be rotated automatically when
the size exceeds this value; if zero: when the size
exceeds max_binlog_size
- --max-seeks-for-key=#
+ --max-seeks-for-key=#
Limit assumed max number of seeks when looking up rows
based on a key
--max-sort-length=# The number of bytes to use when sorting BLOB or TEXT
values (only the first max_sort_length bytes of each
value are used; the rest are ignored)
- --max-sp-recursion-depth[=#]
+ --max-sp-recursion-depth[=#]
Maximum stored procedure recursion depth
--max-tmp-tables=# Maximum number of temporary tables a client can keep open
at a time
- --max-user-connections=#
+ --max-user-connections=#
The maximum number of active connections for a single
user (0 = no limit)
- --max-write-lock-count=#
+ --max-write-lock-count=#
After this many write locks, allow some read locks to run
in between
--memlock Lock mysqld in memory.
- --min-examined-row-limit=#
+ --min-examined-row-limit=#
Don't write queries to slow log that examine fewer rows
than that
- --multi-range-count=#
+ --multi-range-count=#
Number of key ranges to request at once
- --myisam-block-size=#
+ --myisam-block-size=#
Block size to be used for MyISAM index pages
- --myisam-data-pointer-size=#
+ --myisam-data-pointer-size=#
Default pointer size to be used for MyISAM tables
- --myisam-max-sort-file-size=#
+ --myisam-max-sort-file-size=#
Don't use the fast sort index method to created index if
the temporary file would get bigger than this
- --myisam-mmap-size=#
+ --myisam-mmap-size=#
Restricts the total memory used for memory mapping of
MySQL tables
- --myisam-recover-options[=name]
+ --myisam-recover-options[=name]
Syntax: myisam-recover-options[=option[,option...]],
where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
- --myisam-repair-threads=#
+ --myisam-repair-threads=#
If larger than 1, when repairing a MyISAM table all
indexes will be created in parallel, with one thread per
index. The value of 1 disables parallel repair
- --myisam-sort-buffer-size=#
+ --myisam-sort-buffer-size=#
The buffer that is allocated when sorting the index when
doing a REPAIR or when creating indexes with CREATE INDEX
or ALTER TABLE
- --myisam-stats-method=name
+ --myisam-stats-method=name
Specifies how MyISAM index statistics collection code
should treat NULLs. Possible values of name are
NULLS_UNEQUAL (default behavior for 4.1 and later),
NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
--myisam-use-mmap Use memory mapping for reading and writing MyISAM tables
--named-pipe Enable the named pipe (NT)
- --net-buffer-length=#
+ --net-buffer-length=#
Buffer length for TCP/IP and socket communication
- --net-read-timeout=#
+ --net-read-timeout=#
Number of seconds to wait for more data from a connection
before aborting the read
--net-retry-count=# If a read on a communication port is interrupted, retry
this many times before giving up
- --net-write-timeout=#
+ --net-write-timeout=#
Number of seconds to wait for a block to be written to a
connection before aborting the write
-n, --new Use very new possible "unsafe" functions
@@ -393,27 +393,27 @@ The following options may be given as th
--old-alter-table Use old, non-optimized alter table
--old-passwords Use old password encryption method (needed for 4.0 and
older clients)
- --old-style-user-limits
+ --old-style-user-limits
Enable old-style user limits (before 5.0.3, user
resources were counted per each user+host vs. per
account).
- --open-files-limit=#
+ --open-files-limit=#
If this is not 0, then mysqld will use this value to
reserve file descriptors to use with setrlimit(). If this
value is 0 then mysqld will reserve max_connections*5 or
max_connections + table_cache*2 (whichever is larger)
number of file descriptors
- --optimizer-join-cache-level=#
+ --optimizer-join-cache-level=#
Controls what join operations can be executed with join
buffers. Odd numbers are used for plain join buffers
while even numbers are used for linked buffers
- --optimizer-prune-level=#
+ --optimizer-prune-level=#
Controls the heuristic(s) applied during query
optimization to prune less-promising partial plans from
the optimizer search space. Meaning: 0 - do not apply any
heuristic, thus perform exhaustive search; 1 - prune
plans based on number of retrieved rows
- --optimizer-search-depth=#
+ --optimizer-search-depth=#
Maximum depth of search performed by the query optimizer.
Values larger than the number of relations in a query
result in better query plans, but take longer to compile
@@ -421,81 +421,81 @@ The following options may be given as th
relation result in faster optimization, but may produce
very bad query plans. If set to 0, the system will
automatically pick a reasonable value
- --optimizer-switch=name
+ --optimizer-switch=name
optimizer_switch=option=val[,option=val...], where option
is one of {index_merge, index_merge_union,
index_merge_sort_union, index_merge_intersection,
engine_condition_pushdown, index_condition_pushdown, mrr,
mrr_cost_based} and val is one of {on, off, default}
- --optimizer-trace=name
+ --optimizer-trace=name
Controls tracing of the Optimizer:
optimizer_trace=option=val[,option=val...], where option
is one of {enabled, end_marker, one_line} and val is one
of {on, off, default}
- --optimizer-trace-features=name
+ --optimizer-trace-features=name
Enables/disables tracing of selected features of the
Optimizer:
optimizer_trace_features=option=val[,option=val...],
where option is one of {greedy_search, range_optimizer,
dynamic_range, repeated_subselect} and val is one of {on,
off, default}
- --optimizer-trace-limit=#
+ --optimizer-trace-limit=#
Maximum number of shown optimizer traces
- --optimizer-trace-max-mem-size=#
+ --optimizer-trace-max-mem-size=#
Maximum allowed cumulated size of stored optimizer traces
- --optimizer-trace-offset=#
+ --optimizer-trace-offset=#
Offset of first optimizer trace to show; see manual
- --performance-schema
+ --performance-schema
Enable the performance schema.
- --performance-schema-events-stages-history-long-size=#
+ --performance-schema-events-stages-history-long-size=#
Number of rows in EVENTS_STAGES_HISTORY_LONG.
- --performance-schema-events-stages-history-size=#
+ --performance-schema-events-stages-history-size=#
Number of rows per thread in EVENTS_STAGES_HISTORY.
- --performance-schema-events-statements-history-long-size=#
+ --performance-schema-events-statements-history-long-size=#
Number of rows in EVENTS_STATEMENTS_HISTORY_LONG.
- --performance-schema-events-statements-history-size=#
+ --performance-schema-events-statements-history-size=#
Number of rows per thread in EVENTS_STATEMENTS_HISTORY.
- --performance-schema-events-waits-history-long-size=#
+ --performance-schema-events-waits-history-long-size=#
Number of rows in EVENTS_WAITS_HISTORY_LONG.
- --performance-schema-events-waits-history-size=#
+ --performance-schema-events-waits-history-size=#
Number of rows per thread in EVENTS_WAITS_HISTORY.
- --performance-schema-max-cond-classes=#
+ --performance-schema-max-cond-classes=#
Maximum number of condition instruments.
- --performance-schema-max-cond-instances=#
+ --performance-schema-max-cond-instances=#
Maximum number of instrumented condition objects.
- --performance-schema-max-file-classes=#
+ --performance-schema-max-file-classes=#
Maximum number of file instruments.
- --performance-schema-max-file-handles=#
+ --performance-schema-max-file-handles=#
Maximum number of opened instrumented files.
- --performance-schema-max-file-instances=#
+ --performance-schema-max-file-instances=#
Maximum number of instrumented files.
- --performance-schema-max-mutex-classes=#
+ --performance-schema-max-mutex-classes=#
Maximum number of mutex instruments.
- --performance-schema-max-mutex-instances=#
+ --performance-schema-max-mutex-instances=#
Maximum number of instrumented MUTEX objects.
- --performance-schema-max-rwlock-classes=#
+ --performance-schema-max-rwlock-classes=#
Maximum number of rwlock instruments.
- --performance-schema-max-rwlock-instances=#
+ --performance-schema-max-rwlock-instances=#
Maximum number of instrumented RWLOCK objects.
- --performance-schema-max-socket-classes=#
+ --performance-schema-max-socket-classes=#
Maximum number of socket instruments.
- --performance-schema-max-socket-instances=#
+ --performance-schema-max-socket-instances=#
Maximum number of opened instrumented sockets.
- --performance-schema-max-stage-classes=#
+ --performance-schema-max-stage-classes=#
Maximum number of stage instruments.
- --performance-schema-max-statement-classes=#
+ --performance-schema-max-statement-classes=#
Maximum number of statement instruments.
- --performance-schema-max-table-handles=#
+ --performance-schema-max-table-handles=#
Maximum number of opened instrumented tables.
- --performance-schema-max-table-instances=#
+ --performance-schema-max-table-instances=#
Maximum number of instrumented tables.
- --performance-schema-max-thread-classes=#
+ --performance-schema-max-thread-classes=#
Maximum number of thread instruments.
- --performance-schema-max-thread-instances=#
+ --performance-schema-max-thread-instances=#
Maximum number of instrumented threads.
- --performance-schema-setup-actors-size=#
+ --performance-schema-setup-actors-size=#
Maximum number of rows in SETUP_ACTORS.
- --performance-schema-setup-objects-size=#
+ --performance-schema-setup-objects-size=#
Maximum number of rows in SETUP_OBJECTS.
--pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins
@@ -506,34 +506,34 @@ The following options may be given as th
-P, --port=# Port number to use for connection or 0 to default to,
my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default
(3306), whatever comes first
- --port-open-timeout=#
+ --port-open-timeout=#
Maximum time in seconds to wait for the port to become
free. (Default: No wait).
- --preload-buffer-size=#
+ --preload-buffer-size=#
The size of the buffer that is allocated when preloading
indexes
- --profiling-history-size=#
+ --profiling-history-size=#
Limit of query profiling memory
- --query-alloc-block-size=#
+ --query-alloc-block-size=#
Allocation block size for query parsing and execution
- --query-cache-limit=#
+ --query-cache-limit=#
Don't cache results that are bigger than this
- --query-cache-min-res-unit=#
+ --query-cache-min-res-unit=#
The minimum size for blocks allocated by the query cache
- --query-cache-size=#
+ --query-cache-size=#
The memory allocated to store results from old queries
- --query-cache-type=name
+ --query-cache-type=name
OFF = Don't cache or retrieve results. ON = Cache all
results except SELECT SQL_NO_CACHE ... queries. DEMAND =
Cache only SELECT SQL_CACHE ... queries
- --query-cache-wlock-invalidate
+ --query-cache-wlock-invalidate
Invalidate queries in query cache on LOCK for write
- --query-prealloc-size=#
+ --query-prealloc-size=#
Persistent buffer for query parsing and execution
- --range-alloc-block-size=#
+ --range-alloc-block-size=#
Allocation block size for storing ranges during
optimization
- --read-buffer-size=#
+ --read-buffer-size=#
Each thread that does a sequential scan allocates a
buffer of this size for each table it scans. If you do
many sequential scans, you may want to increase this
@@ -541,29 +541,29 @@ The following options may be given as th
--read-only Make all non-temporary tables read-only, with the
exception for replication (slave) threads and users with
the SUPER privilege
- --read-rnd-buffer-size=#
+ --read-rnd-buffer-size=#
When reading rows in sorted order after a sort, the rows
are read through this buffer to avoid a disk seeks
--relay-log=name The location and name to use for relay logs
- --relay-log-index=name
+ --relay-log-index=name
File that holds the names for relay log files.
- --relay-log-info-file=name
+ --relay-log-info-file=name
The location and name of the file that remembers where
the SQL replication thread is in the relay logs
- --relay-log-info-repository=name
+ --relay-log-info-repository=name
Defines the type of the repository for the relay log
information.
--relay-log-purge if disabled - do not purge relay logs. if enabled - purge
them as soon as they are no more needed
(Defaults to on; use --skip-relay-log-purge to disable.)
- --relay-log-recovery
+ --relay-log-recovery
Enables automatic relay log recovery right after the
database startup, which means that the IO Thread starts
re-fetching from the master right after the last
transaction processed
- --relay-log-space-limit=#
+ --relay-log-space-limit=#
Maximum space to use for all relay logs
- --replicate-do-db=name
+ --replicate-do-db=name
Tells the slave thread to restrict replication to the
specified database. To specify more than one database,
use the directive multiple times, once for each database.
@@ -573,36 +573,36 @@ The following options may be given as th
database. If you need cross database updates to work,
make sure you have 3.23.28 or later, and use
replicate-wild-do-table=db_name.%.
- --replicate-do-table=name
+ --replicate-do-table=name
Tells the slave thread to restrict replication to the
specified table. To specify more than one table, use the
directive multiple times, once for each table. This will
work for cross-database updates, in contrast to
replicate-do-db.
- --replicate-ignore-db=name
+ --replicate-ignore-db=name
Tells the slave thread to not replicate to the specified
database. To specify more than one database to ignore,
use the directive multiple times, once for each database.
This option will not work if you use cross database
updates. If you need cross database updates to work, make
sure you have 3.23.28 or later, and use
- replicate-wild-ignore-table=db_name.%.
- --replicate-ignore-table=name
+ replicate-wild-ignore-table=db_name.%.
+ --replicate-ignore-table=name
Tells the slave thread to not replicate to the specified
table. To specify more than one table to ignore, use the
directive multiple times, once for each table. This will
work for cross-database updates, in contrast to
replicate-ignore-db.
- --replicate-rewrite-db=name
+ --replicate-rewrite-db=name
Updates to a database with a different name than the
original. Example:
replicate-rewrite-db=master_db_name->slave_db_name.
- --replicate-same-server-id
+ --replicate-same-server-id
In replication, if set to 1, do not skip events having
our server id. Default value is 0 (to break infinite
loops in circular replication). Can't be set to 1 if
--log-slave-updates is used.
- --replicate-wild-do-table=name
+ --replicate-wild-do-table=name
Tells the slave thread to restrict replication to the
tables that match the specified wildcard pattern. To
specify more than one table, use the directive multiple
@@ -611,7 +611,7 @@ The following options may be given as th
replicate-wild-do-table=foo%.bar% will replicate only
updates to tables in all databases that start with foo
and whose table names start with bar.
- --replicate-wild-ignore-table=name
+ --replicate-wild-ignore-table=name
Tells the slave thread to not replicate to the tables
that match the given wildcard pattern. To specify more
than one table to ignore, use the directive multiple
@@ -629,7 +629,7 @@ The following options may be given as th
NAT and other routing issues, that IP may not be valid
for connecting to the slave from the master or other
hosts
- --report-password=name
+ --report-password=name
The account password of the slave to be reported to the
master during slave registration
--report-port=# Port for connecting to slave reported to the master
@@ -644,15 +644,15 @@ The following options may be given as th
write privileges to the mysql.user table.
--secure-auth Disallow authentication for accounts that have old
(pre-4.1) passwords
- --secure-file-priv=name
+ --secure-file-priv=name
Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
files within specified directory
--server-id=# Uniquely identifies the server instance in the community
of replication partners
--shared-memory Enable the shared memory
- --shared-memory-base-name=name
+ --shared-memory-base-name=name
Base name of shared memory
- --show-slave-auth-info
+ --show-slave-auth-info
Show user and password in SHOW SLAVE HOSTS on this
master.
--skip-grant-tables Start without grant tables. This gives all users FULL
@@ -662,46 +662,46 @@ The following options may be given as th
'localhost'.
--skip-networking Don't allow connection with TCP/IP
--skip-new Don't use new, possibly wrong routines.
- --skip-show-database
+ --skip-show-database
Don't allow 'SHOW DATABASE' commands
--skip-slave-start If set, slave is not autostarted.
--skip-stack-trace Don't print a stack trace on failure.
- --slave-compressed-protocol
+ --slave-compressed-protocol
Use compression on master/slave protocol
- --slave-exec-mode=name
+ --slave-exec-mode=name
Modes for how replication events should be executed.
Legal values are STRICT (default) and IDEMPOTENT. In
IDEMPOTENT mode, replication will not stop for operations
that are idempotent. In STRICT mode, replication will
stop on any unexpected difference between the master and
the slave
- --slave-load-tmpdir=name
+ --slave-load-tmpdir=name
The location where the slave should put its temporary
files when replicating a LOAD DATA INFILE command
- --slave-net-timeout=#
+ --slave-net-timeout=#
Number of seconds to wait for more data from a
master/slave connection before aborting the read
- --slave-skip-errors=name
+ --slave-skip-errors=name
Tells the slave thread to continue replication when a
query event returns an error from the provided list
- --slave-sql-verify-checksum
+ --slave-sql-verify-checksum
Force checksum verification of replication events after
reading them from relay log. Note: Events are always
checksum-verified by slave on receiving them from the
network before writing them to the relay log. Enabled by
default.
(Defaults to on; use --skip-slave-sql-verify-checksum to disable.)
- --slave-transaction-retries=#
+ --slave-transaction-retries=#
Number of times the slave SQL thread will retry a
transaction in case it failed with a deadlock or elapsed
lock wait timeout, before giving up and stopping
- --slave-type-conversions=name
+ --slave-type-conversions=name
Set of slave type conversions that are enabled. Legal
values are: ALL_LOSSY to enable lossy conversions and
ALL_NON_LOSSY to enable non-lossy conversions. If the
variable is assigned the empty set, no conversions are
allowed and it is expected that the types match exactly.
- --slow-launch-time=#
+ --slow-launch-time=#
If creating the thread takes longer than this value (in
seconds), the Slow_launch_threads counter will be
incremented
@@ -709,32 +709,32 @@ The following options may be given as th
to a file hostname-slow.log or a table mysql.slow_log if
--log-output=TABLE is used. Must be enabled to activate
other slow log options
- --slow-query-log-file=name
+ --slow-query-log-file=name
Log slow queries to given log file. Defaults logging to
hostname-slow.log. Must be enabled to activate other slow
log options
--socket=name Socket file to use for connection
- --sort-buffer-size=#
+ --sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
this size
- --sporadic-binlog-dump-fail
+ --sporadic-binlog-dump-fail
Option used by mysql-test for debugging and testing of
replication.
--sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
for the complete list of valid sql modes
--standalone Dummy option to start as a standalone program (NT).
- -s, --symbolic-links
+ -s, --symbolic-links
Enable symbolic link support.
--sync-binlog=# Synchronously flush binary log to disk after every #th
event. Use 0 (default) to disable synchronous flushing
--sync-frm Sync .frm files to disk on creation
(Defaults to on; use --skip-sync-frm to disable.)
- --sync-master-info=#
+ --sync-master-info=#
Synchronously flush master info to disk after every #th
event. Use 0 (default) to disable synchronous flushing
--sync-relay-log=# Synchronously flush relay log to disk after every #th
event. Use 0 (default) to disable synchronous flushing
- --sync-relay-log-info=#
+ --sync-relay-log-info=#
Synchronously flush relay log info to disk after every
#th transaction. Use 0 (default) to disable synchronous
flushing
@@ -743,16 +743,16 @@ The following options may be given as th
value different for different invocations, even within
the same statement.
--table-cache=# Deprecated; use --table-open-cache instead.
- --table-definition-cache=#
+ --table-definition-cache=#
The number of cached table definitions
- --table-open-cache=#
+ --table-open-cache=#
The number of cached open tables
- --tc-heuristic-recover=name
+ --tc-heuristic-recover=name
Decision to use in heuristic recover process. Possible
values are COMMIT or ROLLBACK.
- --thread-cache-size=#
+ --thread-cache-size=#
How many threads we should keep in a cache for reuse
- --thread-handling=name
+ --thread-handling=name
Define threads usage for handling queries, one of
one-thread-per-connection, no-threads, loaded-dynamically
--thread-stack=# The stack size for each thread
@@ -765,15 +765,15 @@ The following options may be given as th
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
separated by a semicolon (;), in this case they are used
in a round-robin fashion
- --transaction-alloc-block-size=#
+ --transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
- --transaction-isolation=name
+ --transaction-isolation=name
Default transaction isolation level.
- --transaction-prealloc-size=#
+ --transaction-prealloc-size=#
Persistent buffer for transactions to be stored in binary
log
- --updatable-views-with-limit=name
+ --updatable-views-with-limit=name
YES = Don't issue an error message (warning only) if a
VIEW without presence of a key of the underlying table is
used in queries with a LIMIT clause for updating. NO =
@@ -842,9 +842,9 @@ general-log FALSE
group-concat-max-len 1024
help TRUE
ignore-builtin-innodb FALSE
-init-connect
+init-connect
init-file (No default value)
-init-slave
+init-slave
interactive-timeout 28800
join-buffer-size 131072
keep-files-on-create FALSE
@@ -861,7 +861,7 @@ lock-wait-timeout 31536000
log-bin (No default value)
log-bin-index (No default value)
log-bin-trust-function-creators FALSE
-log-error
+log-error
log-isam myisam.log
log-output FILE
log-queries-not-using-indexes FALSE
@@ -925,7 +925,7 @@ optimizer-join-cache-level 4
optimizer-prune-level 1
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on
-optimizer-trace
+optimizer-trace
optimizer-trace-features greedy_search=on,range_optimizer=on,dynamic_range=on,repeated_subselect=on
optimizer-trace-limit 1
optimizer-trace-max-mem-size 16384
@@ -1002,12 +1002,12 @@ slave-net-timeout 3600
slave-skip-errors (No default value)
slave-sql-verify-checksum TRUE
slave-transaction-retries 10
-slave-type-conversions
+slave-type-conversions
slow-launch-time 2
slow-query-log FALSE
sort-buffer-size 2097152
sporadic-binlog-dump-fail FALSE
-sql-mode
+sql-mode
symbolic-links FALSE
sync-binlog 0
sync-frm TRUE
=== modified file 'mysql-test/suite/perfschema/r/start_server_no_socket_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result 2011-03-28 23:37:10 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result 2011-07-25 03:40:14 +0000
@@ -73,7 +73,7 @@ performance_schema_max_rwlock_classes 30
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 0
performance_schema_max_socket_instances 1000
-performance_schema_max_stage_classes 100
+performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 165
performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500
=== modified file 'mysql-test/suite/perfschema/r/start_server_no_socket_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result 2011-03-28 23:37:10 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result 2011-07-25 03:40:14 +0000
@@ -73,7 +73,7 @@ performance_schema_max_rwlock_classes 30
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 0
-performance_schema_max_stage_classes 100
+performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 165
performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500
=== modified file 'mysql-test/suite/perfschema/t/socket_instances_func.test'
--- a/mysql-test/suite/perfschema/t/socket_instances_func.test 2011-07-22 17:34:24 +0000
+++ b/mysql-test/suite/perfschema/t/socket_instances_func.test 2011-07-25 03:34:01 +0000
@@ -47,14 +47,20 @@ let $con0_thread_id = `SELECT @thread_id
--echo # Establish local TCP/IP connection (con1,127.0.0.1,root,,test,,)
#--disable_query_log
+--echo # Connect 1 (con1,127.0.0.1,root,,test,,$MASTER_MYPORT)
--connect (con1,127.0.0.1,root,,test,,$MASTER_MYPORT)
+--echo # Connect 1a (con1a,127.0.0.1,root,,test,$MASTER_MYPORT)
+--connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT)
#--enable_query_log
---echo # DEBUG 2
SELECT * FROM performance_schema.socket_instances;
---echo # $MYSQL --host=127.0.0.1 --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
---exec $MYSQL --host=127.0.0.1 --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
---echo # DEBUG 2a
+--echo # DEBUG 2 - host, protocol
+--echo # $MYSQL --host=127.0.0.1 --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--exec $MYSQL --host=127.0.0.1 --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--echo # DEBUG 2a - no host, protocol
+--echo # $MYSQL --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--exec $MYSQL --protocol=TCP --port=$MASTER_MYPORT --user=root test -e "SELECT current_user();SELECT user();SELECT * FROM performance_schema.socket_instances;"
+--echo # DEBUG 2b - after execs
SELECT * FROM performance_schema.socket_instances;
--echo # Store the thread id of connection 1 (tcp/ip)
=== modified file 'storage/perfschema/table_events_waits.cc'
--- a/storage/perfschema/table_events_waits.cc 2011-07-08 21:31:33 +0000
+++ b/storage/perfschema/table_events_waits.cc 2011-07-25 03:34:01 +0000
@@ -308,7 +308,7 @@ int table_events_waits_common::make_sock
uint port;
char port_str[128];
- char ip_str[INET6_ADDRSTRLEN];
+ char ip_str[INET6_ADDRSTRLEN+1];
uint ip_len= 0;
port_str[0]= ':';
=== modified file 'storage/perfschema/table_socket_instances.h'
--- a/storage/perfschema/table_socket_instances.h 2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/table_socket_instances.h 2011-07-25 03:34:01 +0000
@@ -45,7 +45,7 @@ struct row_socket_instances
/** Column SOCKET_ID */
uint m_fd;
/** Socket ip address, IPV4 or IPV6 */
- char m_ip[INET6_ADDRSTRLEN];
+ char m_ip[INET6_ADDRSTRLEN+1];
/** Length in bytes of @c m_ip. */
uint m_ip_length;
/** Column PORT */
No bundle (reason: useless for push emails).

Content reproduced on this site is the property of the respective copyright holders. It is not reviewed in advance by Oracle and does not necessarily represent the opinion of Oracle or any other party.