Merge lp:~laurynas-biveinis/percona-server/merge-5.6.12 into lp:percona-server/5.6

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 388
Merged at revision: 388
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.6.12
Merge into: lp:percona-server/5.6
Diff against target: 46532 lines (+18875/-7860)
767 files modified
Makefile (+2/-2)
Percona-Server/BUILD/SETUP.sh (+2/-2)
Percona-Server/BUILD/compile-pentium (+1/-1)
Percona-Server/BUILD/compile-pentium-debug-max-no-ndb (+1/-1)
Percona-Server/BUILD/compile-pentium-gcov (+1/-1)
Percona-Server/BUILD/compile-pentium-gprof (+1/-1)
Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb (+2/-2)
Percona-Server/BUILD/compile-pentium64 (+2/-2)
Percona-Server/CMakeLists.txt (+7/-3)
Percona-Server/Docs/mysql.info (+1/-2)
Percona-Server/INSTALL-SOURCE (+1/-2)
Percona-Server/INSTALL-WIN-SOURCE (+1/-2)
Percona-Server/README (+56/-56)
Percona-Server/VERSION (+1/-1)
Percona-Server/client/CMakeLists.txt (+3/-5)
Percona-Server/client/completion_hash.h (+2/-2)
Percona-Server/client/echo.c (+1/-1)
Percona-Server/client/mysql.cc (+27/-5)
Percona-Server/client/mysql_plugin.c (+1/-1)
Percona-Server/client/mysql_upgrade.c (+66/-3)
Percona-Server/client/mysqlbinlog.cc (+132/-6)
Percona-Server/client/mysqldump.c (+15/-5)
Percona-Server/client/mysqltest.cc (+8/-2)
Percona-Server/client/sql_string.h (+2/-1)
Percona-Server/cmake/build_configurations/mysql_release.cmake (+1/-2)
Percona-Server/cmake/os/WindowsCache.cmake (+2/-2)
Percona-Server/cmake/package_name.cmake (+13/-5)
Percona-Server/cmake/readline.cmake (+60/-49)
Percona-Server/cmd-line-utils/libedit/readline.c (+1/-1)
Percona-Server/config.h.cmake (+1/-2)
Percona-Server/configure.cmake (+2/-1)
Percona-Server/dbug/dbug.c (+74/-26)
Percona-Server/extra/charset2html.c (+1/-1)
Percona-Server/extra/yassl/COPYING (+2/-2)
Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl (+1/-1)
Percona-Server/extra/yassl/src/crypto_wrapper.cpp (+1/-1)
Percona-Server/extra/yassl/src/make.bat (+1/-1)
Percona-Server/extra/yassl/src/yassl_int.cpp (+1/-1)
Percona-Server/extra/yassl/taocrypt/COPYING (+2/-2)
Percona-Server/extra/yassl/taocrypt/benchmark/make.bat (+1/-1)
Percona-Server/extra/yassl/taocrypt/src/algebra.cpp (+1/-1)
Percona-Server/extra/yassl/taocrypt/src/integer.cpp (+1/-1)
Percona-Server/extra/yassl/taocrypt/src/make.bat (+1/-1)
Percona-Server/extra/yassl/taocrypt/test/make.bat (+1/-1)
Percona-Server/extra/yassl/testsuite/make.bat (+1/-1)
Percona-Server/include/my_bitmap.h (+1/-1)
Percona-Server/include/my_compare.h (+1/-1)
Percona-Server/include/my_dbug.h (+13/-2)
Percona-Server/include/my_global.h (+3/-7)
Percona-Server/include/my_md5.h (+1/-1)
Percona-Server/include/my_pthread.h (+1/-1)
Percona-Server/include/my_sys.h (+1/-6)
Percona-Server/include/my_user.h (+1/-1)
Percona-Server/include/my_xml.h (+1/-1)
Percona-Server/include/mysql/innodb_priv.h (+1/-1)
Percona-Server/include/mysql_time.h (+1/-1)
Percona-Server/include/t_ctype.h (+1/-1)
Percona-Server/include/typelib.h (+1/-1)
Percona-Server/libmysql/authentication_win/common.cc (+1/-1)
Percona-Server/libmysql/authentication_win/common.h (+1/-1)
Percona-Server/libmysql/authentication_win/handshake.cc (+7/-8)
Percona-Server/libmysql/authentication_win/handshake.h (+8/-8)
Percona-Server/libmysql/authentication_win/handshake_client.cc (+1/-1)
Percona-Server/libmysql/authentication_win/log_client.cc (+1/-1)
Percona-Server/libmysql/authentication_win/plugin_client.cc (+1/-1)
Percona-Server/libmysql/conf_to_src.c (+1/-1)
Percona-Server/libmysqld/examples/CMakeLists.txt (+3/-4)
Percona-Server/libmysqld/examples/test-run (+1/-1)
Percona-Server/libmysqld/lib_sql.cc (+1/-1)
Percona-Server/man/comp_err.1 (+2/-2)
Percona-Server/man/innochecksum.1 (+2/-2)
Percona-Server/man/msql2mysql.1 (+2/-2)
Percona-Server/man/my_print_defaults.1 (+2/-2)
Percona-Server/man/myisam_ftdump.1 (+2/-2)
Percona-Server/man/myisamchk.1 (+2/-2)
Percona-Server/man/myisamlog.1 (+2/-2)
Percona-Server/man/myisampack.1 (+2/-2)
Percona-Server/man/mysql-stress-test.pl.1 (+2/-2)
Percona-Server/man/mysql-test-run.pl.1 (+2/-2)
Percona-Server/man/mysql.1 (+5/-5)
Percona-Server/man/mysql.server.1 (+3/-3)
Percona-Server/man/mysql_client_test.1 (+2/-2)
Percona-Server/man/mysql_config.1 (+2/-2)
Percona-Server/man/mysql_config_editor.1 (+2/-2)
Percona-Server/man/mysql_convert_table_format.1 (+2/-2)
Percona-Server/man/mysql_find_rows.1 (+2/-2)
Percona-Server/man/mysql_fix_extensions.1 (+2/-2)
Percona-Server/man/mysql_install_db.1 (+2/-2)
Percona-Server/man/mysql_plugin.1 (+2/-2)
Percona-Server/man/mysql_secure_installation.1 (+2/-2)
Percona-Server/man/mysql_setpermission.1 (+2/-2)
Percona-Server/man/mysql_tzinfo_to_sql.1 (+2/-2)
Percona-Server/man/mysql_upgrade.1 (+3/-3)
Percona-Server/man/mysql_waitpid.1 (+2/-2)
Percona-Server/man/mysql_zap.1 (+2/-2)
Percona-Server/man/mysqlaccess.1 (+2/-2)
Percona-Server/man/mysqladmin.1 (+4/-4)
Percona-Server/man/mysqlbinlog.1 (+31/-2)
Percona-Server/man/mysqlbug.1 (+2/-2)
Percona-Server/man/mysqlcheck.1 (+2/-2)
Percona-Server/man/mysqld.8 (+2/-2)
Percona-Server/man/mysqld_multi.1 (+2/-2)
Percona-Server/man/mysqld_safe.1 (+2/-2)
Percona-Server/man/mysqldump.1 (+17/-147)
Percona-Server/man/mysqldumpslow.1 (+2/-2)
Percona-Server/man/mysqlhotcopy.1 (+2/-2)
Percona-Server/man/mysqlimport.1 (+2/-2)
Percona-Server/man/mysqlshow.1 (+2/-2)
Percona-Server/man/mysqlslap.1 (+2/-2)
Percona-Server/man/mysqltest.1 (+2/-2)
Percona-Server/man/ndb-common-options.1 (+679/-0)
Percona-Server/man/ndb_config.1 (+349/-55)
Percona-Server/man/ndb_cpcd.1 (+50/-12)
Percona-Server/man/ndb_delete_all.1 (+118/-13)
Percona-Server/man/ndb_desc.1 (+336/-51)
Percona-Server/man/ndb_drop_index.1 (+89/-18)
Percona-Server/man/ndb_drop_table.1 (+85/-15)
Percona-Server/man/ndb_error_reporter.1 (+86/-13)
Percona-Server/man/ndb_index_stat.1 (+1014/-0)
Percona-Server/man/ndb_mgm.1 (+98/-16)
Percona-Server/man/ndb_mgmd.8 (+304/-77)
Percona-Server/man/ndb_print_backup_file.1 (+54/-16)
Percona-Server/man/ndb_print_schema_file.1 (+54/-16)
Percona-Server/man/ndb_print_sys_file.1 (+55/-17)
Percona-Server/man/ndb_restore.1 (+697/-136)
Percona-Server/man/ndb_select_all.1 (+265/-23)
Percona-Server/man/ndb_select_count.1 (+112/-16)
Percona-Server/man/ndb_show_tables.1 (+144/-16)
Percona-Server/man/ndb_size.pl.1 (+220/-62)
Percona-Server/man/ndb_waiter.1 (+144/-15)
Percona-Server/man/ndbd.8 (+327/-59)
Percona-Server/man/ndbd_redo_log_reader.1 (+95/-17)
Percona-Server/man/ndbinfo_select_all.1 (+334/-0)
Percona-Server/man/ndbmtd.8 (+55/-17)
Percona-Server/man/perror.1 (+2/-2)
Percona-Server/man/replace.1 (+2/-2)
Percona-Server/man/resolve_stack_dump.1 (+2/-2)
Percona-Server/man/resolveip.1 (+2/-2)
Percona-Server/mysql-test/collections/default.experimental (+6/-1)
Percona-Server/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test (+1/-1)
Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc (+4/-4)
Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc (+1/-1)
Percona-Server/mysql-test/extra/rpl_tests/rpl_stress_test.inc (+127/-0)
Percona-Server/mysql-test/include/have_perfschema.inc (+1/-1)
Percona-Server/mysql-test/include/index_merge_delete.inc (+215/-0)
Percona-Server/mysql-test/include/index_merge_insert-and-replace.inc (+137/-0)
Percona-Server/mysql-test/include/index_merge_intersect_dml.inc (+197/-0)
Percona-Server/mysql-test/include/index_merge_multi_col_setup.inc (+75/-0)
Percona-Server/mysql-test/include/index_merge_single_col_setup.inc (+72/-0)
Percona-Server/mysql-test/include/index_merge_update.inc (+130/-0)
Percona-Server/mysql-test/include/install_semisync.inc (+39/-0)
Percona-Server/mysql-test/include/mtr_warnings.sql (+4/-2)
Percona-Server/mysql-test/include/shutdown_mysqld.inc (+1/-1)
Percona-Server/mysql-test/include/start_slave_sql.inc (+1/-1)
Percona-Server/mysql-test/include/uninstall_semisync.inc (+23/-0)
Percona-Server/mysql-test/lib/My/CoreDump.pm (+7/-3)
Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt (+16/-4)
Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc (+1/-1)
Percona-Server/mysql-test/lib/My/SysInfo.pm (+2/-2)
Percona-Server/mysql-test/lib/v1/mysql-test-run.pl (+4/-7)
Percona-Server/mysql-test/mysql-test-run.pl (+1/-1)
Percona-Server/mysql-test/purify.supp (+2/-2)
Percona-Server/mysql-test/r/derived.result (+1/-1)
Percona-Server/mysql-test/r/group_commit_crash.result (+3/-3)
Percona-Server/mysql-test/r/heap.result (+1/-1)
Percona-Server/mysql-test/r/index_merge_delete.result (+564/-0)
Percona-Server/mysql-test/r/index_merge_insert-and-replace.result (+340/-0)
Percona-Server/mysql-test/r/index_merge_intersect_dml.result (+144/-0)
Percona-Server/mysql-test/r/index_merge_update.result (+328/-0)
Percona-Server/mysql-test/r/innodb_explain_json_non_select_all.result (+70/-28)
Percona-Server/mysql-test/r/innodb_explain_json_non_select_none.result (+70/-28)
Percona-Server/mysql-test/r/innodb_explain_non_select_all.result (+28/-28)
Percona-Server/mysql-test/r/innodb_explain_non_select_none.result (+28/-28)
Percona-Server/mysql-test/r/myisam_explain_json_non_select_all.result (+70/-28)
Percona-Server/mysql-test/r/myisam_explain_json_non_select_none.result (+70/-28)
Percona-Server/mysql-test/r/myisam_explain_non_select_all.result (+28/-28)
Percona-Server/mysql-test/r/myisam_explain_non_select_none.result (+28/-28)
Percona-Server/mysql-test/r/partition_explicit_prune.result (+1/-1)
Percona-Server/mysql-test/r/partition_locking.result (+40/-40)
Percona-Server/mysql-test/r/partition_open_files_limit.result (+1/-1)
Percona-Server/mysql-test/r/partition_pruning.result (+3/-3)
Percona-Server/mysql-test/r/plugin_auth.result (+1/-1)
Percona-Server/mysql-test/r/plugin_auth_qa.result (+4/-2)
Percona-Server/mysql-test/r/plugin_auth_qa_1.result (+2/-0)
Percona-Server/mysql-test/r/ps_grant.result (+1/-2)
Percona-Server/mysql-test/r/sp_notembedded.result (+5/-3)
Percona-Server/mysql-test/r/table_definition_cache_functionality.result (+6/-6)
Percona-Server/mysql-test/r/table_open_cache_functionality.result (+2/-2)
Percona-Server/mysql-test/suite/auth_sec/r/key_value_auth.result (+4/-4)
Percona-Server/mysql-test/suite/auth_sec/t/key_value_auth.test (+4/-4)
Percona-Server/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row.result (+1/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result (+1399/-1368)
Percona-Server/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result (+1419/-1388)
Percona-Server/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result (+139/-105)
Percona-Server/mysql-test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result (+2/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_gtid_stm_ctype_ucs.result (+2/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_index.result (+1/-0)
Percona-Server/mysql-test/suite/funcs_1/datadict/processlist_priv.inc (+1/-1)
Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result (+4/-4)
Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result (+4/-4)
Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql.result (+1/-1)
Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result (+2/-2)
Percona-Server/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result (+1/-1)
Percona-Server/mysql-test/suite/funcs_1/r/processlist_priv_ps.result (+1/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb_bug13867871.result (+4/-2)
Percona-Server/mysql-test/suite/innodb/r/innodb_monitor.result (+1/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result (+1/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug13867871.test (+12/-2)
Percona-Server/mysql-test/suite/innodb/t/innodb_page_size_func.test (+3/-2)
Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test (+2/-0)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result (+29/-0)
Percona-Server/mysql-test/suite/innodb_fts/t/innodb_fts_plugin.test (+45/-0)
Percona-Server/mysql-test/suite/opt_trace/validate_json.py (+1/-1)
Percona-Server/mysql-test/suite/perfschema/include/sizing_auto.inc (+1/-2)
Percona-Server/mysql-test/suite/perfschema/r/binlog_edge_row.result (+4/-0)
Percona-Server/mysql-test/suite/perfschema/r/relaylog.result (+5/-1)
Percona-Server/mysql-test/suite/perfschema/r/sizing_default.result (+98/-95)
Percona-Server/mysql-test/suite/perfschema/r/sizing_high.result (+7/-4)
Percona-Server/mysql-test/suite/perfschema/r/sizing_low.result (+7/-4)
Percona-Server/mysql-test/suite/perfschema/r/sizing_med.result (+7/-4)
Percona-Server/mysql-test/suite/perfschema/t/sizing_default.cnf (+8/-4)
Percona-Server/mysql-test/suite/perfschema/t/sizing_default.test (+8/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_grant.result (+8/-7)
Percona-Server/mysql-test/suite/rpl/r/rpl_group_commit_deadlock.result (+43/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_insert_id.result (+2/-2)
Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_m.result (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result (+6/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result (+19/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result (+46/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result (+48/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_grant.test (+9/-1)
Percona-Server/mysql-test/suite/rpl/t/rpl_group_commit_deadlock.test (+53/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_m.test (+1/-1)
Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test (+1/-1)
Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test (+3/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock-slave.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test (+102/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-slave.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test (+54/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-master.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-slave.opt (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock.test (+57/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result (+79/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result (+1/-0)
Percona-Server/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result (+8/-8)
Percona-Server/mysql-test/suite/sys_vars/r/table_open_cache_basic.result (+6/-6)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test (+68/-0)
Percona-Server/mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/t/pfs_session_connect_attrs_size_basic.test (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/t/secure_file_priv.test (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test (+4/-4)
Percona-Server/mysql-test/suite/sys_vars/t/table_open_cache_basic.test (+3/-3)
Percona-Server/mysql-test/t/disabled.def (+1/-0)
Percona-Server/mysql-test/t/group_commit_crash.test (+3/-5)
Percona-Server/mysql-test/t/index_merge_delete.test (+14/-0)
Percona-Server/mysql-test/t/index_merge_insert-and-replace.test (+13/-0)
Percona-Server/mysql-test/t/index_merge_intersect_dml.test (+5/-0)
Percona-Server/mysql-test/t/index_merge_update.test (+13/-0)
Percona-Server/mysql-test/t/mysql_upgrade.test (+3/-1)
Percona-Server/mysql-test/t/partition_open_files_limit.test (+10/-1)
Percona-Server/mysql-test/t/plugin_auth.test (+1/-2)
Percona-Server/mysql-test/t/plugin_auth_qa.test (+4/-2)
Percona-Server/mysql-test/t/plugin_auth_qa_1.test (+2/-0)
Percona-Server/mysql-test/t/ps_grant.test (+1/-2)
Percona-Server/mysql-test/t/sp_notembedded.test (+8/-12)
Percona-Server/mysql-test/t/table_definition_cache_functionality.test (+3/-3)
Percona-Server/mysql-test/t/table_open_cache_functionality.test (+1/-1)
Percona-Server/mysql-test/valgrind.supp (+20/-1)
Percona-Server/mysys/mf_arr_appstr.c (+1/-1)
Percona-Server/mysys/mf_iocache2.c (+4/-0)
Percona-Server/mysys/mf_qsort2.c (+1/-1)
Percona-Server/mysys/mf_same.c (+1/-1)
Percona-Server/mysys/mf_soundex.c (+1/-1)
Percona-Server/mysys/mf_wcomp.c (+1/-1)
Percona-Server/mysys/mulalloc.c (+1/-1)
Percona-Server/mysys/my_access.c (+1/-1)
Percona-Server/mysys/my_alarm.c (+1/-1)
Percona-Server/mysys/my_bitmap.c (+1/-1)
Percona-Server/mysys/my_compare.c (+1/-1)
Percona-Server/mysys/my_crc32.c (+1/-1)
Percona-Server/mysys/my_div.c (+1/-1)
Percona-Server/mysys/my_fopen.c (+1/-1)
Percona-Server/mysys/my_getpagesize.c (+1/-1)
Percona-Server/mysys/my_getsystime.c (+1/-1)
Percona-Server/mysys/my_libwrap.c (+1/-1)
Percona-Server/mysys/my_memmem.c (+1/-1)
Percona-Server/mysys/my_mkdir.c (+1/-1)
Percona-Server/mysys/my_read.c (+8/-1)
Percona-Server/mysys/my_symlink2.c (+1/-1)
Percona-Server/mysys/test_dir.c (+1/-1)
Percona-Server/mysys/test_xml.c (+1/-1)
Percona-Server/mysys/thr_alarm.c (+1/-1)
Percona-Server/mysys/typelib.c (+1/-1)
Percona-Server/mysys_ssl/my_aes.cc (+38/-25)
Percona-Server/mysys_ssl/my_default.cc (+1/-1)
Percona-Server/packaging/rpm-uln/CMakeLists.txt (+2/-2)
Percona-Server/packaging/rpm-uln/mysql-5.5-errno.patch (+0/-21)
Percona-Server/packaging/rpm-uln/mysql.spec.sh (+20/-13)
Percona-Server/plugin/semisync/semisync_master.cc (+6/-5)
Percona-Server/scripts/fill_help_tables.sql (+1/-1)
Percona-Server/scripts/mysql_secure_installation.pl.in (+2/-1)
Percona-Server/scripts/mysql_system_tables.sql (+4/-4)
Percona-Server/scripts/mysql_system_tables_fix.sql (+8/-0)
Percona-Server/scripts/mysql_test_data_timezone.sql (+1/-1)
Percona-Server/sql-bench/CMakeLists.txt (+30/-22)
Percona-Server/sql-common/client.c (+40/-7)
Percona-Server/sql-common/pack.c (+1/-1)
Percona-Server/sql/binlog.cc (+337/-77)
Percona-Server/sql/binlog.h (+17/-5)
Percona-Server/sql/bounded_queue.h (+1/-1)
Percona-Server/sql/field.cc (+1/-2)
Percona-Server/sql/filesort_utils.cc (+4/-1)
Percona-Server/sql/ha_partition.cc (+9/-39)
Percona-Server/sql/handler.cc (+11/-6)
Percona-Server/sql/handler.h (+1/-1)
Percona-Server/sql/item.cc (+29/-9)
Percona-Server/sql/item.h (+21/-5)
Percona-Server/sql/item_func.cc (+14/-0)
Percona-Server/sql/item_geofunc.cc (+47/-60)
Percona-Server/sql/item_sum.cc (+62/-43)
Percona-Server/sql/item_sum.h (+3/-2)
Percona-Server/sql/key.cc (+9/-0)
Percona-Server/sql/log.h (+2/-1)
Percona-Server/sql/log_event.cc (+256/-191)
Percona-Server/sql/log_event.h (+58/-29)
Percona-Server/sql/mem_root_array.h (+1/-1)
Percona-Server/sql/mysqld.cc (+129/-72)
Percona-Server/sql/mysqld.h (+2/-0)
Percona-Server/sql/opt_explain.cc (+15/-0)
Percona-Server/sql/opt_range.cc (+82/-24)
Percona-Server/sql/opt_trace_Doxyfile (+1/-1)
Percona-Server/sql/rpl_filter.cc (+6/-3)
Percona-Server/sql/rpl_gtid_execution.cc (+1/-3)
Percona-Server/sql/rpl_handler.cc (+2/-2)
Percona-Server/sql/rpl_info_dummy.cc (+1/-1)
Percona-Server/sql/rpl_info_dummy.h (+1/-1)
Percona-Server/sql/rpl_info_table_access.h (+1/-1)
Percona-Server/sql/rpl_info_values.h (+1/-1)
Percona-Server/sql/rpl_master.cc (+8/-1)
Percona-Server/sql/rpl_rli.cc (+4/-3)
Percona-Server/sql/rpl_rli_pdb.cc (+13/-0)
Percona-Server/sql/rpl_slave.cc (+42/-26)
Percona-Server/sql/rpl_utility.cc (+41/-9)
Percona-Server/sql/rpl_utility.h (+14/-12)
Percona-Server/sql/set_var.cc (+13/-10)
Percona-Server/sql/share/charsets/Index.xml (+1/-1)
Percona-Server/sql/share/charsets/armscii8.xml (+1/-1)
Percona-Server/sql/share/charsets/ascii.xml (+1/-1)
Percona-Server/sql/share/charsets/cp1250.xml (+1/-1)
Percona-Server/sql/share/charsets/cp1256.xml (+1/-1)
Percona-Server/sql/share/charsets/cp1257.xml (+1/-1)
Percona-Server/sql/share/charsets/cp850.xml (+1/-1)
Percona-Server/sql/share/charsets/cp852.xml (+1/-1)
Percona-Server/sql/share/charsets/cp866.xml (+1/-1)
Percona-Server/sql/share/charsets/dec8.xml (+1/-1)
Percona-Server/sql/share/charsets/geostd8.xml (+1/-1)
Percona-Server/sql/share/charsets/greek.xml (+1/-1)
Percona-Server/sql/share/charsets/hebrew.xml (+1/-1)
Percona-Server/sql/share/charsets/hp8.xml (+1/-1)
Percona-Server/sql/share/charsets/keybcs2.xml (+1/-1)
Percona-Server/sql/share/charsets/koi8r.xml (+1/-1)
Percona-Server/sql/share/charsets/koi8u.xml (+1/-1)
Percona-Server/sql/share/charsets/languages.html (+1/-1)
Percona-Server/sql/share/charsets/latin1.xml (+1/-1)
Percona-Server/sql/share/charsets/latin2.xml (+1/-1)
Percona-Server/sql/share/charsets/latin5.xml (+1/-1)
Percona-Server/sql/share/charsets/latin7.xml (+1/-1)
Percona-Server/sql/share/charsets/macce.xml (+1/-1)
Percona-Server/sql/share/charsets/macroman.xml (+1/-1)
Percona-Server/sql/share/charsets/swe7.xml (+1/-1)
Percona-Server/sql/share/errmsg-utf8.txt (+27/-0)
Percona-Server/sql/spatial.cc (+468/-677)
Percona-Server/sql/spatial.h (+311/-114)
Percona-Server/sql/sql_acl.cc (+270/-132)
Percona-Server/sql/sql_cache.cc (+12/-1)
Percona-Server/sql/sql_class.cc (+8/-5)
Percona-Server/sql/sql_class.h (+53/-9)
Percona-Server/sql/sql_executor.cc (+4/-5)
Percona-Server/sql/sql_hset.h (+1/-1)
Percona-Server/sql/sql_insert.cc (+85/-90)
Percona-Server/sql/sql_lex.cc (+21/-10)
Percona-Server/sql/sql_lex.h (+4/-2)
Percona-Server/sql/sql_optimizer.cc (+67/-43)
Percona-Server/sql/sql_parse.cc (+46/-32)
Percona-Server/sql/sql_select.cc (+17/-0)
Percona-Server/sql/sql_select.h (+25/-5)
Percona-Server/sql/sql_show.cc (+9/-1)
Percona-Server/sql/sql_state.c (+1/-1)
Percona-Server/sql/sql_string.h (+2/-1)
Percona-Server/sql/sql_table.cc (+22/-37)
Percona-Server/sql/sql_test.cc (+5/-28)
Percona-Server/sql/sql_tmp_table.cc (+6/-1)
Percona-Server/sql/sql_union.cc (+8/-2)
Percona-Server/sql/sql_update.cc (+17/-2)
Percona-Server/sql/sql_view.cc (+3/-0)
Percona-Server/sql/sql_yacc.yy (+48/-21)
Percona-Server/sql/structs.h (+8/-1)
Percona-Server/sql/table.cc (+44/-0)
Percona-Server/sql/table.h (+8/-6)
Percona-Server/sql/transaction.cc (+23/-8)
Percona-Server/sql/transaction.h (+3/-1)
Percona-Server/storage/federated/ha_federated.cc (+1/-2)
Percona-Server/storage/heap/_check.c (+1/-1)
Percona-Server/storage/heap/_rectest.c (+1/-1)
Percona-Server/storage/heap/hp_delete.c (+1/-1)
Percona-Server/storage/heap/hp_extra.c (+1/-1)
Percona-Server/storage/heap/hp_info.c (+1/-1)
Percona-Server/storage/heap/hp_rfirst.c (+1/-1)
Percona-Server/storage/heap/hp_rlast.c (+1/-1)
Percona-Server/storage/heap/hp_rnext.c (+1/-1)
Percona-Server/storage/heap/hp_rprev.c (+1/-1)
Percona-Server/storage/heap/hp_rrnd.c (+1/-1)
Percona-Server/storage/heap/hp_rsame.c (+1/-1)
Percona-Server/storage/heap/hp_scan.c (+1/-1)
Percona-Server/storage/heap/hp_update.c (+1/-1)
Percona-Server/storage/innobase/api/api0api.cc (+81/-10)
Percona-Server/storage/innobase/btr/btr0btr.cc (+15/-3)
Percona-Server/storage/innobase/buf/buf0buddy.cc (+5/-0)
Percona-Server/storage/innobase/buf/buf0buf.cc (+7/-8)
Percona-Server/storage/innobase/buf/buf0dblwr.cc (+124/-82)
Percona-Server/storage/innobase/buf/buf0flu.cc (+167/-131)
Percona-Server/storage/innobase/buf/buf0lru.cc (+82/-72)
Percona-Server/storage/innobase/buf/buf0rea.cc (+12/-13)
Percona-Server/storage/innobase/dict/dict0dict.cc (+115/-26)
Percona-Server/storage/innobase/dict/dict0load.cc (+95/-39)
Percona-Server/storage/innobase/dict/dict0mem.cc (+1/-5)
Percona-Server/storage/innobase/dict/dict0stats_bg.cc (+1/-1)
Percona-Server/storage/innobase/fil/fil0fil.cc (+223/-116)
Percona-Server/storage/innobase/fts/fts0fts.cc (+6/-4)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+120/-55)
Percona-Server/storage/innobase/handler/handler0alter.cc (+18/-16)
Percona-Server/storage/innobase/handler/i_s.cc (+4/-4)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.cc (+15/-12)
Percona-Server/storage/innobase/include/buf0buf.h (+9/-4)
Percona-Server/storage/innobase/include/buf0buf.ic (+3/-3)
Percona-Server/storage/innobase/include/buf0dblwr.h (+28/-22)
Percona-Server/storage/innobase/include/buf0flu.h (+16/-11)
Percona-Server/storage/innobase/include/buf0rea.h (+2/-2)
Percona-Server/storage/innobase/include/buf0types.h (+2/-2)
Percona-Server/storage/innobase/include/dict0crea.ic (+48/-11)
Percona-Server/storage/innobase/include/dict0dict.h (+24/-9)
Percona-Server/storage/innobase/include/dict0load.h (+26/-10)
Percona-Server/storage/innobase/include/dict0mem.h (+1/-1)
Percona-Server/storage/innobase/include/dict0priv.h (+4/-2)
Percona-Server/storage/innobase/include/dict0priv.ic (+5/-3)
Percona-Server/storage/innobase/include/dict0types.h (+16/-1)
Percona-Server/storage/innobase/include/fil0fil.h (+8/-5)
Percona-Server/storage/innobase/include/ha_prototypes.h (+20/-0)
Percona-Server/storage/innobase/include/handler0alter.h (+1/-1)
Percona-Server/storage/innobase/include/ibuf0ibuf.ic (+2/-2)
Percona-Server/storage/innobase/include/lock0lock.h (+21/-0)
Percona-Server/storage/innobase/include/mtr0mtr.h (+3/-2)
Percona-Server/storage/innobase/include/page0zip.ic (+1/-1)
Percona-Server/storage/innobase/include/rem0rec.ic (+2/-2)
Percona-Server/storage/innobase/include/srv0mon.h (+3/-2)
Percona-Server/storage/innobase/include/trx0rec.h (+2/-2)
Percona-Server/storage/innobase/include/trx0trx.h (+2/-2)
Percona-Server/storage/innobase/include/trx0types.h (+4/-1)
Percona-Server/storage/innobase/include/trx0undo.h (+2/-1)
Percona-Server/storage/innobase/include/univ.i (+7/-4)
Percona-Server/storage/innobase/lock/lock0lock.cc (+80/-9)
Percona-Server/storage/innobase/lock/lock0wait.cc (+2/-1)
Percona-Server/storage/innobase/log/log0log.cc (+16/-16)
Percona-Server/storage/innobase/log/log0recv.cc (+56/-76)
Percona-Server/storage/innobase/mem/mem0mem.cc (+5/-1)
Percona-Server/storage/innobase/mtr/mtr0mtr.cc (+6/-3)
Percona-Server/storage/innobase/page/page0zip.cc (+2/-2)
Percona-Server/storage/innobase/read/read0read.cc (+2/-2)
Percona-Server/storage/innobase/row/row0import.cc (+1/-1)
Percona-Server/storage/innobase/row/row0ins.cc (+28/-6)
Percona-Server/storage/innobase/row/row0log.cc (+15/-10)
Percona-Server/storage/innobase/row/row0merge.cc (+18/-15)
Percona-Server/storage/innobase/row/row0mysql.cc (+49/-17)
Percona-Server/storage/innobase/row/row0purge.cc (+2/-1)
Percona-Server/storage/innobase/row/row0quiesce.cc (+5/-4)
Percona-Server/storage/innobase/row/row0uins.cc (+2/-1)
Percona-Server/storage/innobase/row/row0umod.cc (+2/-1)
Percona-Server/storage/innobase/row/row0upd.cc (+4/-0)
Percona-Server/storage/innobase/srv/srv0mon.cc (+5/-1)
Percona-Server/storage/innobase/srv/srv0start.cc (+28/-8)
Percona-Server/storage/innobase/trx/trx0purge.cc (+1/-1)
Percona-Server/storage/innobase/trx/trx0roll.cc (+11/-8)
Percona-Server/storage/innobase/trx/trx0trx.cc (+111/-8)
Percona-Server/storage/innobase/trx/trx0undo.cc (+10/-4)
Percona-Server/storage/myisam/ft_stopwords.c (+1/-1)
Percona-Server/storage/myisam/ftbench/Ecompare.pl (+1/-1)
Percona-Server/storage/myisam/ftbench/Ecreate.pl (+1/-1)
Percona-Server/storage/myisam/ftbench/Ereport.pl (+1/-1)
Percona-Server/storage/myisam/ftbench/ft-test-run.sh (+2/-2)
Percona-Server/storage/myisam/mi_checksum.c (+1/-1)
Percona-Server/storage/myisam/mi_range.c (+1/-1)
Percona-Server/storage/myisam/mi_rfirst.c (+1/-1)
Percona-Server/storage/myisam/mi_rlast.c (+1/-1)
Percona-Server/storage/myisam/mi_rrnd.c (+1/-1)
Percona-Server/storage/myisam/mi_rsamepos.c (+1/-1)
Percona-Server/storage/myisam/mi_test_all.sh (+2/-2)
Percona-Server/storage/myisam/myisamchk.c (+1/-1)
Percona-Server/storage/myisam/rt_index.c (+1/-1)
Percona-Server/storage/myisam/rt_index.h (+1/-1)
Percona-Server/storage/myisam/rt_key.c (+1/-1)
Percona-Server/storage/myisam/rt_key.h (+1/-1)
Percona-Server/storage/myisam/rt_mbr.c (+1/-1)
Percona-Server/storage/myisam/rt_mbr.h (+1/-1)
Percona-Server/storage/myisam/sp_defs.h (+1/-1)
Percona-Server/storage/myisammrg/myrg_delete.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_locking.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_open.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_panic.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_range.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_records.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rfirst.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rlast.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rnext.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rnext_same.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rprev.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rrnd.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rsame.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_update.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_write.c (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AlterIndxImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BackupLockTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CallbackSignal.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ConfigChange.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CopyData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateHashMap.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateIndxImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateNodegroup.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateNodegroupImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DataFileOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DbinfoScan.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictSignal.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictTakeover.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DihScanTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropIndxImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropNodegroup.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropNodegroupImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropTrigImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/EnableCom.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/HashMapImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LqhTransReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ReleasePages.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SchemaTrans.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SchemaTransImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StopForCrash.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TabCommit.hpp (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbDir.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/HashMap.hpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/AlterIndxImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/BuildIndx.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/BuildIndxImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateIndxImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateTab.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateTable.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DropIndxImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DropTable.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DropTrigImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/GetTabInfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SchemaTrans.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbDir.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/HashMap.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/angel.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/angel.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/LocalProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/LocalProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/PgmanProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/PgmanProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/RestoreProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/RestoreProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupClient.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/ndbd.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/ndbd.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ArenaPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ArenaPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/GlobalData.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/LongSignal.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/LongSignalImpl.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/LongSignal_mt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/LongSignal_nonmt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/NdbSeqLock.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SafeMutex.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SafeMutex.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimplePropertiesSection_mt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimplePropertiesSection_nonmt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimulatedBlock_mt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimulatedBlock_nonmt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/TransporterCallback_mt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/TransporterCallback_nonmt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/mt-asm.h (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/mt.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/mt.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/ConfigManager.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/ConfigManager.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/ConfigSubscriber.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/Defragger.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/MgmtThread.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbQueryOperation.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbMgmd.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/SocketInputStream2.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/reorg_tab.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testLimits.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testNativeDefault.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testSingleUserMode.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/SocketInputStream2.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/test_spj.cpp (+1/-1)
Percona-Server/storage/ndb/tools/ndb_dist_priv.sql (+1/-1)
Percona-Server/storage/ndb/tools/ndb_dump_frm_data.cpp (+1/-1)
Percona-Server/storage/ndb/tools/ndb_index_stat.cpp (+1/-1)
Percona-Server/storage/perfschema/cursor_by_account.cc (+1/-1)
Percona-Server/storage/perfschema/cursor_by_account.h (+1/-1)
Percona-Server/storage/perfschema/cursor_by_host.cc (+1/-1)
Percona-Server/storage/perfschema/cursor_by_host.h (+1/-1)
Percona-Server/storage/perfschema/cursor_by_thread.cc (+1/-1)
Percona-Server/storage/perfschema/cursor_by_thread.h (+1/-1)
Percona-Server/storage/perfschema/cursor_by_user.cc (+1/-1)
Percona-Server/storage/perfschema/cursor_by_user.h (+1/-1)
Percona-Server/storage/perfschema/pfs.cc (+17/-20)
Percona-Server/storage/perfschema/pfs_account.cc (+1/-1)
Percona-Server/storage/perfschema/pfs_account.h (+1/-1)
Percona-Server/storage/perfschema/pfs_host.cc (+1/-1)
Percona-Server/storage/perfschema/pfs_host.h (+1/-1)
Percona-Server/storage/perfschema/pfs_instr.cc (+1/-3)
Percona-Server/storage/perfschema/pfs_instr.h (+2/-6)
Percona-Server/storage/perfschema/pfs_instr_class.cc (+6/-2)
Percona-Server/storage/perfschema/pfs_instr_class.h (+9/-2)
Percona-Server/storage/perfschema/pfs_setup_object.cc (+1/-1)
Percona-Server/storage/perfschema/pfs_stat.h (+6/-1)
Percona-Server/storage/perfschema/pfs_user.cc (+1/-1)
Percona-Server/storage/perfschema/pfs_user.h (+1/-1)
Percona-Server/storage/perfschema/table_esgs_by_account_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_esgs_by_account_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_esgs_by_host_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_esgs_by_host_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_esgs_by_user_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_esgs_by_user_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_account_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_account_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_digest.cc (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_digest.h (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_host_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_host_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_user_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_esms_by_user_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_ews_by_account_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_ews_by_account_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_ews_by_host_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_ews_by_host_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_ews_by_user_by_event_name.cc (+1/-1)
Percona-Server/storage/perfschema/table_ews_by_user_by_event_name.h (+1/-1)
Percona-Server/storage/perfschema/table_helper.cc (+1/-1)
Percona-Server/storage/perfschema/table_helper.h (+3/-3)
Percona-Server/storage/perfschema/table_os_global_by_type.cc (+1/-1)
Percona-Server/storage/perfschema/table_os_global_by_type.h (+1/-1)
Percona-Server/storage/perfschema/table_threads.cc (+9/-15)
Percona-Server/storage/perfschema/table_tiws_by_table.cc (+1/-1)
Percona-Server/storage/perfschema/table_tiws_by_table.h (+1/-1)
Percona-Server/storage/perfschema/table_tlws_by_table.cc (+1/-1)
Percona-Server/storage/perfschema/table_tlws_by_table.h (+1/-1)
Percona-Server/storage/perfschema/unittest/stub_pfs_defaults.h (+1/-1)
Percona-Server/storage/perfschema/unittest/stub_server_misc.h (+1/-1)
Percona-Server/strings/conf_to_src.c (+1/-1)
Percona-Server/strings/decimal.c (+1/-1)
Percona-Server/strings/t_ctype.h (+1/-1)
Percona-Server/strings/xml.c (+1/-1)
Percona-Server/support-files/MacOSX/Description.plist.sh (+1/-1)
Percona-Server/support-files/MacOSX/Info.plist.sh (+1/-1)
Percona-Server/support-files/MacOSX/MySQLCOM (+1/-1)
Percona-Server/support-files/MacOSX/ReadMe.txt (+1/-2)
Percona-Server/support-files/MacOSX/StartupItem.Description.plist (+1/-1)
Percona-Server/support-files/MacOSX/StartupItem.Info.plist (+1/-1)
Percona-Server/support-files/MacOSX/StartupItem.postinstall (+1/-1)
Percona-Server/support-files/MacOSX/StartupParameters.plist.sh (+1/-1)
Percona-Server/support-files/MacOSX/mwar-wrapper (+1/-1)
Percona-Server/support-files/MacOSX/mwcc-wrapper (+1/-1)
Percona-Server/support-files/MacOSX/postflight.sh (+2/-2)
Percona-Server/support-files/MacOSX/preflight.sh (+2/-2)
Percona-Server/support-files/MySQL-shared-compat.spec.sh (+3/-3)
Percona-Server/support-files/RHEL4-SElinux/mysql.fc (+1/-1)
Percona-Server/support-files/RHEL4-SElinux/mysql.te (+1/-1)
Percona-Server/support-files/compiler_warnings.supp (+1/-1)
Percona-Server/support-files/mysql.m4 (+2/-2)
Percona-Server/support-files/mysql.server.sh (+7/-1)
Percona-Server/support-files/mysql.spec.sh (+1/-2)
Percona-Server/tests/connect_test.c (+1/-1)
Percona-Server/tests/deadlock_test.c (+1/-1)
Percona-Server/tests/drop_test.pl (+1/-1)
Percona-Server/tests/export.pl (+1/-1)
Percona-Server/tests/fork2_test.pl (+1/-1)
Percona-Server/tests/fork_big.pl (+1/-1)
Percona-Server/tests/fork_big2.pl (+1/-1)
Percona-Server/tests/index_corrupt.pl (+1/-1)
Percona-Server/tests/insert_and_repair.pl (+1/-1)
Percona-Server/tests/insert_test.c (+1/-1)
Percona-Server/tests/list_test.c (+1/-1)
Percona-Server/tests/lock_test.pl (+1/-1)
Percona-Server/tests/mysql_client_fw.c (+1/-1)
Percona-Server/tests/mysql_client_test.c (+1/-1)
Percona-Server/tests/pmail.pl (+1/-1)
Percona-Server/tests/rename_test.pl (+1/-1)
Percona-Server/tests/select_test.c (+1/-1)
Percona-Server/tests/showdb_test.c (+1/-1)
Percona-Server/tests/ssl_test.c (+1/-1)
Percona-Server/tests/table_types.pl (+1/-1)
Percona-Server/tests/test_delayed_insert.pl (+1/-1)
Percona-Server/tests/truncate.pl (+1/-1)
Percona-Server/unittest/gunit/CMakeLists.txt (+3/-2)
Percona-Server/unittest/gunit/bounded_queue-t.cc (+1/-1)
Percona-Server/unittest/gunit/bounds_checked_array-t.cc (+1/-1)
Percona-Server/unittest/gunit/cost_estimate-t.cc (+1/-1)
Percona-Server/unittest/gunit/dbug-t.cc (+85/-2)
Percona-Server/unittest/gunit/dynarray-t.cc (+1/-1)
Percona-Server/unittest/gunit/explain_filename-t.cc (+193/-0)
Percona-Server/unittest/gunit/field-t.cc (+1/-1)
Percona-Server/unittest/gunit/field_date-t.cc (+1/-1)
Percona-Server/unittest/gunit/field_datetime-t.cc (+1/-1)
Percona-Server/unittest/gunit/field_long-t.cc (+1/-1)
Percona-Server/unittest/gunit/field_newdecimal-t.cc (+1/-1)
Percona-Server/unittest/gunit/field_temporal_utils.h (+1/-1)
Percona-Server/unittest/gunit/item-t.cc (+1/-1)
Percona-Server/unittest/gunit/join_tab_sort-t.cc (+1/-1)
Percona-Server/unittest/gunit/mdl-t.cc (+1/-1)
Percona-Server/unittest/gunit/mock_create_field.h (+1/-1)
Percona-Server/unittest/gunit/mock_field_timestamp.h (+1/-1)
Percona-Server/unittest/gunit/mock_field_timestampf.h (+1/-1)
Percona-Server/unittest/gunit/my_decimal-t.cc (+1/-1)
Percona-Server/unittest/gunit/my_regex-t.cc (+1/-1)
Percona-Server/unittest/gunit/opt_range-t.cc (+1/-1)
Percona-Server/unittest/gunit/test_mdl_context_owner.h (+1/-1)
Percona-Server/unittest/gunit/test_utils.cc (+1/-1)
Percona-Server/unittest/gunit/test_utils.h (+1/-1)
Percona-Server/unittest/mytap/tap.c (+1/-1)
Percona-Server/unittest/mytap/tap.h (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.6.12
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+170672@code.launchpad.net

This proposal supersedes a proposal from 2013-06-07.

Description of the change

2nd MP:

- Rebased on the current 5.6 trunk
- Fixed http://bugs.mysql.com/bug.php?id=69419 using IF(@@open_files_limit < 5000; expected default; actual value).

http://jenkins.percona.com/job/percona-server-5.6-param/152/

1st MP:
http://jenkins.percona.com/job/percona-server-5.6-param/134/

Merge MySQL 5.6.12. Non-automerge bits:

- Revert our fix for bug 1155859 due to the upstream fix.
- Revert our fix for bug 1035225 due to the upstream fix, but keeping
  our testcase.
- Revert our fix for bug 1135097 due to the upstream fix, but keeping
  our testcase.
- Revert our fix for bug 1017192 due to the upstream fix, but keeping
  our testcase.
- Add MTR suppressions for the additional diagnostics in 5.6.12 for
  percona_bug_999147.test.
- Re-enable parts of group_commit_crash.test that were disabled due to
  http://bugs.mysql.com/bug.php?id=68932.
- Add fake changes support to then ne in 5.6.12 function
  lock_trx_has_rec_x_lock()
- Fix upstream regresion bug 1188516 /
  http://bugs.mysql.com/bug.php?id=69419 (Undocumented and untested
  table_open_cache table_definition_cache default change) by only
  adjusting the maximum connections and table cache size defaults in
  the case when open_files_limit == 0, as it was done in 5.6.11 and
  earlier.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

The fix for http://bugs.mysql.com/bug.php?id=69419 looks problematic. We seem to be deviating from upstream (with all implications for users and performance_schema autosizing) merely to make a few tests pass in specific OS configurations.

Aren't there any better (less invasive) solutions? I didn't investigate the problem in details, but perhaps tweaking our Jenkins slaves would fix it without changing the server behavior? Or, if table_open_cache and table_definition_cache get some specific fixed values once the OS open_files limit is below a certain threshold, could we allow both "below threshold" and "above threshold" values in test results, e.g. with "--replace_result 615 1400"? Or, as the comment in the report suggests, check the actual (possibly adjusted) value of open_files_limit and skip the relevant tests if its below the threshold?

review: Needs Information
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Alexey -

The upstream bug is that the default values have been silently changed from 5.6.11 to 5.6.12 for systems with specific configurations. My patch restores the 5.6.11 behavior that matches all the current docs and cannot have any worse implications than Oracle 5.6.11 itself, which seems quite safe to me. I strongly suspect that the 5.6.12 change was unintended consequence of a refactoring (the commit fixes P_S sizing, does not say a word about changed defaults) and will be either documented as a feature for 5.6.12 post-factum now that they are aware of it, either will be reverted.

If you still want me to change this to match 5.6.12 instead of 5.6.11 then all three options should work, I'd implement the "below threshold" and "above threshold" option.

Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal
Download full text (4.4 KiB)

Hi Laurynas,

On Wed, 19 Jun 2013 15:28:29 -0000, Laurynas Biveinis wrote:
> Alexey -
>
> The upstream bug is that the default values have been silently changed from 5.6.11 to 5.6.12 for systems with specific configurations. My patch restores the 5.6.11 behavior that matches all the current docs and cannot have any worse implications than Oracle 5.6.11 itself, which seems quite safe to me. I strongly suspect that the 5.6.12 change was unintended consequence of a refactoring (the commit fixes P_S sizing, does not say a word about changed defaults) and will be either documented as a feature for 5.6.12 post-factum now that they are aware of it, either will be reverted.
>

So, took me a while to figure all the details, will probably take even
longer to explain :)

OK, pre-5.6.12 behavior (in 5.6.8 - 5.6.11 to be specific):

1. Read variables values from configuration or use their default values

2. Use them to calculate performance autosized settings

3. Try to set the desired open_files limit based on open_files_limit (or
5000 if it's zero), max_connections and table_open_cache

4. See if were only allowed to raise the limit to a lower value.

5. If that's the case, adjust max_connections and table_open_cache, but
only if open_files_limit was 0. I don't think it is (was) documented
anywhere, including the open_files_limit=0 prerequisite. There's also an
old feature request to change that: http://bugs.mysql.com/bug.php?id=43427

And the purpose of that prerequisite is also unclear. Perhaps to avoid
autosizing when a hard-coded "default" value of 5000 is used.

6. Adjust table_definition_cache only if it was not specified explicitly
by the user based on the current (possibly adjusted) value of
table_open_cache

Important things to note here are that:
- autosizing of table_open_cache might occur only if open_files_limit=0
and we could not raise the limit to the desired value (not documented)
- autosizing of table_definition_cache might occur if it was not
specified explicitly (documented, see below)

As the 4948 revision comment says, the problem was that Performance
Schema autosizing was based on wrong values, i.e. before they are
adjusted later.

Now enter 5.6.12. What's changed in the above is basically that:

- adjustments are performed before perf. schema initialization
- the open_files_limit=0 prerequisite for adjusting table_open_cache got
dropped. I can see why it was done, it makes the logic unnecessary
complicated and again, it was not documented anywhere.

Back to http://bugs.mysql.com/bug.php?id=69419:

Was it an undocumented change of default values for table_open_cache and
table_definition_cache?

I don't think so. Docs say that the value of table_definition_cache is
autosized by default based on the "400 + (table_open_cache / 2)"
formula. No questions here, it was like that before 5.6.12 and is like
that in 5.6.12.

For table_open_cache, docs say the default value is 2000. This is only
half true. It is 2000, if we could reserve the desired number of open
files on startup, *and* before 5.6.12 if open_files_limit is 0.
Otherwise it is autosized based on the actual open_files limit we could
achieve and max_connecti...

Read more...

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

The problem with the "--replace_result <low value> <default>" approach is that low value will vary, for example, table_definition_cache may become anything between 615 and 1399. replace_regexp is not practical for matching such range exactly, and a broad regexp, e.g. [0-9]+ IMHO kills the purpose of the test.

That leaves the option of skipping the tests. I'd prefer checking the system ulimit (there are such tests already) instead of the actual adjusted variable value as the latter approach undermines the actual default value testing (if the default is broken, the test is skipped, never fails).

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Speaking too soon is the mother of stupidity.

The system ulimit check _is_ performed through the adjusted open_files_limit query.

Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

Or we can just remove the default values checks and keep the rest of the corresponding tests?

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Yes, we can do that. Would there be any advantage over open_files_limit < 500 test skipping approach, which I have almost finished implementing?

The pro would be the tests actually being run with low ulimits. The con would be missing default value checks. Both of them look hair-splitting to me, especially that we'd expect to revert the fix in one or two point releases.

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

s/500/5000

Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

Is missing the default value checks really a con? As in, if we skip tests, we don't get *any* checks?

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

The tests still run on large ulimit -n machines, which both we and upstream have in our CI farms (and it is apparent that there is not a single small ulimit -n machine in both of them) and the tested functionality is mostly orthogonal to the ulimit value. Thus IMHO don't we don't lose much by skipping testing on small ulimit machines. While the defaults have some calculating algorithm behind them, which is possible to break and not know about it, since it would not be checked anywhere at all.

Maybe technically better would be splitting the default checks to their own testcases, that would be skipped on low-ulimit machines and the rest that is runnable everywhere? But then again I wouldn't see much return on the time spent here.

Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

s/SELECT @start_value;/SELECT IF(@@open_files_limit < 5000, 400, @start_value);/ ? :)

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Perfect.

Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-05-31 16:00:19 +0000
3+++ Makefile 2013-06-20 17:28:44 +0000
4@@ -1,5 +1,5 @@
5-MYSQL_VERSION=5.6.11
6-PERCONA_SERVER_VERSION=rc60.3
7+MYSQL_VERSION=5.6.12
8+PERCONA_SERVER_VERSION=rc60.4
9 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
10 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
11 PERCONA_SERVER_SHORT_2 ?=Percona-Server
12
13=== modified file 'Percona-Server/BUILD/SETUP.sh'
14--- Percona-Server/BUILD/SETUP.sh 2013-02-26 05:45:28 +0000
15+++ Percona-Server/BUILD/SETUP.sh 2013-06-20 17:28:44 +0000
16@@ -14,8 +14,8 @@
17 #
18 # You should have received a copy of the GNU Library General Public
19 # License along with this library; if not, write to the Free
20-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
21-# MA 02111-1307, USA
22+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
23+# MA 02110-1301, USA
24
25 ########################################################################
26
27
28=== modified file 'Percona-Server/BUILD/compile-pentium'
29--- Percona-Server/BUILD/compile-pentium 2013-05-12 06:24:46 +0000
30+++ Percona-Server/BUILD/compile-pentium 2013-06-20 17:28:44 +0000
31@@ -13,7 +13,7 @@
32 #
33 # You should have received a copy of the GNU General Public License
34 # along with this program; if not, write to the Free Software
35-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
36+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
37
38 path=`dirname $0`
39 cmake $path/.. -DWITH_DEBUG=0
40
41=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-ndb'
42--- Percona-Server/BUILD/compile-pentium-debug-max-no-ndb 2013-05-12 06:24:46 +0000
43+++ Percona-Server/BUILD/compile-pentium-debug-max-no-ndb 2013-06-20 17:28:44 +0000
44@@ -13,7 +13,7 @@
45 #
46 # You should have received a copy of the GNU General Public License
47 # along with this program; if not, write to the Free Software
48-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
49+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
50
51 path=`dirname $0`
52 cmake $path/.. -DWITH_DEBUG=1 -DWITH_NDBCLUSTER=0
53
54=== modified file 'Percona-Server/BUILD/compile-pentium-gcov'
55--- Percona-Server/BUILD/compile-pentium-gcov 2012-08-22 01:40:20 +0000
56+++ Percona-Server/BUILD/compile-pentium-gcov 2013-06-20 17:28:44 +0000
57@@ -13,7 +13,7 @@
58 #
59 # You should have received a copy of the GNU General Public License
60 # along with this program; if not, write to the Free Software
61-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
62+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
63
64 path=`dirname $0`
65 cmake $path/.. -DWITH_DEBUG=1 -DENABLE_GCOV=ON
66
67=== modified file 'Percona-Server/BUILD/compile-pentium-gprof'
68--- Percona-Server/BUILD/compile-pentium-gprof 2012-08-22 01:40:20 +0000
69+++ Percona-Server/BUILD/compile-pentium-gprof 2013-06-20 17:28:44 +0000
70@@ -13,7 +13,7 @@
71 #
72 # You should have received a copy of the GNU General Public License
73 # along with this program; if not, write to the Free Software
74-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
75+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
76
77 path=`dirname $0`
78 cmake $path/.. -DWITH_DEBUG=0 -DENABLE_GPROF=ON
79
80=== modified file 'Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb'
81--- Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb 2012-08-22 01:40:20 +0000
82+++ Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb 2013-06-20 17:28:44 +0000
83@@ -14,8 +14,8 @@
84 #
85 # You should have received a copy of the GNU Library General Public
86 # License along with this library; if not, write to the Free
87-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
88-# MA 02111-1307, USA
89+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
90+# MA 02110-1301, USA
91
92 path=`dirname $0`
93 cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \
94
95=== modified file 'Percona-Server/BUILD/compile-pentium64'
96--- Percona-Server/BUILD/compile-pentium64 2012-08-22 01:40:20 +0000
97+++ Percona-Server/BUILD/compile-pentium64 2013-06-20 17:28:44 +0000
98@@ -14,8 +14,8 @@
99 #
100 # You should have received a copy of the GNU Library General Public
101 # License along with this library; if not, write to the Free
102-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
103-# MA 02111-1307, USA
104+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
105+# MA 02110-1301, USA
106
107 path=`dirname $0`
108 cmake $path/.. -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64
109
110=== modified file 'Percona-Server/CMakeLists.txt'
111--- Percona-Server/CMakeLists.txt 2013-05-12 09:13:00 +0000
112+++ Percona-Server/CMakeLists.txt 2013-06-20 17:28:44 +0000
113@@ -1,4 +1,4 @@
114-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
115+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
116 #
117 # This program is free software; you can redistribute it and/or modify
118 # it under the terms of the GNU General Public License as published by
119@@ -328,8 +328,8 @@
120 MYSQL_CHECK_ZLIB_WITH_COMPRESS()
121 # Add bundled yassl/taocrypt or system openssl.
122 MYSQL_CHECK_SSL()
123-# Add readline or libedit.
124-MYSQL_CHECK_READLINE()
125+# Add system/bundled editline.
126+MYSQL_CHECK_EDITLINE()
127 # Add libevent
128 MYSQL_CHECK_LIBEVENT()
129
130@@ -381,6 +381,10 @@
131 ADD_SUBDIRECTORY(unittest/examples)
132 ADD_SUBDIRECTORY(unittest/mytap)
133 ADD_SUBDIRECTORY(unittest/mytap/t)
134+ # Visual Studio 11 needs this extra flag in order to compile gmock.
135+ IF(WIN32)
136+ ADD_DEFINITIONS( /D _VARIADIC_MAX=10 )
137+ ENDIF()
138 ADD_SUBDIRECTORY(unittest/gunit)
139 ENDIF()
140
141
142=== modified file 'Percona-Server/Docs/mysql.info'
143--- Percona-Server/Docs/mysql.info 2013-05-10 09:39:17 +0000
144+++ Percona-Server/Docs/mysql.info 2013-06-20 17:28:44 +0000
145@@ -1,4 +1,3 @@
146
147 The MySQL Reference Manual is available in various formats on
148-http://dev.mysql.com/doc; if you're interested in the DocBook XML
149-sources go to http://svn.mysql.com.
150+http://dev.mysql.com/doc.
151
152=== modified file 'Percona-Server/INSTALL-SOURCE'
153--- Percona-Server/INSTALL-SOURCE 2013-05-10 09:39:17 +0000
154+++ Percona-Server/INSTALL-SOURCE 2013-06-20 17:28:44 +0000
155@@ -4,5 +4,4 @@
156 http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
157
158 The MySQL Reference Manual is also available in various formats on
159-http://dev.mysql.com/doc; if you're interested in the DocBook XML
160-sources go to http://svn.mysql.com.
161+http://dev.mysql.com/doc.
162
163=== modified file 'Percona-Server/INSTALL-WIN-SOURCE'
164--- Percona-Server/INSTALL-WIN-SOURCE 2013-05-10 09:39:17 +0000
165+++ Percona-Server/INSTALL-WIN-SOURCE 2013-06-20 17:28:44 +0000
166@@ -5,5 +5,4 @@
167 http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
168
169 The MySQL Reference Manual is also available in various formats on
170-http://dev.mysql.com/doc; if you're interested in the DocBook XML
171-sources go to http://svn.mysql.com.
172+http://dev.mysql.com/doc.
173
174=== modified file 'Percona-Server/README'
175--- Percona-Server/README 2013-01-01 02:38:33 +0000
176+++ Percona-Server/README 2013-06-20 17:28:44 +0000
177@@ -1,56 +1,56 @@
178-MySQL Server 5.6
179-
180-This is a release of MySQL, a dual-license SQL database server.
181-For the avoidance of doubt, this particular copy of the software
182-is released under the version 2 of the GNU General Public License.
183-MySQL is brought to you by Oracle.
184-
185-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
186-
187-License information can be found in the COPYING file.
188-
189-MySQL FOSS License Exception
190-We want free and open source software applications under certain
191-licenses to be able to use specified GPL-licensed MySQL client
192-libraries despite the fact that not all such FOSS licenses are
193-compatible with version 2 of the GNU General Public License.
194-Therefore there are special exceptions to the terms and conditions
195-of the GPLv2 as applied to these client libraries, which are
196-identified and described in more detail in the FOSS License
197-Exception at
198-<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
199-
200-This distribution may include materials developed by third
201-parties. For license and attribution notices for these
202-materials, please refer to the documentation that accompanies
203-this distribution (see the "Licenses for Third-Party Components"
204-appendix) or view the online documentation at
205-<http://dev.mysql.com/doc/>.
206-
207-GPLv2 Disclaimer
208-For the avoidance of doubt, except that if any license choice
209-other than GPL or LGPL is available it will apply instead,
210-Oracle elects to use only the General Public License version 2
211-(GPLv2) at this time for any software where a choice of GPL
212-license versions is made available with the language indicating
213-that GPLv2 or any later version may be used, or where a choice
214-of which version of the GPL is applied is otherwise unspecified.
215-
216-For further information about MySQL or additional documentation,
217-see:
218-- The latest information about MySQL: http://www.mysql.com
219-- The current MySQL documentation: http://dev.mysql.com/doc
220-
221-Some Reference Manual sections of special interest:
222-- If you are migrating from an older version of MySQL, please
223- read the "Upgrading from..." section.
224-- To see what MySQL can do, take a look at the features section.
225-- For installation instructions, see the Installing and Upgrading
226- chapter.
227-- For the new features/bugfix history, see the MySQL Change History
228- appendix.
229-
230-You can browse the MySQL Reference Manual online or download it
231-in any of several formats at the URL given earlier in this file.
232-Source distributions include a local copy of the manual in the
233-Docs directory.
234+MySQL Server 5.6
235+
236+This is a release of MySQL, a dual-license SQL database server.
237+For the avoidance of doubt, this particular copy of the software
238+is released under the version 2 of the GNU General Public License.
239+MySQL is brought to you by Oracle.
240+
241+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
242+
243+License information can be found in the COPYING file.
244+
245+MySQL FOSS License Exception
246+We want free and open source software applications under certain
247+licenses to be able to use specified GPL-licensed MySQL client
248+libraries despite the fact that not all such FOSS licenses are
249+compatible with version 2 of the GNU General Public License.
250+Therefore there are special exceptions to the terms and conditions
251+of the GPLv2 as applied to these client libraries, which are
252+identified and described in more detail in the FOSS License
253+Exception at
254+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
255+
256+This distribution may include materials developed by third
257+parties. For license and attribution notices for these
258+materials, please refer to the documentation that accompanies
259+this distribution (see the "Licenses for Third-Party Components"
260+appendix) or view the online documentation at
261+<http://dev.mysql.com/doc/>.
262+
263+GPLv2 Disclaimer
264+For the avoidance of doubt, except that if any license choice
265+other than GPL or LGPL is available it will apply instead,
266+Oracle elects to use only the General Public License version 2
267+(GPLv2) at this time for any software where a choice of GPL
268+license versions is made available with the language indicating
269+that GPLv2 or any later version may be used, or where a choice
270+of which version of the GPL is applied is otherwise unspecified.
271+
272+For further information about MySQL or additional documentation,
273+see:
274+- The latest information about MySQL: http://www.mysql.com
275+- The current MySQL documentation: http://dev.mysql.com/doc
276+
277+Some Reference Manual sections of special interest:
278+- If you are migrating from an older version of MySQL, please
279+ read the "Upgrading from..." section.
280+- To see what MySQL can do, take a look at the features section.
281+- For installation instructions, see the Installing and Upgrading
282+ chapter.
283+- For the new features/bugfix history, see the MySQL Change History
284+ appendix.
285+
286+You can browse the MySQL Reference Manual online or download it
287+in any of several formats at the URL given earlier in this file.
288+Source distributions include a local copy of the manual in the
289+Docs directory.
290
291=== modified file 'Percona-Server/VERSION'
292--- Percona-Server/VERSION 2013-05-12 09:13:00 +0000
293+++ Percona-Server/VERSION 2013-06-20 17:28:44 +0000
294@@ -1,4 +1,4 @@
295 MYSQL_VERSION_MAJOR=5
296 MYSQL_VERSION_MINOR=6
297-MYSQL_VERSION_PATCH=11
298+MYSQL_VERSION_PATCH=12
299 MYSQL_VERSION_EXTRA=
300
301=== modified file 'Percona-Server/client/CMakeLists.txt'
302--- Percona-Server/client/CMakeLists.txt 2013-05-22 08:50:07 +0000
303+++ Percona-Server/client/CMakeLists.txt 2013-06-20 17:28:44 +0000
304@@ -1,4 +1,4 @@
305-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
306+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
307 #
308 # This program is free software; you can redistribute it and/or modify
309 # it under the terms of the GNU General Public License as published by
310@@ -22,7 +22,7 @@
311 ${CMAKE_SOURCE_DIR}/regex
312 ${CMAKE_SOURCE_DIR}/sql
313 ${CMAKE_SOURCE_DIR}/strings
314- ${READLINE_INCLUDE_DIR}
315+ ${EDITLINE_INCLUDE_DIR}
316 ${CMAKE_CURRENT_BINARY_DIR}
317 )
318
319@@ -30,13 +30,11 @@
320 ## We will need libeay32.dll and ssleay32.dll when running client executables.
321 COPY_OPENSSL_DLLS(copy_openssl_client)
322
323-
324-ADD_DEFINITIONS(${READLINE_DEFINES})
325 ADD_DEFINITIONS(${SSL_DEFINES})
326 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
327 TARGET_LINK_LIBRARIES(mysql mysqlclient)
328 IF(UNIX)
329- TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
330+ TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
331 ENDIF(UNIX)
332
333 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
334
335=== modified file 'Percona-Server/client/completion_hash.h'
336--- Percona-Server/client/completion_hash.h 2013-02-26 05:45:28 +0000
337+++ Percona-Server/client/completion_hash.h 2013-06-20 17:28:44 +0000
338@@ -13,8 +13,8 @@
339
340 You should have received a copy of the GNU Library General Public
341 License along with this library; if not, write to the Free
342- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
343- MA 02111-1307, USA */
344+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
345+ MA 02110-1301, USA */
346
347 #ifndef _HASH_
348 #define _HASH_
349
350=== modified file 'Percona-Server/client/echo.c'
351--- Percona-Server/client/echo.c 2013-02-26 05:45:28 +0000
352+++ Percona-Server/client/echo.c 2013-06-20 17:28:44 +0000
353@@ -12,7 +12,7 @@
354
355 You should have received a copy of the GNU General Public License
356 along with this program; if not, write to the Free Software
357- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
358+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
359
360 /*
361 echo is a replacement for the "echo" command builtin to cmd.exe
362
363=== modified file 'Percona-Server/client/mysql.cc'
364--- Percona-Server/client/mysql.cc 2013-06-12 05:31:35 +0000
365+++ Percona-Server/client/mysql.cc 2013-06-20 17:28:44 +0000
366@@ -102,7 +102,7 @@
367 #if defined(__WIN__)
368 #include <conio.h>
369 #else
370-#include <readline/readline.h>
371+#include <readline.h>
372 #define HAVE_READLINE
373 #define USE_POPEN
374 #endif
375@@ -169,6 +169,7 @@
376 static char *opt_bind_addr = NULL;
377 static int connect_flag=CLIENT_INTERACTIVE;
378 static my_bool opt_binary_mode= FALSE;
379+static my_bool opt_connect_expired_password= FALSE;
380 static char *current_host,*current_db,*current_user=0,*opt_password=0,
381 *current_prompt=0, *delimiter_str= 0,
382 *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME,
383@@ -1770,6 +1771,11 @@
384 &opt_server_public_key, &opt_server_public_key, 0,
385 GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
386 #endif
387+ {"connect-expired-password", 0,
388+ "Notify the server that this client is prepared to handle expired "
389+ "password sandbox mode.",
390+ &opt_connect_expired_password, &opt_connect_expired_password, 0, GET_BOOL,
391+ NO_ARG, 0, 0, 0, 0, 0, 0},
392 { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
393 };
394
395@@ -2044,7 +2050,7 @@
396 String buffer;
397 #endif
398
399- char *line;
400+ char *line= NULL;
401 char in_string=0;
402 ulong line_number=0;
403 bool ml_comment= 0;
404@@ -2130,6 +2136,13 @@
405 #else
406 if (opt_outfile)
407 fputs(prompt, OUTFILE);
408+ /*
409+ free the previous entered line.
410+ Note: my_free() cannot be used here as the memory was allocated under
411+ the readline/libedit library.
412+ */
413+ if (line)
414+ free(line);
415 line= readline(prompt);
416 #endif /* defined(__WIN__) */
417
418@@ -2189,6 +2202,14 @@
419 #if defined(__WIN__)
420 buffer.free();
421 tmpbuf.free();
422+#else
423+ if (interactive)
424+ /*
425+ free the last entered line.
426+ Note: my_free() cannot be used here as the memory was allocated under
427+ the readline/libedit library.
428+ */
429+ free(line);
430 #endif
431
432 /*
433@@ -3035,7 +3056,7 @@
434 for (i= 0; i < histignore_patterns.elements; i++)
435 {
436 tmp= dynamic_element(&histignore_patterns, i, LEX_STRING *);
437- if ((rc= charset_info->coll->wildcmp(&my_charset_latin1,
438+ if ((rc= charset_info->coll->wildcmp(charset_info,
439 string, string + strlen(string),
440 tmp->str, tmp->str + tmp->length,
441 wild_prefix, wild_one,
442@@ -4729,7 +4750,8 @@
443 sql_real_connect(char *host,char *database,char *user,char *password,
444 uint silent)
445 {
446- my_bool interactive= status.batch ? FALSE : TRUE;
447+ my_bool handle_expired= (opt_connect_expired_password || !status.batch) ?
448+ TRUE : FALSE;
449
450 if (connected)
451 {
452@@ -4821,7 +4843,7 @@
453 mysql_options(&mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
454 mysql_options4(&mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
455 "program_name", "mysql");
456- mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &interactive);
457+ mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &handle_expired);
458
459 if (!mysql_real_connect(&mysql, host, user, password,
460 database, opt_mysql_port, opt_mysql_unix_port,
461
462=== modified file 'Percona-Server/client/mysql_plugin.c'
463--- Percona-Server/client/mysql_plugin.c 2013-02-26 05:45:28 +0000
464+++ Percona-Server/client/mysql_plugin.c 2013-06-20 17:28:44 +0000
465@@ -12,7 +12,7 @@
466
467 You should have received a copy of the GNU General Public License
468 along with this program; if not, write to the Free Software
469- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
470+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
471 */
472
473 #include <m_string.h>
474
475=== modified file 'Percona-Server/client/mysql_upgrade.c'
476--- Percona-Server/client/mysql_upgrade.c 2013-05-12 06:24:46 +0000
477+++ Percona-Server/client/mysql_upgrade.c 2013-06-20 17:28:44 +0000
478@@ -1,5 +1,5 @@
479 /*
480- Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
481+ Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
482
483 This program is free software; you can redistribute it and/or modify
484 it under the terms of the GNU General Public License as published by
485@@ -40,7 +40,7 @@
486 static char mysqlcheck_path[FN_REFLEN];
487
488 static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
489- opt_systables_only;
490+ opt_systables_only, opt_version_check;
491 static uint my_end_arg= 0;
492 static char *opt_user= (char*)"root";
493
494@@ -129,6 +129,12 @@
495 "Base name of shared memory.", 0,
496 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
497 #endif
498+ {"version-check", 'k', "Run this program only if its \'server version\' "
499+ "matches the version of the server to which it's connecting, (enabled by "
500+ "default); use --skip-version-check to avoid this check. Note: the \'server "
501+ "version\' of the program is the version of the MySQL server with which it "
502+ "was built/distributed.", &opt_version_check, &opt_version_check, 0,
503+ GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
504 {"socket", 'S', "The socket file to use for connection.",
505 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
506 #include <sslopt-longopts.h>
507@@ -286,6 +292,7 @@
508 my_progname, optid == 'b' ? "basedir" : "datadir");
509 /* FALLTHROUGH */
510
511+ case 'k': /* --version-check */
512 case 'v': /* --verbose */
513 case 'f': /* --force */
514 case 's': /* --upgrade-system-tables */
515@@ -552,6 +559,8 @@
516 static int extract_variable_from_show(DYNAMIC_STRING* ds, char* value)
517 {
518 char *value_start, *value_end;
519+ size_t len;
520+
521 /*
522 The query returns "datadir\t<datadir>\n", skip past
523 the tab
524@@ -564,7 +573,9 @@
525 if ((value_end= strchr(value_start, '\n')) == NULL)
526 return 1; /* Unexpected result */
527
528- strncpy(value, value_start, MY_MIN(FN_REFLEN, value_end - value_start));
529+ len= (size_t) MY_MIN(FN_REFLEN, value_end-value_start);
530+ strncpy(value, value_start, len);
531+ value[len]= '\0';
532 return 0;
533 }
534
535@@ -891,6 +902,55 @@
536 };
537
538
539+/* Convert the specified version string into the numeric format. */
540+static ulong STDCALL calc_server_version(char *some_version)
541+{
542+ uint major, minor, version;
543+ char *point= some_version, *end_point;
544+ major= (uint) strtoul(point, &end_point, 10); point=end_point+1;
545+ minor= (uint) strtoul(point, &end_point, 10); point=end_point+1;
546+ version= (uint) strtoul(point, &end_point, 10);
547+ return (ulong) major * 10000L + (ulong)(minor * 100 + version);
548+}
549+
550+/**
551+ Check if the server version matches with the server version mysql_upgrade
552+ was compiled with.
553+
554+ @return 0 match successful
555+ 1 failed
556+*/
557+static int check_version_match(void)
558+{
559+ DYNAMIC_STRING ds_version;
560+ char version_str[NAME_CHAR_LEN + 1];
561+
562+ if (init_dynamic_string(&ds_version, NULL, NAME_CHAR_LEN, NAME_CHAR_LEN))
563+ die("Out of memory");
564+
565+ if (run_query("show variables like 'version'",
566+ &ds_version, FALSE) ||
567+ extract_variable_from_show(&ds_version, version_str))
568+ {
569+ dynstr_free(&ds_version);
570+ return 1; /* Query failed */
571+ }
572+
573+ dynstr_free(&ds_version);
574+
575+ if (calc_server_version((char *) version_str) != MYSQL_VERSION_ID)
576+ {
577+ fprintf(stderr, "Error: Server version (%s) does not match with the "
578+ "version of\nthe server (%s) with which this program was built/"
579+ "distributed. You can\nuse --skip-version-check to skip this "
580+ "check.\n", version_str, MYSQL_SERVER_VERSION);
581+ return 1;
582+ }
583+ else
584+ return 0;
585+}
586+
587+
588 int main(int argc, char **argv)
589 {
590 char self_name[FN_REFLEN];
591@@ -957,6 +1017,9 @@
592 die(NULL);
593 }
594
595+ if (opt_version_check && check_version_match())
596+ die("Upgrade failed");
597+
598 /*
599 Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
600 First run mysqlcheck on the system database.
601
602=== modified file 'Percona-Server/client/mysqlbinlog.cc'
603--- Percona-Server/client/mysqlbinlog.cc 2013-05-12 09:13:00 +0000
604+++ Percona-Server/client/mysqlbinlog.cc 2013-06-20 17:28:44 +0000
605@@ -187,6 +187,10 @@
606 *opt_exclude_gtids_str= NULL;
607 static my_bool opt_skip_gtids= 0;
608 static bool filter_based_on_gtids= false;
609+
610+static bool in_transaction= false;
611+static bool seen_gtids= false;
612+
613 static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
614 const char* logname);
615 static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
616@@ -745,6 +749,60 @@
617 filtered= filtered || opt_skip_gtids;
618 }
619 break;
620+ /* Skip previous gtids if --skip-gtids is set. */
621+ case PREVIOUS_GTIDS_LOG_EVENT:
622+ filtered= opt_skip_gtids;
623+ break;
624+
625+ /*
626+ Transaction boundaries reset the global filtering flag.
627+
628+ Since in the relay log a transaction can span multiple
629+ log files, we do not reset filter_based_on_gtids flag when
630+ processing control events (they can appear in the middle
631+ of a transaction). But then, if:
632+
633+ FILE1: ... GTID BEGIN QUERY QUERY COMMIT ROTATE
634+ FILE2: FD BEGIN QUERY QUERY COMMIT
635+
636+ Events on the second file would not be outputted, even
637+ though they should.
638+ */
639+ case XID_EVENT:
640+ filtered= filter_based_on_gtids;
641+ filter_based_on_gtids= false;
642+ break;
643+ case QUERY_EVENT:
644+ filtered= filter_based_on_gtids;
645+ if (((Query_log_event *)ev)->ends_group())
646+ filter_based_on_gtids= false;
647+ break;
648+
649+ /*
650+ Never skip STOP, FD, ROTATE, IGNORABLE or INCIDENT events.
651+ SLAVE_EVENT and START_EVENT_V3 are there for completion.
652+
653+ Although in the binlog transactions do not span multiple
654+ log files, in the relay-log, that can happen. As such,
655+ we need to explicitly state that we do not filter these
656+ events, because there is a chance that they appear in the
657+ middle of a filtered transaction, e.g.:
658+
659+ FILE1: ... GTID BEGIN QUERY QUERY ROTATE
660+ FILE2: FD QUERY QUERY COMMIT GTID BEGIN ...
661+
662+ In this case, ROTATE and FD events should be processed and
663+ outputted.
664+ */
665+ case START_EVENT_V3: /* for completion */
666+ case SLAVE_EVENT: /* for completion */
667+ case STOP_EVENT:
668+ case FORMAT_DESCRIPTION_EVENT:
669+ case ROTATE_EVENT:
670+ case IGNORABLE_LOG_EVENT:
671+ case INCIDENT_EVENT:
672+ filtered= false;
673+ break;
674 default:
675 filtered= filter_based_on_gtids;
676 break;
677@@ -842,7 +900,9 @@
678 bool parent_query_skips=
679 !((Query_log_event*) ev)->is_trans_keyword() &&
680 shall_skip_database(((Query_log_event*) ev)->db);
681-
682+ bool ends_group= ((Query_log_event*) ev)->ends_group();
683+ bool starts_group= ((Query_log_event*) ev)->starts_group();
684+
685 for (uint i= 0; i < buff_ev.elements; i++)
686 {
687 buff_event_info pop_event_array= *dynamic_element(&buff_ev, i, buff_event_info *);
688@@ -865,12 +925,28 @@
689 statements in the Query_log_event, we still need to handle DDL,
690 which causes a commit itself.
691 */
692- print_event_info->skipped_event_in_transaction= true;
693+
694+ if (seen_gtids && !in_transaction && !starts_group && !ends_group)
695+ {
696+ /*
697+ For DDLs, print the COMMIT right away.
698+ */
699+ fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
700+ print_event_info->skipped_event_in_transaction= false;
701+ in_transaction= false;
702+ }
703+ else
704+ print_event_info->skipped_event_in_transaction= true;
705 goto end;
706 }
707
708- if (((Query_log_event*) ev)->ends_group())
709+ if (ends_group)
710+ {
711+ in_transaction= false;
712 print_event_info->skipped_event_in_transaction= false;
713+ }
714+ else if (starts_group)
715+ in_transaction= true;
716
717 ev->print(result_file, print_event_info);
718 if (head->error == -1)
719@@ -1113,9 +1189,13 @@
720 bool skip_event= (ignored_map != NULL);
721 /*
722 end of statement check:
723- i) destroy/free ignored maps
724- ii) if skip event, flush cache now
725- */
726+ i) destroy/free ignored maps
727+ ii) if skip event
728+ a) set the unflushed_events flag to false
729+ b) since we are skipping the last event,
730+ append END-MARKER(') to body cache (if required)
731+ c) flush cache now
732+ */
733 if (stmt_end)
734 {
735 /*
736@@ -1134,11 +1214,22 @@
737 event was not skipped).
738 */
739 if (skip_event)
740+ {
741+ // set the unflushed_events flag to false
742+ print_event_info->have_unflushed_events= FALSE;
743+
744+ // append END-MARKER(') with delimiter
745+ IO_CACHE *const body_cache= &print_event_info->body_cache;
746+ if (my_b_tell(body_cache))
747+ my_b_printf(body_cache, "'%s\n", print_event_info->delimiter);
748+
749+ // flush cache
750 if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
751 result_file, stop_never /* flush result_file */) ||
752 copy_event_cache_to_file_and_reinit(&print_event_info->body_cache,
753 result_file, stop_never /* flush result_file */)))
754 goto err;
755+ }
756 }
757
758 /* skip the event check */
759@@ -1188,8 +1279,10 @@
760 }
761 break;
762 }
763+ case ANONYMOUS_GTID_LOG_EVENT:
764 case GTID_LOG_EVENT:
765 {
766+ seen_gtids= true;
767 if (print_event_info->skipped_event_in_transaction == true)
768 fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
769 print_event_info->skipped_event_in_transaction= false;
770@@ -1201,12 +1294,40 @@
771 }
772 case XID_EVENT:
773 {
774+ in_transaction= false;
775 print_event_info->skipped_event_in_transaction= false;
776 ev->print(result_file, print_event_info);
777 if (head->error == -1)
778 goto err;
779 break;
780 }
781+ case ROTATE_EVENT:
782+ {
783+ Rotate_log_event *rev= (Rotate_log_event *) ev;
784+ /* no transaction context, gtids seen and not a fake rotate */
785+ if (seen_gtids)
786+ {
787+ /*
788+ Fake rotate events have 'when' set to zero. @c fake_rotate_event(...).
789+ */
790+ bool is_fake= (rev->when.tv_sec == 0);
791+ if (!in_transaction && !is_fake)
792+ {
793+ /*
794+ If processing multiple files, we must reset this flag,
795+ since there may be no gtids on the next one.
796+ */
797+ seen_gtids= false;
798+ fprintf(result_file, "SET @@SESSION.GTID_NEXT= 'AUTOMATIC' "
799+ "/* added by mysqlbinlog */ %s\n",
800+ print_event_info->delimiter);
801+ }
802+ }
803+ ev->print(result_file, print_event_info);
804+ if (head->error == -1)
805+ goto err;
806+ break;
807+ }
808 case PREVIOUS_GTIDS_LOG_EVENT:
809 if (one_database && !opt_skip_gtids)
810 warning("The option --database has been used. It may filter "
811@@ -2135,6 +2256,11 @@
812 */
813 continue;
814 }
815+ /*
816+ Reset the value of '# at pos' field shown against first event of
817+ next binlog file (fake rotate) picked by mysqlbinlog --to-last-log
818+ */
819+ old_off= start_position_mot;
820 len= 1; // fake Rotate, so don't increment old_off
821 }
822 }
823
824=== modified file 'Percona-Server/client/mysqldump.c'
825--- Percona-Server/client/mysqldump.c 2013-05-27 03:01:29 +0000
826+++ Percona-Server/client/mysqldump.c 2013-06-20 17:28:44 +0000
827@@ -12,7 +12,7 @@
828
829 You should have received a copy of the GNU General Public License
830 along with this program; if not, write to the Free Software
831- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
832+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
833 */
834
835 /* mysqldump.c - Dump a tables contents and format to an ASCII file
836@@ -5818,18 +5818,28 @@
837 MYSQL_RES *gtid_mode_res;
838 MYSQL_ROW gtid_mode_row;
839 char *gtid_mode_val= 0;
840+ char buf[32], query[64];
841
842 if (opt_set_gtid_purged_mode == SET_GTID_PURGED_OFF)
843 return FALSE; /* nothing to be done */
844
845+ /*
846+ Check if the server has the knowledge of GTIDs(pre mysql-5.6)
847+ or if the gtid_mode is ON or OFF.
848+ */
849+ my_snprintf(query, sizeof(query), "SHOW VARIABLES LIKE %s",
850+ quote_for_like("gtid_mode", buf));
851
852- /* check if gtid_mode is ON or OFF */
853- if (mysql_query_with_error_report(mysql_con, &gtid_mode_res,
854- "SELECT @@GTID_MODE"))
855+ if (mysql_query_with_error_report(mysql_con, &gtid_mode_res, query))
856 return TRUE;
857
858 gtid_mode_row = mysql_fetch_row(gtid_mode_res);
859- gtid_mode_val = (char*)gtid_mode_row[0];
860+
861+ /*
862+ gtid_mode_row is NULL for pre 5.6 versions. For versions >= 5.6,
863+ get the gtid_mode value from the second column.
864+ */
865+ gtid_mode_val = gtid_mode_row ? (char*)gtid_mode_row[1] : NULL;
866
867 if (gtid_mode_val && strcmp(gtid_mode_val, "OFF"))
868 {
869
870=== modified file 'Percona-Server/client/mysqltest.cc'
871--- Percona-Server/client/mysqltest.cc 2013-05-27 03:01:29 +0000
872+++ Percona-Server/client/mysqltest.cc 2013-06-20 17:28:44 +0000
873@@ -3407,8 +3407,12 @@
874 /* Set default wild chars for wild_compare, is changed in embedded mode */
875 set_wild_chars(1);
876
877+ uint length;
878+ /* Storing the length of the path to the file, so it can be reused */
879+ length= ds_file_to_remove.length;
880 for (i= 0; i < (uint) dir_info->number_off_files; i++)
881 {
882+ ds_file_to_remove.length= length;
883 file= dir_info->dir_entry + i;
884 /* Remove only regular files, i.e. no directories etc. */
885 /* if (!MY_S_ISREG(file->mystat->st_mode)) */
886@@ -3418,8 +3422,10 @@
887 if (ds_wild.length &&
888 wild_compare(file->name, ds_wild.str, 0))
889 continue;
890- ds_file_to_remove.length= ds_directory.length + 1;
891- ds_file_to_remove.str[ds_directory.length + 1]= 0;
892+ /* Not required as the var ds_file_to_remove.length already has the
893+ length in canonnicalized form */
894+ /* ds_file_to_remove.length= ds_directory.length + 1;
895+ ds_file_to_remove.str[ds_directory.length + 1]= 0; */
896 dynstr_append(&ds_file_to_remove, file->name);
897 DBUG_PRINT("info", ("removing file: %s", ds_file_to_remove.str));
898 error= my_delete(ds_file_to_remove.str, MYF(0)) != 0;
899
900=== modified file 'Percona-Server/client/sql_string.h'
901--- Percona-Server/client/sql_string.h 2013-05-27 03:01:29 +0000
902+++ Percona-Server/client/sql_string.h 2013-06-20 17:28:44 +0000
903@@ -1,7 +1,7 @@
904 #ifndef CLIENT_SQL_STRING_INCLUDED
905 #define CLIENT_SQL_STRING_INCLUDED
906
907-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
908+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
909
910 This program is free software; you can redistribute it and/or modify
911 it under the terms of the GNU General Public License as published by
912@@ -237,6 +237,7 @@
913 DBUG_ASSERT(!s.uses_buffer_owned_by(this));
914 free();
915 Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
916+ str_charset=s.str_charset;
917 alloced=0;
918 }
919 return *this;
920
921=== modified file 'Percona-Server/cmake/build_configurations/mysql_release.cmake'
922--- Percona-Server/cmake/build_configurations/mysql_release.cmake 2013-05-12 06:24:46 +0000
923+++ Percona-Server/cmake/build_configurations/mysql_release.cmake 2013-06-20 17:28:44 +0000
924@@ -1,4 +1,4 @@
925-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
926+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
927 #
928 # This program is free software; you can redistribute it and/or modify
929 # it under the terms of the GNU General Public License as published by
930@@ -33,7 +33,6 @@
931
932 IF(UNIX)
933 SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
934- OPTION(WITH_LIBEDIT "" ON)
935
936 OPTION(WITH_PIC "" ON) # Why?
937
938
939=== modified file 'Percona-Server/cmake/os/WindowsCache.cmake'
940--- Percona-Server/cmake/os/WindowsCache.cmake 2011-07-03 23:56:47 +0000
941+++ Percona-Server/cmake/os/WindowsCache.cmake 2013-06-20 17:28:44 +0000
942@@ -1,4 +1,4 @@
943-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
944+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
945 #
946 # This program is free software; you can redistribute it and/or modify
947 # it under the terms of the GNU General Public License as published by
948@@ -116,7 +116,7 @@
949 SET(HAVE_LRAND48 CACHE INTERNAL "")
950 SET(HAVE_LSTAT CACHE INTERNAL "")
951 SET(HAVE_MADVISE CACHE INTERNAL "")
952-SET(HAVE_MALLINFO CACHE INTERNAL "")
953+SET(HAVE_MALLOC_INFO CACHE INTERNAL "")
954 SET(HAVE_MALLOC_H 1 CACHE INTERNAL "")
955 SET(HAVE_MEMALIGN CACHE INTERNAL "")
956 SET(HAVE_MEMCPY 1 CACHE INTERNAL "")
957
958=== modified file 'Percona-Server/cmake/package_name.cmake'
959--- Percona-Server/cmake/package_name.cmake 2013-05-12 06:24:46 +0000
960+++ Percona-Server/cmake/package_name.cmake 2013-06-20 17:28:44 +0000
961@@ -1,4 +1,4 @@
962-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
963+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
964 #
965 # This program is free software; you can redistribute it and/or modify
966 # it under the terms of the GNU General Public License as published by
967@@ -82,12 +82,20 @@
968 MATH(EXPR VER "${VER} -4")
969 SET(DEFAULT_PLATFORM "osx10.${VER}")
970 ENDIF()
971- LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
972- IF(LEN GREATER 1)
973- SET(DEFAULT_MACHINE "universal")
974+
975+ IF(CMAKE_OSX_ARCHITECTURES)
976+ LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
977+ IF(LEN GREATER 1)
978+ SET(DEFAULT_MACHINE "universal")
979+ ELSE()
980+ SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
981+ ENDIF()
982 ELSE()
983- SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
984+ IF(64BIT)
985+ SET(DEFAULT_MACHINE "x86_64")
986+ ENDIF()
987 ENDIF()
988+
989 IF(DEFAULT_MACHINE MATCHES "i386")
990 SET(DEFAULT_MACHINE "x86")
991 ENDIF()
992
993=== modified file 'Percona-Server/cmake/readline.cmake'
994--- Percona-Server/cmake/readline.cmake 2013-02-26 05:45:28 +0000
995+++ Percona-Server/cmake/readline.cmake 2013-06-20 17:28:44 +0000
996@@ -1,4 +1,4 @@
997-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
998+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
999 #
1000 # This program is free software; you can redistribute it and/or modify
1001 # it under the terms of the GNU General Public License as published by
1002@@ -13,6 +13,9 @@
1003 # along with this program; if not, write to the Free Software
1004 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1005
1006+# cmake -DWITH_EDITLINE=system|bundled
1007+# bundled is the default
1008+
1009 MACRO (MYSQL_CHECK_MULTIBYTE)
1010 CHECK_INCLUDE_FILE(wctype.h HAVE_WCTYPE_H)
1011 CHECK_INCLUDE_FILE(wchar.h HAVE_WCHAR_H)
1012@@ -117,85 +120,93 @@
1013 ENDIF()
1014 ENDMACRO()
1015
1016-MACRO (MYSQL_USE_BUNDLED_LIBEDIT)
1017+MACRO (MYSQL_USE_BUNDLED_EDITLINE)
1018 SET(USE_LIBEDIT_INTERFACE 1)
1019 SET(HAVE_HIST_ENTRY 1)
1020- SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
1021- SET(READLINE_LIBRARY edit)
1022+ SET(EDITLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/editline)
1023+ SET(EDITLINE_LIBRARY edit)
1024 FIND_CURSES()
1025 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
1026 ENDMACRO()
1027
1028-MACRO (FIND_SYSTEM_LIBEDIT name)
1029-
1030- FIND_PATH(${name}_INCLUDE_DIR readline/readline.h )
1031- FIND_LIBRARY(${name}_LIBRARY NAMES ${name})
1032- MARK_AS_ADVANCED(${name}_INCLUDE_DIR ${name}_LIBRARY)
1033+MACRO (FIND_SYSTEM_EDITLINE)
1034+ FIND_PATH(FOUND_EDITLINE_READLINE
1035+ NAMES editline/readline.h
1036+ )
1037+ IF(FOUND_EDITLINE_READLINE)
1038+ SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
1039+ ELSE()
1040+ # Different path on FreeBSD
1041+ FIND_PATH(FOUND_EDIT_READLINE_READLINE
1042+ NAMES edit/readline/readline.h
1043+ )
1044+ IF(FOUND_EDIT_READLINE_READLINE)
1045+ SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
1046+ ENDIF()
1047+ ENDIF()
1048+
1049+ FIND_LIBRARY(EDITLINE_LIBRARY
1050+ NAMES
1051+ edit
1052+ )
1053+ MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
1054+
1055+ MESSAGE(STATUS "EDITLINE_INCLUDE_DIR ${EDITLINE_INCLUDE_DIR}")
1056+ MESSAGE(STATUS "EDITLINE_LIBRARY ${EDITLINE_LIBRARY}")
1057
1058 INCLUDE(CheckCXXSourceCompiles)
1059- SET(CMAKE_REQUIRES_LIBRARIES ${${name}_LIBRARY})
1060-
1061- IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR)
1062- SET(SYSTEM_READLINE_FOUND 1)
1063- SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY})
1064+ IF(EDITLINE_LIBRARY AND EDITLINE_INCLUDE_DIR)
1065+ SET(CMAKE_REQUIRED_INCLUDES ${EDITLINE_INCLUDE_DIR})
1066+ SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
1067 CHECK_CXX_SOURCE_COMPILES("
1068 #include <stdio.h>
1069- #include <readline/readline.h>
1070+ #include <readline.h>
1071 int main(int argc, char **argv)
1072 {
1073 HIST_ENTRY entry;
1074 return 0;
1075 }"
1076- ${name}_HAVE_HIST_ENTRY)
1077-
1078+ EDITLINE_HAVE_HIST_ENTRY)
1079+
1080 CHECK_CXX_SOURCE_COMPILES("
1081 #include <stdio.h>
1082- #include <readline/readline.h>
1083+ #include <readline.h>
1084 int main(int argc, char **argv)
1085 {
1086- char res= *(*rl_completion_entry_function)(0,0);
1087+ typedef int MYFunction(const char*, int);
1088+ MYFunction* myf= rl_completion_entry_function;
1089+ int res= (myf)(NULL, 0);
1090 completion_matches(0,0);
1091+ return res;
1092 }"
1093- ${name}_USE_LIBEDIT_INTERFACE)
1094+ EDITLINE_HAVE_COMPLETION)
1095
1096- CHECK_CXX_SOURCE_COMPILES("
1097- #include <stdio.h>
1098- #include <readline/readline.h>
1099- int main(int argc, char **argv)
1100- {
1101- rl_completion_func_t *func1= (rl_completion_func_t*)0;
1102- rl_compentry_func_t *func2= (rl_compentry_func_t*)0;
1103- }"
1104- ${name}_USE_NEW_READLINE_INTERFACE)
1105-
1106- IF(${name}_USE_LIBEDIT_INTERFACE OR ${name}_USE_NEW_READLINE_INTERFACE)
1107- SET(READLINE_LIBRARY ${${name}_LIBRARY})
1108- SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR})
1109- SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY})
1110- SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE})
1111- SET(USE_NEW_READLINE_INTERFACE ${${name}_USE_NEW_READLINE_INTERFACE})
1112- SET(READLINE_FOUND 1)
1113+ IF(EDITLINE_HAVE_COMPLETION)
1114+ SET(HAVE_HIST_ENTRY ${EDITLINE_HAVE_HIST_ENTRY})
1115+ SET(USE_LIBEDIT_INTERFACE 1)
1116+ SET(EDITLINE_FOUND 1)
1117 ENDIF()
1118 ENDIF()
1119 ENDMACRO()
1120
1121
1122-MACRO (MYSQL_CHECK_READLINE)
1123+IF (NOT WITH_EDITLINE AND NOT WIN32)
1124+ SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")
1125+ENDIF()
1126+
1127+MACRO (MYSQL_CHECK_EDITLINE)
1128 IF (NOT WIN32)
1129 MYSQL_CHECK_MULTIBYTE()
1130- IF(NOT CYGWIN)
1131- SET(WITH_LIBEDIT ON CACHE BOOL "Use bundled libedit")
1132- # Bundled libedit does not compile on cygwin, only readline
1133- ENDIF()
1134
1135- IF(WITH_LIBEDIT)
1136- MYSQL_USE_BUNDLED_LIBEDIT()
1137+ IF(WITH_EDITLINE STREQUAL "bundled")
1138+ MYSQL_USE_BUNDLED_EDITLINE()
1139+ ELSEIF(WITH_EDITLINE STREQUAL "system")
1140+ FIND_SYSTEM_EDITLINE()
1141+ IF(NOT EDITLINE_FOUND)
1142+ MESSAGE(FATAL_ERROR "Cannot find system editline libraries.")
1143+ ENDIF()
1144 ELSE()
1145- FIND_SYSTEM_LIBEDIT(edit)
1146- IF(NOT_LIBEDIT_FOUND)
1147- MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT")
1148- ENDIF()
1149+ MESSAGE(FATAL_ERROR "WITH_EDITLINE must be bundled or system")
1150 ENDIF()
1151 ENDIF(NOT WIN32)
1152 ENDMACRO()
1153-
1154
1155=== renamed directory 'Percona-Server/cmd-line-utils/libedit/readline' => 'Percona-Server/cmd-line-utils/libedit/editline'
1156=== modified file 'Percona-Server/cmd-line-utils/libedit/readline.c'
1157--- Percona-Server/cmd-line-utils/libedit/readline.c 2012-01-12 13:03:44 +0000
1158+++ Percona-Server/cmd-line-utils/libedit/readline.c 2013-06-20 17:28:44 +0000
1159@@ -51,7 +51,7 @@
1160 #else
1161 #include "np/vis.h"
1162 #endif
1163-#include "readline/readline.h"
1164+#include "editline/readline.h"
1165 #include "el.h"
1166 #include "fcns.h" /* for EL_NUM_FCNS */
1167 #include "histedit.h"
1168
1169=== modified file 'Percona-Server/config.h.cmake'
1170--- Percona-Server/config.h.cmake 2013-05-12 06:24:46 +0000
1171+++ Percona-Server/config.h.cmake 2013-06-20 17:28:44 +0000
1172@@ -120,7 +120,6 @@
1173 /* Readline */
1174 #cmakedefine HAVE_HIST_ENTRY 1
1175 #cmakedefine USE_LIBEDIT_INTERFACE 1
1176-#cmakedefine USE_NEW_READLINE_INTERFACE 1
1177
1178 #cmakedefine FIONREAD_IN_SYS_IOCTL 1
1179 #cmakedefine GWINSZ_IN_SYS_IOCTL 1
1180@@ -194,7 +193,7 @@
1181 #cmakedefine HAVE_DECL_MADVISE 1
1182 #cmakedefine HAVE_DECL_TGOTO 1
1183 #cmakedefine HAVE_DECL_MHA_MAPSIZE_VA
1184-#cmakedefine HAVE_MALLINFO 1
1185+#cmakedefine HAVE_MALLOC_INFO 1
1186 #cmakedefine HAVE_MEMCPY 1
1187 #cmakedefine HAVE_MEMMOVE 1
1188 #cmakedefine HAVE_MKSTEMP 1
1189
1190=== modified file 'Percona-Server/configure.cmake'
1191--- Percona-Server/configure.cmake 2013-05-12 06:24:46 +0000
1192+++ Percona-Server/configure.cmake 2013-06-20 17:28:44 +0000
1193@@ -441,7 +441,7 @@
1194 CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
1195 CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
1196 CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
1197-CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
1198+CHECK_FUNCTION_EXISTS (malloc_info HAVE_MALLOC_INFO)
1199 CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY)
1200 CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE)
1201 CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP)
1202@@ -695,6 +695,7 @@
1203
1204 # check whether time_t is unsigned
1205 CHECK_C_SOURCE_COMPILES("
1206+#include <time.h>
1207 int main()
1208 {
1209 int array[(((time_t)-1) > 0) ? 1 : -1];
1210
1211=== modified file 'Percona-Server/dbug/dbug.c'
1212--- Percona-Server/dbug/dbug.c 2013-01-18 04:53:12 +0000
1213+++ Percona-Server/dbug/dbug.c 2013-06-20 17:28:44 +0000
1214@@ -598,7 +598,7 @@
1215 if (!is_shared(stack, keywords))
1216 FreeList(stack->keywords);
1217 stack->keywords=NULL;
1218- stack->flags &= ~DEBUG_ON;
1219+ stack->flags&= ~DEBUG_ON;
1220 break;
1221 }
1222 if (rel && is_shared(stack, keywords))
1223@@ -606,11 +606,29 @@
1224 if (sign < 0)
1225 {
1226 if (DEBUGGING)
1227+ {
1228 stack->keywords= ListDel(stack->keywords, control, end);
1229- break;
1230- }
1231- stack->keywords= ListAdd(stack->keywords, control, end);
1232- stack->flags |= DEBUG_ON;
1233+ /* Turn off DEBUG_ON if it is last keyword to be removed. */
1234+ if (stack->keywords == NULL)
1235+ stack->flags&= ~DEBUG_ON;
1236+ }
1237+ break;
1238+ }
1239+
1240+ /* Do not add keyword if debugging all is enabled. */
1241+ if (!(DEBUGGING && stack->keywords == NULL))
1242+ {
1243+ stack->keywords= ListAdd(stack->keywords, control, end);
1244+ stack->flags|= DEBUG_ON;
1245+ }
1246+
1247+ /* If debug all is enabled, make the keyword list empty. */
1248+ if (sign == 1 && control == end)
1249+ {
1250+ FreeList(stack->keywords);
1251+ stack->keywords= NULL;
1252+ }
1253+
1254 break;
1255 case 'D':
1256 stack->delay= atoi(control);
1257@@ -1035,7 +1053,7 @@
1258 } while (0)
1259 #define str_to_buf(S) do { \
1260 char_to_buf(','); \
1261- buf=strnmov(buf, (S), len+1); \
1262+ buf=strnmov(buf, (S), end-buf); \
1263 if (buf >= end) goto overflow; \
1264 } while (0)
1265 #define list_to_buf(l, f) do { \
1266@@ -1358,6 +1376,38 @@
1267 /*
1268 * FUNCTION
1269 *
1270+ * _db_enabled_ check if debug is enabled for the keyword used in
1271+ * DBUG_PRINT
1272+ *
1273+ * SYNOPSIS
1274+ *
1275+ * int _db_enabled_();
1276+ *
1277+ * DESCRIPTION
1278+ *
1279+ * The function checks if the debug output is to be enabled for the keyword
1280+ * specified in DBUG_PRINT macro. _db_doprnt_ will be called only if this
1281+ * function evaluates to 1.
1282+ */
1283+
1284+int _db_enabled_()
1285+{
1286+ CODE_STATE *cs;
1287+
1288+ get_code_state_or_return 0;
1289+
1290+ if (! DEBUGGING)
1291+ return 0;
1292+
1293+ if (_db_keyword_(cs, cs->u_keyword, 0))
1294+ return 1;
1295+
1296+ return 0;
1297+}
1298+
1299+/*
1300+ * FUNCTION
1301+ *
1302 * _db_doprnt_ handle print of debug lines
1303 *
1304 * SYNOPSIS
1305@@ -1368,11 +1418,9 @@
1306 *
1307 * DESCRIPTION
1308 *
1309- * When invoked via one of the DBUG macros, tests the current keyword
1310- * set by calling _db_pargs_() to see if that macro has been selected
1311- * for processing via the debugger control string, and if so, handles
1312- * printing of the arguments via the format string. The line number
1313- * of the DBUG macro in the source is found in u_line.
1314+ * This function handles the printing of the arguments via the format
1315+ * string. The line number of the DBUG macro in the source is found in
1316+ * u_line.
1317 *
1318 * Note that the format string SHOULD NOT include a terminating
1319 * newline, this is supplied automatically.
1320@@ -1385,6 +1433,8 @@
1321 {
1322 va_list args;
1323 CODE_STATE *cs;
1324+ int save_errno;
1325+
1326 get_code_state_or_return;
1327
1328 /* Dirty read, for DBUG_PRINT() performance. */
1329@@ -1394,21 +1444,19 @@
1330 va_start(args,format);
1331 read_lock_stack(cs);
1332
1333- if (_db_keyword_(cs, cs->u_keyword, 0))
1334- {
1335- int save_errno=errno;
1336- if (!cs->locked)
1337- pthread_mutex_lock(&THR_LOCK_dbug);
1338- DoPrefix(cs, cs->u_line);
1339- if (TRACING)
1340- Indent(cs, cs->level + 1);
1341- else
1342- (void) fprintf(cs->stack->out_file, "%s: ", cs->func);
1343- (void) fprintf(cs->stack->out_file, "%s: ", cs->u_keyword);
1344- DbugVfprintf(cs->stack->out_file, format, args);
1345- DbugFlush(cs);
1346- errno=save_errno;
1347- }
1348+ save_errno=errno;
1349+ if (!cs->locked)
1350+ pthread_mutex_lock(&THR_LOCK_dbug);
1351+ DoPrefix(cs, cs->u_line);
1352+ if (TRACING)
1353+ Indent(cs, cs->level + 1);
1354+ else
1355+ (void) fprintf(cs->stack->out_file, "%s: ", cs->func);
1356+ (void) fprintf(cs->stack->out_file, "%s: ", cs->u_keyword);
1357+ DbugVfprintf(cs->stack->out_file, format, args);
1358+ DbugFlush(cs);
1359+ errno=save_errno;
1360+
1361 unlock_stack(cs);
1362 va_end(args);
1363 }
1364
1365=== modified file 'Percona-Server/extra/charset2html.c'
1366--- Percona-Server/extra/charset2html.c 2013-02-26 05:45:28 +0000
1367+++ Percona-Server/extra/charset2html.c 2013-06-20 17:28:44 +0000
1368@@ -12,7 +12,7 @@
1369
1370 You should have received a copy of the GNU General Public License
1371 along with this program; if not, write to the Free Software
1372- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1373+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1374 */
1375
1376 /*
1377
1378=== modified file 'Percona-Server/extra/yassl/COPYING'
1379--- Percona-Server/extra/yassl/COPYING 2006-08-01 18:20:46 +0000
1380+++ Percona-Server/extra/yassl/COPYING 2013-06-20 17:28:44 +0000
1381@@ -2,7 +2,7 @@
1382 Version 2, June 1991
1383
1384 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
1385- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1386+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1387 Everyone is permitted to copy and distribute verbatim copies
1388 of this license document, but changing it is not allowed.
1389
1390@@ -305,7 +305,7 @@
1391
1392 You should have received a copy of the GNU General Public License
1393 along with this program; if not, write to the Free Software
1394- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1395+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1396
1397
1398 Also add information on how to contact you by electronic and paper mail.
1399
1400=== modified file 'Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl'
1401--- Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl 2010-12-28 18:57:23 +0000
1402+++ Percona-Server/extra/yassl/include/openssl/generate_prefix_files.pl 2013-06-20 17:28:44 +0000
1403@@ -13,7 +13,7 @@
1404 #
1405 # You should have received a copy of the GNU General Public License
1406 # along with this program; if not, write to the Free Software
1407-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1408+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1409
1410 #
1411 # This script generates defines for all functions
1412
1413=== modified file 'Percona-Server/extra/yassl/src/crypto_wrapper.cpp'
1414--- Percona-Server/extra/yassl/src/crypto_wrapper.cpp 2013-05-12 06:24:46 +0000
1415+++ Percona-Server/extra/yassl/src/crypto_wrapper.cpp 2013-06-20 17:28:44 +0000
1416@@ -11,7 +11,7 @@
1417
1418 You should have received a copy of the GNU General Public License
1419 along with this program; if not, write to the Free Software
1420- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1421+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1422
1423 /* The crypto wrapper source implements the policies for the cipher
1424 * components used by SSL.
1425
1426=== modified file 'Percona-Server/extra/yassl/src/make.bat'
1427--- Percona-Server/extra/yassl/src/make.bat 2013-02-26 05:45:28 +0000
1428+++ Percona-Server/extra/yassl/src/make.bat 2013-06-20 17:28:44 +0000
1429@@ -11,7 +11,7 @@
1430 REM
1431 REM You should have received a copy of the GNU General Public License
1432 REM along with this program; if not, write to the Free Software
1433-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1434+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1435
1436 REM quick and dirty build file for testing different MSDEVs
1437 setlocal
1438
1439=== modified file 'Percona-Server/extra/yassl/src/yassl_int.cpp'
1440--- Percona-Server/extra/yassl/src/yassl_int.cpp 2013-05-12 06:24:46 +0000
1441+++ Percona-Server/extra/yassl/src/yassl_int.cpp 2013-06-20 17:28:44 +0000
1442@@ -11,7 +11,7 @@
1443
1444 You should have received a copy of the GNU General Public License
1445 along with this program; if not, write to the Free Software
1446- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1447+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1448
1449 /* yaSSL internal source implements SSL supporting types not specified in the
1450 * draft along with type conversion functions.
1451
1452=== modified file 'Percona-Server/extra/yassl/taocrypt/COPYING'
1453--- Percona-Server/extra/yassl/taocrypt/COPYING 2006-09-25 14:40:29 +0000
1454+++ Percona-Server/extra/yassl/taocrypt/COPYING 2013-06-20 17:28:44 +0000
1455@@ -2,7 +2,7 @@
1456 Version 2, June 1991
1457
1458 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
1459- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1460+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1461 Everyone is permitted to copy and distribute verbatim copies
1462 of this license document, but changing it is not allowed.
1463
1464@@ -305,7 +305,7 @@
1465
1466 You should have received a copy of the GNU General Public License
1467 along with this program; if not, write to the Free Software
1468- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1469+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1470
1471
1472 Also add information on how to contact you by electronic and paper mail.
1473
1474=== modified file 'Percona-Server/extra/yassl/taocrypt/benchmark/make.bat'
1475--- Percona-Server/extra/yassl/taocrypt/benchmark/make.bat 2013-02-26 05:45:28 +0000
1476+++ Percona-Server/extra/yassl/taocrypt/benchmark/make.bat 2013-06-20 17:28:44 +0000
1477@@ -11,7 +11,7 @@
1478 REM
1479 REM You should have received a copy of the GNU General Public License
1480 REM along with this program; if not, write to the Free Software
1481-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1482+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1483
1484 REM quick and dirty build file for testing different MSDEVs
1485 setlocal
1486
1487=== modified file 'Percona-Server/extra/yassl/taocrypt/src/algebra.cpp'
1488--- Percona-Server/extra/yassl/taocrypt/src/algebra.cpp 2013-05-12 06:24:46 +0000
1489+++ Percona-Server/extra/yassl/taocrypt/src/algebra.cpp 2013-06-20 17:28:44 +0000
1490@@ -11,7 +11,7 @@
1491
1492 You should have received a copy of the GNU General Public License
1493 along with this program; if not, write to the Free Software
1494- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1495+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1496
1497 /* based on Wei Dai's algebra.cpp from CryptoPP */
1498 #undef NDEBUG
1499
1500=== modified file 'Percona-Server/extra/yassl/taocrypt/src/integer.cpp'
1501--- Percona-Server/extra/yassl/taocrypt/src/integer.cpp 2013-05-12 06:24:46 +0000
1502+++ Percona-Server/extra/yassl/taocrypt/src/integer.cpp 2013-06-20 17:28:44 +0000
1503@@ -11,7 +11,7 @@
1504
1505 You should have received a copy of the GNU General Public License
1506 along with this program; if not, write to the Free Software
1507- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1508+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1509
1510 /* based on Wei Dai's integer.cpp from CryptoPP */
1511
1512
1513=== modified file 'Percona-Server/extra/yassl/taocrypt/src/make.bat'
1514--- Percona-Server/extra/yassl/taocrypt/src/make.bat 2013-02-26 05:45:28 +0000
1515+++ Percona-Server/extra/yassl/taocrypt/src/make.bat 2013-06-20 17:28:44 +0000
1516@@ -11,7 +11,7 @@
1517 REM
1518 REM You should have received a copy of the GNU General Public License
1519 REM along with this program; if not, write to the Free Software
1520-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1521+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1522
1523 REM quick and dirty build file for testing different MSDEVs
1524 setlocal
1525
1526=== modified file 'Percona-Server/extra/yassl/taocrypt/test/make.bat'
1527--- Percona-Server/extra/yassl/taocrypt/test/make.bat 2013-02-26 05:45:28 +0000
1528+++ Percona-Server/extra/yassl/taocrypt/test/make.bat 2013-06-20 17:28:44 +0000
1529@@ -11,7 +11,7 @@
1530 REM
1531 REM You should have received a copy of the GNU General Public License
1532 REM along with this program; if not, write to the Free Software
1533-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1534+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1535
1536 REM quick and dirty build file for testing different MSDEVs
1537 setlocal
1538
1539=== modified file 'Percona-Server/extra/yassl/testsuite/make.bat'
1540--- Percona-Server/extra/yassl/testsuite/make.bat 2013-02-26 05:45:28 +0000
1541+++ Percona-Server/extra/yassl/testsuite/make.bat 2013-06-20 17:28:44 +0000
1542@@ -11,7 +11,7 @@
1543 REM
1544 REM You should have received a copy of the GNU General Public License
1545 REM along with this program; if not, write to the Free Software
1546-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1547+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1548
1549 REM quick and dirty build file for testing different MSDEVs
1550 setlocal
1551
1552=== modified file 'Percona-Server/include/my_bitmap.h'
1553--- Percona-Server/include/my_bitmap.h 2012-08-22 01:40:20 +0000
1554+++ Percona-Server/include/my_bitmap.h 2013-06-20 17:28:44 +0000
1555@@ -12,7 +12,7 @@
1556
1557 You should have received a copy of the GNU General Public License
1558 along with this program; if not, write to the Free Software
1559- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1560+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1561
1562 #ifndef _my_bitmap_h_
1563 #define _my_bitmap_h_
1564
1565=== modified file 'Percona-Server/include/my_compare.h'
1566--- Percona-Server/include/my_compare.h 2011-03-29 12:56:34 +0000
1567+++ Percona-Server/include/my_compare.h 2013-06-20 17:28:44 +0000
1568@@ -11,7 +11,7 @@
1569
1570 You should have received a copy of the GNU General Public License
1571 along with this program; if not, write to the Free Software
1572- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1573+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1574
1575 #ifndef _my_compare_h
1576 #define _my_compare_h
1577
1578=== modified file 'Percona-Server/include/my_dbug.h'
1579--- Percona-Server/include/my_dbug.h 2013-02-26 05:45:28 +0000
1580+++ Percona-Server/include/my_dbug.h 2013-06-20 17:28:44 +0000
1581@@ -39,7 +39,7 @@
1582 };
1583
1584 struct _db_code_state_;
1585-extern my_bool _dbug_on_;
1586+extern MYSQL_PLUGIN_IMPORT my_bool _dbug_on_;
1587 extern my_bool _db_keyword_(struct _db_code_state_ *, const char *, int);
1588 extern int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
1589 extern int _db_explain_init_(char *buf, size_t len);
1590@@ -55,6 +55,7 @@
1591 struct _db_stack_frame_ *_stack_frame_);
1592 extern void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_);
1593 extern void _db_pargs_(uint _line_,const char *keyword);
1594+extern int _db_enabled_();
1595 extern void _db_doprnt_(const char *format,...)
1596 ATTRIBUTE_FORMAT(printf, 1, 2);
1597 extern void _db_dump_(uint _line_,const char *keyword,
1598@@ -80,7 +81,17 @@
1599 #define DBUG_EVALUATE_IF(keyword,a1,a2) \
1600 (_db_keyword_(0,(keyword), 1) ? (a1) : (a2))
1601 #define DBUG_PRINT(keyword,arglist) \
1602- do {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;} while(0)
1603+ do \
1604+ { \
1605+ if (_dbug_on_) \
1606+ { \
1607+ _db_pargs_(__LINE__,keyword); \
1608+ if (_db_enabled_()) \
1609+ { \
1610+ _db_doprnt_ arglist; \
1611+ } \
1612+ } \
1613+ } while(0)
1614 #define DBUG_PUSH(a1) _db_push_ (a1)
1615 #define DBUG_POP() _db_pop_ ()
1616 #define DBUG_SET(a1) _db_set_ (a1)
1617
1618=== modified file 'Percona-Server/include/my_global.h'
1619--- Percona-Server/include/my_global.h 2012-03-06 14:29:42 +0000
1620+++ Percona-Server/include/my_global.h 2013-06-20 17:28:44 +0000
1621@@ -1,5 +1,5 @@
1622 /*
1623- Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1624+ Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
1625
1626 This program is free software; you can redistribute it and/or modify
1627 it under the terms of the GNU General Public License as published by
1628@@ -47,10 +47,6 @@
1629 #define HAVE_ERRNO_AS_DEFINE
1630 #endif /* __CYGWIN__ */
1631
1632-#if defined(__OpenBSD__) && (OpenBSD >= 200411)
1633-#define HAVE_ERRNO_AS_DEFINE
1634-#endif
1635-
1636 #if defined(i386) && !defined(__i386__)
1637 #define __i386__
1638 #endif
1639@@ -1021,8 +1017,6 @@
1640 #define reg16 register
1641 #endif
1642
1643-#include <my_dbug.h>
1644-
1645 /* Some helper macros */
1646 #define YESNO(X) ((X) ? "yes" : "no")
1647
1648@@ -1190,6 +1184,8 @@
1649 #endif
1650 #endif
1651
1652+#include <my_dbug.h>
1653+
1654 /* Defines that are unique to the embedded version of MySQL */
1655
1656 #ifdef EMBEDDED_LIBRARY
1657
1658=== modified file 'Percona-Server/include/my_md5.h'
1659--- Percona-Server/include/my_md5.h 2013-05-12 06:24:46 +0000
1660+++ Percona-Server/include/my_md5.h 2013-06-20 17:28:44 +0000
1661@@ -14,7 +14,7 @@
1662
1663 You should have received a copy of the GNU General Public License
1664 along with this program; if not, write to the Free Software
1665- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1666+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1667
1668 #include "m_string.h"
1669
1670
1671=== modified file 'Percona-Server/include/my_pthread.h'
1672--- Percona-Server/include/my_pthread.h 2013-05-12 06:24:46 +0000
1673+++ Percona-Server/include/my_pthread.h 2013-06-20 17:28:44 +0000
1674@@ -11,7 +11,7 @@
1675
1676 You should have received a copy of the GNU General Public License
1677 along with this program; if not, write to the Free Software
1678- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1679+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1680
1681 /* Defines to make different thread packages compatible */
1682
1683
1684=== modified file 'Percona-Server/include/my_sys.h'
1685--- Percona-Server/include/my_sys.h 2013-05-12 09:13:00 +0000
1686+++ Percona-Server/include/my_sys.h 2013-06-20 17:28:44 +0000
1687@@ -234,13 +234,8 @@
1688 #define my_afree(PTR) my_free(PTR)
1689 #endif /* HAVE_ALLOCA */
1690
1691-#ifndef errno /* did we already get it? */
1692-#ifdef HAVE_ERRNO_AS_DEFINE
1693 #include <errno.h> /* errno is a define */
1694-#else
1695-extern int errno; /* declare errno */
1696-#endif
1697-#endif /* #ifndef errno */
1698+
1699 extern char *home_dir; /* Home directory for user */
1700 extern const char *my_progname; /* program-name (printed in errors) */
1701 extern char curr_dir[]; /* Current directory for user */
1702
1703=== modified file 'Percona-Server/include/my_user.h'
1704--- Percona-Server/include/my_user.h 2013-02-26 05:45:28 +0000
1705+++ Percona-Server/include/my_user.h 2013-06-20 17:28:44 +0000
1706@@ -12,7 +12,7 @@
1707
1708 You should have received a copy of the GNU General Public License
1709 along with this program; if not, write to the Free Software
1710- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1711+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1712
1713 /*
1714 This is a header for libraries containing functions used in both server and
1715
1716=== modified file 'Percona-Server/include/my_xml.h'
1717--- Percona-Server/include/my_xml.h 2013-02-26 05:45:28 +0000
1718+++ Percona-Server/include/my_xml.h 2013-06-20 17:28:44 +0000
1719@@ -11,7 +11,7 @@
1720
1721 You should have received a copy of the GNU General Public License
1722 along with this program; if not, write to the Free Software
1723- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1724+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1725
1726
1727 #ifndef _my_xml_h
1728
1729=== modified file 'Percona-Server/include/mysql/innodb_priv.h'
1730--- Percona-Server/include/mysql/innodb_priv.h 2010-11-22 14:08:51 +0000
1731+++ Percona-Server/include/mysql/innodb_priv.h 2013-06-20 17:28:44 +0000
1732@@ -11,7 +11,7 @@
1733
1734 You should have received a copy of the GNU General Public License
1735 along with this program; if not, write to the Free Software
1736- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1737+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1738
1739 #ifndef INNODB_PRIV_INCLUDED
1740 #define INNODB_PRIV_INCLUDED
1741
1742=== modified file 'Percona-Server/include/mysql_time.h'
1743--- Percona-Server/include/mysql_time.h 2013-02-26 05:45:28 +0000
1744+++ Percona-Server/include/mysql_time.h 2013-06-20 17:28:44 +0000
1745@@ -11,7 +11,7 @@
1746
1747 You should have received a copy of the GNU General Public License
1748 along with this program; if not, write to the Free Software
1749- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1750+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1751
1752 #ifndef _mysql_time_h_
1753 #define _mysql_time_h_
1754
1755=== modified file 'Percona-Server/include/t_ctype.h'
1756--- Percona-Server/include/t_ctype.h 2010-10-27 11:32:32 +0000
1757+++ Percona-Server/include/t_ctype.h 2013-06-20 17:28:44 +0000
1758@@ -11,7 +11,7 @@
1759
1760 You should have received a copy of the GNU General Public License
1761 along with this program; if not, write to the Free Software
1762- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1763+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1764
1765 /*
1766 Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.
1767
1768=== modified file 'Percona-Server/include/typelib.h'
1769--- Percona-Server/include/typelib.h 2013-02-26 05:45:28 +0000
1770+++ Percona-Server/include/typelib.h 2013-06-20 17:28:44 +0000
1771@@ -11,7 +11,7 @@
1772
1773 You should have received a copy of the GNU General Public License
1774 along with this program; if not, write to the Free Software
1775- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1776+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1777
1778
1779 #ifndef _typelib_h
1780
1781=== modified file 'Percona-Server/libmysql/authentication_win/common.cc'
1782--- Percona-Server/libmysql/authentication_win/common.cc 2011-09-21 11:01:41 +0000
1783+++ Percona-Server/libmysql/authentication_win/common.cc 2013-06-20 17:28:44 +0000
1784@@ -11,7 +11,7 @@
1785
1786 You should have received a copy of the GNU General Public License
1787 along with this program; if not, write to the Free Software
1788- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1789+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1790
1791 #include "common.h"
1792 #include <sddl.h> // for ConvertSidToStringSid()
1793
1794=== modified file 'Percona-Server/libmysql/authentication_win/common.h'
1795--- Percona-Server/libmysql/authentication_win/common.h 2011-09-21 11:01:41 +0000
1796+++ Percona-Server/libmysql/authentication_win/common.h 2013-06-20 17:28:44 +0000
1797@@ -11,7 +11,7 @@
1798
1799 You should have received a copy of the GNU General Public License
1800 along with this program; if not, write to the Free Software
1801- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1802+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1803
1804 #ifndef COMMON_H
1805 #define COMMON_H
1806
1807=== modified file 'Percona-Server/libmysql/authentication_win/handshake.cc'
1808--- Percona-Server/libmysql/authentication_win/handshake.cc 2011-04-29 21:53:46 +0000
1809+++ Percona-Server/libmysql/authentication_win/handshake.cc 2013-06-20 17:28:44 +0000
1810@@ -1,4 +1,4 @@
1811-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
1812+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1813
1814 This program is free software; you can redistribute it and/or modify
1815 it under the terms of the GNU General Public License as published by
1816@@ -11,7 +11,7 @@
1817
1818 You should have received a copy of the GNU General Public License
1819 along with this program; if not, write to the Free Software
1820- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1821+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1822
1823 #include "handshake.h"
1824
1825@@ -280,10 +280,9 @@
1826
1827 void Security_buffer::free(void)
1828 {
1829- if (!m_allocated)
1830- return;
1831- if (!ptr())
1832- return;
1833- FreeContextBuffer(ptr());
1834- m_allocated= false;
1835+ if (m_allocated && NULL != ptr())
1836+ {
1837+ FreeContextBuffer(ptr());
1838+ init(NULL, 0);
1839+ }
1840 }
1841
1842=== modified file 'Percona-Server/libmysql/authentication_win/handshake.h'
1843--- Percona-Server/libmysql/authentication_win/handshake.h 2011-04-29 21:53:46 +0000
1844+++ Percona-Server/libmysql/authentication_win/handshake.h 2013-06-20 17:28:44 +0000
1845@@ -1,4 +1,4 @@
1846-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
1847+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1848
1849 This program is free software; you can redistribute it and/or modify
1850 it under the terms of the GNU General Public License as published by
1851@@ -11,7 +11,7 @@
1852
1853 You should have received a copy of the GNU General Public License
1854 along with this program; if not, write to the Free Software
1855- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1856+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1857
1858 #ifndef HANDSHAKE_H
1859 #define HANDSHAKE_H
1860@@ -53,7 +53,12 @@
1861 }
1862
1863 /// If @c false, no deallocation will be done in the destructor.
1864- bool m_allocated;
1865+ const bool m_allocated;
1866+
1867+ // Copying/assignment is not supported and can lead to memory leaks
1868+ // So declaring copy constructor and assignment operator as private
1869+ Security_buffer( const Security_buffer& );
1870+ const Security_buffer& operator=( const Security_buffer& );
1871
1872 public:
1873
1874@@ -75,11 +80,6 @@
1875 return m_buf.cbBuffer;
1876 }
1877
1878- bool is_valid() const
1879- {
1880- return ptr() != NULL;
1881- }
1882-
1883 const Blob as_blob() const
1884 {
1885 return Blob(ptr(), len());
1886
1887=== modified file 'Percona-Server/libmysql/authentication_win/handshake_client.cc'
1888--- Percona-Server/libmysql/authentication_win/handshake_client.cc 2011-10-19 11:42:46 +0000
1889+++ Percona-Server/libmysql/authentication_win/handshake_client.cc 2013-06-20 17:28:44 +0000
1890@@ -11,7 +11,7 @@
1891
1892 You should have received a copy of the GNU General Public License
1893 along with this program; if not, write to the Free Software
1894- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1895+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1896
1897 #include "handshake.h"
1898
1899
1900=== modified file 'Percona-Server/libmysql/authentication_win/log_client.cc'
1901--- Percona-Server/libmysql/authentication_win/log_client.cc 2011-09-21 11:01:41 +0000
1902+++ Percona-Server/libmysql/authentication_win/log_client.cc 2013-06-20 17:28:44 +0000
1903@@ -11,7 +11,7 @@
1904
1905 You should have received a copy of the GNU General Public License
1906 along with this program; if not, write to the Free Software
1907- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1908+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1909
1910 #include <my_global.h>
1911 #include "common.h"
1912
1913=== modified file 'Percona-Server/libmysql/authentication_win/plugin_client.cc'
1914--- Percona-Server/libmysql/authentication_win/plugin_client.cc 2011-06-03 13:17:35 +0000
1915+++ Percona-Server/libmysql/authentication_win/plugin_client.cc 2013-06-20 17:28:44 +0000
1916@@ -11,7 +11,7 @@
1917
1918 You should have received a copy of the GNU General Public License
1919 along with this program; if not, write to the Free Software
1920- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1921+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1922
1923 #include <my_global.h>
1924 #include <mysql.h>
1925
1926=== modified file 'Percona-Server/libmysql/conf_to_src.c'
1927--- Percona-Server/libmysql/conf_to_src.c 2013-02-26 05:45:28 +0000
1928+++ Percona-Server/libmysql/conf_to_src.c 2013-06-20 17:28:44 +0000
1929@@ -14,7 +14,7 @@
1930
1931 You should have received a copy of the GNU General Public License
1932 along with this program; if not, write to the Free Software
1933- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1934+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1935
1936 /* can't use -lmysys because this prog is used to create -lstrings */
1937
1938
1939=== modified file 'Percona-Server/libmysqld/examples/CMakeLists.txt'
1940--- Percona-Server/libmysqld/examples/CMakeLists.txt 2013-05-12 06:24:46 +0000
1941+++ Percona-Server/libmysqld/examples/CMakeLists.txt 2013-06-20 17:28:44 +0000
1942@@ -1,4 +1,4 @@
1943-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1944+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
1945 #
1946 # This program is free software; you can redistribute it and/or modify
1947 # it under the terms of the GNU General Public License as published by
1948@@ -17,7 +17,7 @@
1949 ${CMAKE_SOURCE_DIR}/libmysqld/include
1950 ${CMAKE_SOURCE_DIR}/regex
1951 ${CMAKE_SOURCE_DIR}/tests
1952- ${READLINE_INCLUDE_DIR}
1953+ ${EDITLINE_INCLUDE_DIR}
1954 )
1955
1956
1957@@ -28,8 +28,7 @@
1958 ../../client/mysql.cc ../../client/readline.cc)
1959 TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver)
1960 IF(UNIX)
1961- ADD_DEFINITIONS(${READLINE_DEFINES})
1962- TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY})
1963+ TARGET_LINK_LIBRARIES(mysql_embedded ${EDITLINE_LIBRARY})
1964 SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
1965 ENDIF(UNIX)
1966
1967
1968=== modified file 'Percona-Server/libmysqld/examples/test-run'
1969--- Percona-Server/libmysqld/examples/test-run 2010-12-28 18:57:23 +0000
1970+++ Percona-Server/libmysqld/examples/test-run 2013-06-20 17:28:44 +0000
1971@@ -13,7 +13,7 @@
1972 #
1973 # You should have received a copy of the GNU General Public License
1974 # along with this program; if not, write to the Free Software
1975-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1976+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1977
1978 # This is slapped together as a quick way to run the tests and
1979 # is not meant for prime time. Please hack at it and submit
1980
1981=== modified file 'Percona-Server/libmysqld/lib_sql.cc'
1982--- Percona-Server/libmysqld/lib_sql.cc 2013-05-12 06:24:46 +0000
1983+++ Percona-Server/libmysqld/lib_sql.cc 2013-06-20 17:28:44 +0000
1984@@ -511,6 +511,7 @@
1985 char ***argvp= NULL;
1986 int fake_argc= 1;
1987 char *fake_argv[2];
1988+ char **foo= &fake_argv[0];
1989 char fake_server[]= "server";
1990 char fake_embedded[]= "embedded";
1991 char *fake_groups[]= { fake_server, fake_embedded, NULL };
1992@@ -530,7 +531,6 @@
1993 fake_argv[0]= fake_name;
1994 fake_argv[1]= NULL;
1995
1996- char **foo= &fake_argv[0];
1997 argcp= &fake_argc;
1998 argvp= &foo;
1999 }
2000
2001=== modified file 'Percona-Server/man/comp_err.1'
2002--- Percona-Server/man/comp_err.1 2013-05-30 15:34:14 +0000
2003+++ Percona-Server/man/comp_err.1 2013-06-20 17:28:44 +0000
2004@@ -2,12 +2,12 @@
2005 .\" Title: \fBcomp_err\fR
2006 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2007 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2008-.\" Date: 04/05/2013
2009+.\" Date: 05/21/2013
2010 .\" Manual: MySQL Database System
2011 .\" Source: MySQL 5.6
2012 .\" Language: English
2013 .\"
2014-.TH "\FBCOMP_ERR\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2015+.TH "\FBCOMP_ERR\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2016 .\" -----------------------------------------------------------------
2017 .\" * Define some portability stuff
2018 .\" -----------------------------------------------------------------
2019
2020=== modified file 'Percona-Server/man/innochecksum.1'
2021--- Percona-Server/man/innochecksum.1 2013-05-30 15:34:14 +0000
2022+++ Percona-Server/man/innochecksum.1 2013-06-20 17:28:44 +0000
2023@@ -2,12 +2,12 @@
2024 .\" Title: \fBinnochecksum\fR
2025 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2026 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2027-.\" Date: 04/05/2013
2028+.\" Date: 05/21/2013
2029 .\" Manual: MySQL Database System
2030 .\" Source: MySQL 5.6
2031 .\" Language: English
2032 .\"
2033-.TH "\FBINNOCHECKSUM\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2034+.TH "\FBINNOCHECKSUM\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2035 .\" -----------------------------------------------------------------
2036 .\" * Define some portability stuff
2037 .\" -----------------------------------------------------------------
2038
2039=== modified file 'Percona-Server/man/msql2mysql.1'
2040--- Percona-Server/man/msql2mysql.1 2013-05-30 15:34:14 +0000
2041+++ Percona-Server/man/msql2mysql.1 2013-06-20 17:28:44 +0000
2042@@ -2,12 +2,12 @@
2043 .\" Title: \fBmsql2mysql\fR
2044 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2045 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2046-.\" Date: 04/05/2013
2047+.\" Date: 05/21/2013
2048 .\" Manual: MySQL Database System
2049 .\" Source: MySQL 5.6
2050 .\" Language: English
2051 .\"
2052-.TH "\FBMSQL2MYSQL\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2053+.TH "\FBMSQL2MYSQL\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2054 .\" -----------------------------------------------------------------
2055 .\" * Define some portability stuff
2056 .\" -----------------------------------------------------------------
2057
2058=== modified file 'Percona-Server/man/my_print_defaults.1'
2059--- Percona-Server/man/my_print_defaults.1 2013-05-30 15:34:14 +0000
2060+++ Percona-Server/man/my_print_defaults.1 2013-06-20 17:28:44 +0000
2061@@ -2,12 +2,12 @@
2062 .\" Title: \fBmy_print_defaults\fR
2063 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2064 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2065-.\" Date: 04/05/2013
2066+.\" Date: 05/21/2013
2067 .\" Manual: MySQL Database System
2068 .\" Source: MySQL 5.6
2069 .\" Language: English
2070 .\"
2071-.TH "\FBMY_PRINT_DEFAULTS" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2072+.TH "\FBMY_PRINT_DEFAULTS" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2073 .\" -----------------------------------------------------------------
2074 .\" * Define some portability stuff
2075 .\" -----------------------------------------------------------------
2076
2077=== modified file 'Percona-Server/man/myisam_ftdump.1'
2078--- Percona-Server/man/myisam_ftdump.1 2013-05-30 15:34:14 +0000
2079+++ Percona-Server/man/myisam_ftdump.1 2013-06-20 17:28:44 +0000
2080@@ -2,12 +2,12 @@
2081 .\" Title: \fBmyisam_ftdump\fR
2082 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2083 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2084-.\" Date: 04/05/2013
2085+.\" Date: 05/21/2013
2086 .\" Manual: MySQL Database System
2087 .\" Source: MySQL 5.6
2088 .\" Language: English
2089 .\"
2090-.TH "\FBMYISAM_FTDUMP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2091+.TH "\FBMYISAM_FTDUMP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2092 .\" -----------------------------------------------------------------
2093 .\" * Define some portability stuff
2094 .\" -----------------------------------------------------------------
2095
2096=== modified file 'Percona-Server/man/myisamchk.1'
2097--- Percona-Server/man/myisamchk.1 2013-05-30 15:34:14 +0000
2098+++ Percona-Server/man/myisamchk.1 2013-06-20 17:28:44 +0000
2099@@ -2,12 +2,12 @@
2100 .\" Title: \fBmyisamchk\fR
2101 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2102 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2103-.\" Date: 04/05/2013
2104+.\" Date: 05/21/2013
2105 .\" Manual: MySQL Database System
2106 .\" Source: MySQL 5.6
2107 .\" Language: English
2108 .\"
2109-.TH "\FBMYISAMCHK\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2110+.TH "\FBMYISAMCHK\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2111 .\" -----------------------------------------------------------------
2112 .\" * Define some portability stuff
2113 .\" -----------------------------------------------------------------
2114
2115=== modified file 'Percona-Server/man/myisamlog.1'
2116--- Percona-Server/man/myisamlog.1 2013-05-30 15:34:14 +0000
2117+++ Percona-Server/man/myisamlog.1 2013-06-20 17:28:44 +0000
2118@@ -2,12 +2,12 @@
2119 .\" Title: \fBmyisamlog\fR
2120 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2121 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2122-.\" Date: 04/05/2013
2123+.\" Date: 05/21/2013
2124 .\" Manual: MySQL Database System
2125 .\" Source: MySQL 5.6
2126 .\" Language: English
2127 .\"
2128-.TH "\FBMYISAMLOG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2129+.TH "\FBMYISAMLOG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2130 .\" -----------------------------------------------------------------
2131 .\" * Define some portability stuff
2132 .\" -----------------------------------------------------------------
2133
2134=== modified file 'Percona-Server/man/myisampack.1'
2135--- Percona-Server/man/myisampack.1 2013-05-30 15:34:14 +0000
2136+++ Percona-Server/man/myisampack.1 2013-06-20 17:28:44 +0000
2137@@ -2,12 +2,12 @@
2138 .\" Title: \fBmyisampack\fR
2139 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2140 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2141-.\" Date: 04/05/2013
2142+.\" Date: 05/21/2013
2143 .\" Manual: MySQL Database System
2144 .\" Source: MySQL 5.6
2145 .\" Language: English
2146 .\"
2147-.TH "\FBMYISAMPACK\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2148+.TH "\FBMYISAMPACK\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2149 .\" -----------------------------------------------------------------
2150 .\" * Define some portability stuff
2151 .\" -----------------------------------------------------------------
2152
2153=== modified file 'Percona-Server/man/mysql-stress-test.pl.1'
2154--- Percona-Server/man/mysql-stress-test.pl.1 2013-05-30 15:34:14 +0000
2155+++ Percona-Server/man/mysql-stress-test.pl.1 2013-06-20 17:28:44 +0000
2156@@ -2,12 +2,12 @@
2157 .\" Title: \fBmysql-stress-test.pl\fR
2158 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2159 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2160-.\" Date: 03/28/2013
2161+.\" Date: 05/16/2013
2162 .\" Manual: MySQL Database System
2163 .\" Source: MySQL
2164 .\" Language: English
2165 .\"
2166-.TH "\FBMYSQL\-STRESS\-TE" "1" "03/28/2013" "MySQL" "MySQL Database System"
2167+.TH "\FBMYSQL\-STRESS\-TE" "1" "05/16/2013" "MySQL" "MySQL Database System"
2168 .\" -----------------------------------------------------------------
2169 .\" * Define some portability stuff
2170 .\" -----------------------------------------------------------------
2171
2172=== modified file 'Percona-Server/man/mysql-test-run.pl.1'
2173--- Percona-Server/man/mysql-test-run.pl.1 2013-05-30 15:34:14 +0000
2174+++ Percona-Server/man/mysql-test-run.pl.1 2013-06-20 17:28:44 +0000
2175@@ -2,12 +2,12 @@
2176 .\" Title: \fBmysql-test-run.pl\fR
2177 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2178 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2179-.\" Date: 03/28/2013
2180+.\" Date: 05/16/2013
2181 .\" Manual: MySQL Database System
2182 .\" Source: MySQL
2183 .\" Language: English
2184 .\"
2185-.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/28/2013" "MySQL" "MySQL Database System"
2186+.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/16/2013" "MySQL" "MySQL Database System"
2187 .\" -----------------------------------------------------------------
2188 .\" * Define some portability stuff
2189 .\" -----------------------------------------------------------------
2190
2191=== modified file 'Percona-Server/man/mysql.1'
2192--- Percona-Server/man/mysql.1 2013-05-30 15:34:14 +0000
2193+++ Percona-Server/man/mysql.1 2013-06-20 17:28:44 +0000
2194@@ -2,12 +2,12 @@
2195 .\" Title: \fBmysql\fR
2196 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2197 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2198-.\" Date: 04/05/2013
2199+.\" Date: 05/21/2013
2200 .\" Manual: MySQL Database System
2201 .\" Source: MySQL 5.6
2202 .\" Language: English
2203 .\"
2204-.TH "\FBMYSQL\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2205+.TH "\FBMYSQL\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2206 .\" -----------------------------------------------------------------
2207 .\" * Define some portability stuff
2208 .\" -----------------------------------------------------------------
2209@@ -1738,8 +1738,8 @@
2210 \(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
2211 \(lq;\(rq
2212 as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
2213-Section\ \&21.8.16, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
2214-Section\ \&18.1, \(lqDefining Stored Programs\(rq)\&.
2215+Section\ \&22.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
2216+Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.
2217 .RE
2218 .sp
2219 .RS 4
2220@@ -3411,7 +3411,7 @@
2221 option\&.
2222 .PP
2223 For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
2224-Section\ \&21.8.15, \(lqControlling Automatic Reconnection Behavior\(rq\&.
2225+Section\ \&22.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
2226 .SH "COPYRIGHT"
2227 .br
2228 .PP
2229
2230=== modified file 'Percona-Server/man/mysql.server.1'
2231--- Percona-Server/man/mysql.server.1 2013-05-30 15:34:14 +0000
2232+++ Percona-Server/man/mysql.server.1 2013-06-20 17:28:44 +0000
2233@@ -2,12 +2,12 @@
2234 .\" Title: \fBmysql.server\fR
2235 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2236 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2237-.\" Date: 04/05/2013
2238+.\" Date: 05/21/2013
2239 .\" Manual: MySQL Database System
2240 .\" Source: MySQL 5.6
2241 .\" Language: English
2242 .\"
2243-.TH "\FBMYSQL\&.SERVER\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2244+.TH "\FBMYSQL\&.SERVER\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2245 .\" -----------------------------------------------------------------
2246 .\" * Define some portability stuff
2247 .\" -----------------------------------------------------------------
2248@@ -49,7 +49,7 @@
2249 /etc/init\&.d
2250 directory with the name
2251 mysql\&. You need not install it manually\&. See
2252-Section\ \&2.5.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq, for more information on the Linux RPM packages\&.
2253+Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq, for more information on the Linux RPM packages\&.
2254 .PP
2255 Some vendors provide RPM packages that install a startup script under a different name such as
2256 \fBmysqld\fR\&.
2257
2258=== modified file 'Percona-Server/man/mysql_client_test.1'
2259--- Percona-Server/man/mysql_client_test.1 2013-05-30 15:34:14 +0000
2260+++ Percona-Server/man/mysql_client_test.1 2013-06-20 17:28:44 +0000
2261@@ -2,12 +2,12 @@
2262 .\" Title: \fBmysql_client_test\fR
2263 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2264 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2265-.\" Date: 03/28/2013
2266+.\" Date: 05/16/2013
2267 .\" Manual: MySQL Database System
2268 .\" Source: MySQL
2269 .\" Language: English
2270 .\"
2271-.TH "\FBMYSQL_CLIENT_TEST" "1" "03/28/2013" "MySQL" "MySQL Database System"
2272+.TH "\FBMYSQL_CLIENT_TEST" "1" "05/16/2013" "MySQL" "MySQL Database System"
2273 .\" -----------------------------------------------------------------
2274 .\" * Define some portability stuff
2275 .\" -----------------------------------------------------------------
2276
2277=== modified file 'Percona-Server/man/mysql_config.1'
2278--- Percona-Server/man/mysql_config.1 2013-05-30 15:34:14 +0000
2279+++ Percona-Server/man/mysql_config.1 2013-06-20 17:28:44 +0000
2280@@ -2,12 +2,12 @@
2281 .\" Title: \fBmysql_config\fR
2282 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2283 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2284-.\" Date: 04/05/2013
2285+.\" Date: 05/21/2013
2286 .\" Manual: MySQL Database System
2287 .\" Source: MySQL 5.6
2288 .\" Language: English
2289 .\"
2290-.TH "\FBMYSQL_CONFIG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2291+.TH "\FBMYSQL_CONFIG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2292 .\" -----------------------------------------------------------------
2293 .\" * Define some portability stuff
2294 .\" -----------------------------------------------------------------
2295
2296=== modified file 'Percona-Server/man/mysql_config_editor.1'
2297--- Percona-Server/man/mysql_config_editor.1 2013-05-30 15:34:14 +0000
2298+++ Percona-Server/man/mysql_config_editor.1 2013-06-20 17:28:44 +0000
2299@@ -2,12 +2,12 @@
2300 .\" Title: \fBmysql_config_editor\fR
2301 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2302 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2303-.\" Date: 04/05/2013
2304+.\" Date: 05/21/2013
2305 .\" Manual: MySQL Database System
2306 .\" Source: MySQL 5.6
2307 .\" Language: English
2308 .\"
2309-.TH "\FBMYSQL_CONFIG_EDIT" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2310+.TH "\FBMYSQL_CONFIG_EDIT" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2311 .\" -----------------------------------------------------------------
2312 .\" * Define some portability stuff
2313 .\" -----------------------------------------------------------------
2314
2315=== modified file 'Percona-Server/man/mysql_convert_table_format.1'
2316--- Percona-Server/man/mysql_convert_table_format.1 2013-05-30 15:34:14 +0000
2317+++ Percona-Server/man/mysql_convert_table_format.1 2013-06-20 17:28:44 +0000
2318@@ -2,12 +2,12 @@
2319 .\" Title: \fBmysql_convert_table_format\fR
2320 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2321 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2322-.\" Date: 04/05/2013
2323+.\" Date: 05/21/2013
2324 .\" Manual: MySQL Database System
2325 .\" Source: MySQL 5.6
2326 .\" Language: English
2327 .\"
2328-.TH "\FBMYSQL_CONVERT_TAB" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2329+.TH "\FBMYSQL_CONVERT_TAB" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2330 .\" -----------------------------------------------------------------
2331 .\" * Define some portability stuff
2332 .\" -----------------------------------------------------------------
2333
2334=== modified file 'Percona-Server/man/mysql_find_rows.1'
2335--- Percona-Server/man/mysql_find_rows.1 2013-05-30 15:34:14 +0000
2336+++ Percona-Server/man/mysql_find_rows.1 2013-06-20 17:28:44 +0000
2337@@ -2,12 +2,12 @@
2338 .\" Title: \fBmysql_find_rows\fR
2339 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2340 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2341-.\" Date: 04/05/2013
2342+.\" Date: 05/21/2013
2343 .\" Manual: MySQL Database System
2344 .\" Source: MySQL 5.6
2345 .\" Language: English
2346 .\"
2347-.TH "\FBMYSQL_FIND_ROWS\F" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2348+.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2349 .\" -----------------------------------------------------------------
2350 .\" * Define some portability stuff
2351 .\" -----------------------------------------------------------------
2352
2353=== modified file 'Percona-Server/man/mysql_fix_extensions.1'
2354--- Percona-Server/man/mysql_fix_extensions.1 2013-05-30 15:34:14 +0000
2355+++ Percona-Server/man/mysql_fix_extensions.1 2013-06-20 17:28:44 +0000
2356@@ -2,12 +2,12 @@
2357 .\" Title: \fBmysql_fix_extensions\fR
2358 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2359 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2360-.\" Date: 04/05/2013
2361+.\" Date: 05/21/2013
2362 .\" Manual: MySQL Database System
2363 .\" Source: MySQL 5.6
2364 .\" Language: English
2365 .\"
2366-.TH "\FBMYSQL_FIX_EXTENSI" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2367+.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2368 .\" -----------------------------------------------------------------
2369 .\" * Define some portability stuff
2370 .\" -----------------------------------------------------------------
2371
2372=== modified file 'Percona-Server/man/mysql_install_db.1'
2373--- Percona-Server/man/mysql_install_db.1 2013-05-30 15:34:14 +0000
2374+++ Percona-Server/man/mysql_install_db.1 2013-06-20 17:28:44 +0000
2375@@ -2,12 +2,12 @@
2376 .\" Title: \fBmysql_install_db\fR
2377 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2378 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2379-.\" Date: 04/05/2013
2380+.\" Date: 05/21/2013
2381 .\" Manual: MySQL Database System
2382 .\" Source: MySQL 5.6
2383 .\" Language: English
2384 .\"
2385-.TH "\FBMYSQL_INSTALL_DB\" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2386+.TH "\FBMYSQL_INSTALL_DB\" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2387 .\" -----------------------------------------------------------------
2388 .\" * Define some portability stuff
2389 .\" -----------------------------------------------------------------
2390
2391=== modified file 'Percona-Server/man/mysql_plugin.1'
2392--- Percona-Server/man/mysql_plugin.1 2013-05-30 15:34:14 +0000
2393+++ Percona-Server/man/mysql_plugin.1 2013-06-20 17:28:44 +0000
2394@@ -2,12 +2,12 @@
2395 .\" Title: \fBmysql_plugin\fR
2396 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2397 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2398-.\" Date: 04/05/2013
2399+.\" Date: 05/21/2013
2400 .\" Manual: MySQL Database System
2401 .\" Source: MySQL 5.6
2402 .\" Language: English
2403 .\"
2404-.TH "\FBMYSQL_PLUGIN\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2405+.TH "\FBMYSQL_PLUGIN\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2406 .\" -----------------------------------------------------------------
2407 .\" * Define some portability stuff
2408 .\" -----------------------------------------------------------------
2409
2410=== modified file 'Percona-Server/man/mysql_secure_installation.1'
2411--- Percona-Server/man/mysql_secure_installation.1 2013-05-30 15:34:14 +0000
2412+++ Percona-Server/man/mysql_secure_installation.1 2013-06-20 17:28:44 +0000
2413@@ -2,12 +2,12 @@
2414 .\" Title: \fBmysql_secure_installation\fR
2415 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2416 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2417-.\" Date: 04/05/2013
2418+.\" Date: 05/21/2013
2419 .\" Manual: MySQL Database System
2420 .\" Source: MySQL 5.6
2421 .\" Language: English
2422 .\"
2423-.TH "\FBMYSQL_SECURE_INST" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2424+.TH "\FBMYSQL_SECURE_INST" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2425 .\" -----------------------------------------------------------------
2426 .\" * Define some portability stuff
2427 .\" -----------------------------------------------------------------
2428
2429=== modified file 'Percona-Server/man/mysql_setpermission.1'
2430--- Percona-Server/man/mysql_setpermission.1 2013-05-30 15:34:14 +0000
2431+++ Percona-Server/man/mysql_setpermission.1 2013-06-20 17:28:44 +0000
2432@@ -2,12 +2,12 @@
2433 .\" Title: \fBmysql_setpermission\fR
2434 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2435 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2436-.\" Date: 04/05/2013
2437+.\" Date: 05/21/2013
2438 .\" Manual: MySQL Database System
2439 .\" Source: MySQL 5.6
2440 .\" Language: English
2441 .\"
2442-.TH "\FBMYSQL_SETPERMISSI" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2443+.TH "\FBMYSQL_SETPERMISSI" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2444 .\" -----------------------------------------------------------------
2445 .\" * Define some portability stuff
2446 .\" -----------------------------------------------------------------
2447
2448=== modified file 'Percona-Server/man/mysql_tzinfo_to_sql.1'
2449--- Percona-Server/man/mysql_tzinfo_to_sql.1 2013-05-30 15:34:14 +0000
2450+++ Percona-Server/man/mysql_tzinfo_to_sql.1 2013-06-20 17:28:44 +0000
2451@@ -2,12 +2,12 @@
2452 .\" Title: \fBmysql_tzinfo_to_sql\fR
2453 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2454 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2455-.\" Date: 04/05/2013
2456+.\" Date: 05/21/2013
2457 .\" Manual: MySQL Database System
2458 .\" Source: MySQL 5.6
2459 .\" Language: English
2460 .\"
2461-.TH "\FBMYSQL_TZINFO_TO_S" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2462+.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2463 .\" -----------------------------------------------------------------
2464 .\" * Define some portability stuff
2465 .\" -----------------------------------------------------------------
2466
2467=== modified file 'Percona-Server/man/mysql_upgrade.1'
2468--- Percona-Server/man/mysql_upgrade.1 2013-05-30 15:34:14 +0000
2469+++ Percona-Server/man/mysql_upgrade.1 2013-06-20 17:28:44 +0000
2470@@ -2,12 +2,12 @@
2471 .\" Title: \fBmysql_upgrade\fR
2472 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2473 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2474-.\" Date: 04/05/2013
2475+.\" Date: 05/21/2013
2476 .\" Manual: MySQL Database System
2477 .\" Source: MySQL 5.6
2478 .\" Language: English
2479 .\"
2480-.TH "\FBMYSQL_UPGRADE\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2481+.TH "\FBMYSQL_UPGRADE\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2482 .\" -----------------------------------------------------------------
2483 .\" * Define some portability stuff
2484 .\" -----------------------------------------------------------------
2485@@ -193,7 +193,7 @@
2486 \fBmysql_upgrade\fR
2487 is included in the server RPM but requires the client RPM because the latter includes
2488 \fBmysqlcheck\fR\&. (See
2489-Section\ \&2.5.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq\&.)
2490+Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq\&.)
2491 .PP
2492 \fBmysql_upgrade\fR
2493 does not upgrade the contents of the help tables\&. For upgrade instructions, see
2494
2495=== modified file 'Percona-Server/man/mysql_waitpid.1'
2496--- Percona-Server/man/mysql_waitpid.1 2013-05-30 15:34:14 +0000
2497+++ Percona-Server/man/mysql_waitpid.1 2013-06-20 17:28:44 +0000
2498@@ -2,12 +2,12 @@
2499 .\" Title: \fBmysql_waitpid\fR
2500 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2501 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2502-.\" Date: 04/05/2013
2503+.\" Date: 05/21/2013
2504 .\" Manual: MySQL Database System
2505 .\" Source: MySQL 5.6
2506 .\" Language: English
2507 .\"
2508-.TH "\FBMYSQL_WAITPID\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2509+.TH "\FBMYSQL_WAITPID\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2510 .\" -----------------------------------------------------------------
2511 .\" * Define some portability stuff
2512 .\" -----------------------------------------------------------------
2513
2514=== modified file 'Percona-Server/man/mysql_zap.1'
2515--- Percona-Server/man/mysql_zap.1 2013-05-30 15:34:14 +0000
2516+++ Percona-Server/man/mysql_zap.1 2013-06-20 17:28:44 +0000
2517@@ -2,12 +2,12 @@
2518 .\" Title: \fBmysql_zap\fR
2519 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2520 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2521-.\" Date: 04/05/2013
2522+.\" Date: 05/21/2013
2523 .\" Manual: MySQL Database System
2524 .\" Source: MySQL 5.6
2525 .\" Language: English
2526 .\"
2527-.TH "\FBMYSQL_ZAP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2528+.TH "\FBMYSQL_ZAP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2529 .\" -----------------------------------------------------------------
2530 .\" * Define some portability stuff
2531 .\" -----------------------------------------------------------------
2532
2533=== modified file 'Percona-Server/man/mysqlaccess.1'
2534--- Percona-Server/man/mysqlaccess.1 2013-05-30 15:34:14 +0000
2535+++ Percona-Server/man/mysqlaccess.1 2013-06-20 17:28:44 +0000
2536@@ -2,12 +2,12 @@
2537 .\" Title: \fBmysqlaccess\fR
2538 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2539 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2540-.\" Date: 04/05/2013
2541+.\" Date: 05/21/2013
2542 .\" Manual: MySQL Database System
2543 .\" Source: MySQL 5.6
2544 .\" Language: English
2545 .\"
2546-.TH "\FBMYSQLACCESS\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2547+.TH "\FBMYSQLACCESS\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2548 .\" -----------------------------------------------------------------
2549 .\" * Define some portability stuff
2550 .\" -----------------------------------------------------------------
2551
2552=== modified file 'Percona-Server/man/mysqladmin.1'
2553--- Percona-Server/man/mysqladmin.1 2013-05-30 15:34:14 +0000
2554+++ Percona-Server/man/mysqladmin.1 2013-06-20 17:28:44 +0000
2555@@ -2,12 +2,12 @@
2556 .\" Title: \fBmysqladmin\fR
2557 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2558 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2559-.\" Date: 04/05/2013
2560+.\" Date: 05/21/2013
2561 .\" Manual: MySQL Database System
2562 .\" Source: MySQL 5.6
2563 .\" Language: English
2564 .\"
2565-.TH "\FBMYSQLADMIN\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2566+.TH "\FBMYSQLADMIN\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2567 .\" -----------------------------------------------------------------
2568 .\" * Define some portability stuff
2569 .\" -----------------------------------------------------------------
2570@@ -81,10 +81,10 @@
2571 .\}
2572 debug
2573 .sp
2574-Tell the server to write debug information to the error log\&.
2575+Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.
2576 .sp
2577 This includes information about the Event Scheduler\&. See
2578-Section\ \&18.4.5, \(lqEvent Scheduler Status\(rq\&.
2579+Section\ \&19.4.5, \(lqEvent Scheduler Status\(rq\&.
2580 .RE
2581 .sp
2582 .RS 4
2583
2584=== modified file 'Percona-Server/man/mysqlbinlog.1'
2585--- Percona-Server/man/mysqlbinlog.1 2013-05-30 15:34:14 +0000
2586+++ Percona-Server/man/mysqlbinlog.1 2013-06-20 17:28:44 +0000
2587@@ -2,12 +2,12 @@
2588 .\" Title: \fBmysqlbinlog\fR
2589 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2590 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2591-.\" Date: 04/05/2013
2592+.\" Date: 05/21/2013
2593 .\" Manual: MySQL Database System
2594 .\" Source: MySQL 5.6
2595 .\" Language: English
2596 .\"
2597-.TH "\FBMYSQLBINLOG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2598+.TH "\FBMYSQLBINLOG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2599 .\" -----------------------------------------------------------------
2600 .\" * Define some portability stuff
2601 .\" -----------------------------------------------------------------
2602@@ -981,6 +981,35 @@
2603 .sp -1
2604 .IP \(bu 2.3
2605 .\}
2606+.\" mysqlbinlog: server-id-bits option
2607+.\" server-id-bits option: mysqlbinlog
2608+\fB\-\-server\-id\-bits=\fR\fB\fIN\fR\fR
2609+.sp
2610+Use only the first
2611+\fIN\fR
2612+bits of the
2613+server_id
2614+to identify the server\&. If the binary log was written by a
2615+\fBmysqld\fR
2616+with server\-id\-bits set to less than 32 and user data stored in the most significant bit, running
2617+\fBmysqlbinlog\fR
2618+with
2619+\fB\-\-server\-id\-bits\fR
2620+set to 32 enables this data to be seen\&.
2621+.sp
2622+This option is supported only by the versions of
2623+\fBmysqlbinlog\fR
2624+supplied with the MySQL Cluster distribution, or built from the MySQL Cluster sources\&.
2625+.RE
2626+.sp
2627+.RS 4
2628+.ie n \{\
2629+\h'-04'\(bu\h'+03'\c
2630+.\}
2631+.el \{\
2632+.sp -1
2633+.IP \(bu 2.3
2634+.\}
2635 .\" mysqlbinlog: set-charset option
2636 .\" set-charset option: mysqlbinlog
2637 \fB\-\-set\-charset=\fR\fB\fIcharset_name\fR\fR
2638
2639=== modified file 'Percona-Server/man/mysqlbug.1'
2640--- Percona-Server/man/mysqlbug.1 2013-05-30 15:34:14 +0000
2641+++ Percona-Server/man/mysqlbug.1 2013-06-20 17:28:44 +0000
2642@@ -2,12 +2,12 @@
2643 .\" Title: \fBmysqlbug\fR
2644 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2645 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2646-.\" Date: 04/05/2013
2647+.\" Date: 05/21/2013
2648 .\" Manual: MySQL Database System
2649 .\" Source: MySQL 5.6
2650 .\" Language: English
2651 .\"
2652-.TH "\FBMYSQLBUG\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2653+.TH "\FBMYSQLBUG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2654 .\" -----------------------------------------------------------------
2655 .\" * Define some portability stuff
2656 .\" -----------------------------------------------------------------
2657
2658=== modified file 'Percona-Server/man/mysqlcheck.1'
2659--- Percona-Server/man/mysqlcheck.1 2013-05-30 15:34:14 +0000
2660+++ Percona-Server/man/mysqlcheck.1 2013-06-20 17:28:44 +0000
2661@@ -2,12 +2,12 @@
2662 .\" Title: \fBmysqlcheck\fR
2663 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2664 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2665-.\" Date: 04/05/2013
2666+.\" Date: 05/21/2013
2667 .\" Manual: MySQL Database System
2668 .\" Source: MySQL 5.6
2669 .\" Language: English
2670 .\"
2671-.TH "\FBMYSQLCHECK\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2672+.TH "\FBMYSQLCHECK\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2673 .\" -----------------------------------------------------------------
2674 .\" * Define some portability stuff
2675 .\" -----------------------------------------------------------------
2676
2677=== modified file 'Percona-Server/man/mysqld.8'
2678--- Percona-Server/man/mysqld.8 2013-05-30 15:34:14 +0000
2679+++ Percona-Server/man/mysqld.8 2013-06-20 17:28:44 +0000
2680@@ -2,12 +2,12 @@
2681 .\" Title: \fBmysqld\fR
2682 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2683 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2684-.\" Date: 04/05/2013
2685+.\" Date: 05/21/2013
2686 .\" Manual: MySQL Database System
2687 .\" Source: MySQL 5.6
2688 .\" Language: English
2689 .\"
2690-.TH "\FBMYSQLD\FR" "8" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2691+.TH "\FBMYSQLD\FR" "8" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2692 .\" -----------------------------------------------------------------
2693 .\" * Define some portability stuff
2694 .\" -----------------------------------------------------------------
2695
2696=== modified file 'Percona-Server/man/mysqld_multi.1'
2697--- Percona-Server/man/mysqld_multi.1 2013-05-30 15:34:14 +0000
2698+++ Percona-Server/man/mysqld_multi.1 2013-06-20 17:28:44 +0000
2699@@ -2,12 +2,12 @@
2700 .\" Title: \fBmysqld_multi\fR
2701 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2702 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2703-.\" Date: 04/05/2013
2704+.\" Date: 05/21/2013
2705 .\" Manual: MySQL Database System
2706 .\" Source: MySQL 5.6
2707 .\" Language: English
2708 .\"
2709-.TH "\FBMYSQLD_MULTI\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2710+.TH "\FBMYSQLD_MULTI\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2711 .\" -----------------------------------------------------------------
2712 .\" * Define some portability stuff
2713 .\" -----------------------------------------------------------------
2714
2715=== modified file 'Percona-Server/man/mysqld_safe.1'
2716--- Percona-Server/man/mysqld_safe.1 2013-05-30 15:34:14 +0000
2717+++ Percona-Server/man/mysqld_safe.1 2013-06-20 17:28:44 +0000
2718@@ -2,12 +2,12 @@
2719 .\" Title: \fBmysqld_safe\fR
2720 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2721 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2722-.\" Date: 04/05/2013
2723+.\" Date: 05/21/2013
2724 .\" Manual: MySQL Database System
2725 .\" Source: MySQL 5.6
2726 .\" Language: English
2727 .\"
2728-.TH "\FBMYSQLD_SAFE\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2729+.TH "\FBMYSQLD_SAFE\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2730 .\" -----------------------------------------------------------------
2731 .\" * Define some portability stuff
2732 .\" -----------------------------------------------------------------
2733
2734=== modified file 'Percona-Server/man/mysqldump.1'
2735--- Percona-Server/man/mysqldump.1 2013-05-30 15:34:14 +0000
2736+++ Percona-Server/man/mysqldump.1 2013-06-20 17:28:44 +0000
2737@@ -2,12 +2,12 @@
2738 .\" Title: \fBmysqldump\fR
2739 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2740 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2741-.\" Date: 04/05/2013
2742+.\" Date: 05/21/2013
2743 .\" Manual: MySQL Database System
2744 .\" Source: MySQL 5.6
2745 .\" Language: English
2746 .\"
2747-.TH "\FBMYSQLDUMP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2748+.TH "\FBMYSQLDUMP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2749 .\" -----------------------------------------------------------------
2750 .\" * Define some portability stuff
2751 .\" -----------------------------------------------------------------
2752@@ -62,6 +62,13 @@
2753 To reload a dump file, you must have the same privileges needed to create each of the dumped objects by issuing
2754 CREATE
2755 statements manually\&.
2756+.PP
2757+\fBmysqldump\fR
2758+output can include
2759+ALTER DATABASE
2760+statements that change the database collation\&. These may be used when dumping stored programs to preserve their character encodings\&. To reload a dump file containing such statements, the
2761+ALTER
2762+privilege for the affected database is required\&.
2763 Performance and Scalability Considerations
2764 .PP
2765 mysqldump
2766@@ -1083,151 +1090,9 @@
2767 also is specified, in which case, a global read lock is acquired only for a short time at the beginning of the dump (see the description for
2768 \fB\-\-single\-transaction\fR)\&. In all cases, any action on logs happens at the exact moment of the dump\&.
2769 .sp
2770-It is also possible to set up a slave by dumping an existing slave of the master\&. To do this, use the following procedure on the existing slave:
2771-.sp
2772-.RS 4
2773-.ie n \{\
2774-\h'-04' 1.\h'+01'\c
2775-.\}
2776-.el \{\
2777-.sp -1
2778-.IP " 1." 4.2
2779-.\}
2780-Stop the slave\*(Aqs SQL thread and get its current status:
2781-.sp
2782-.if n \{\
2783-.RS 4
2784-.\}
2785-.nf
2786-mysql> \fBSTOP SLAVE SQL_THREAD;\fR
2787-mysql> \fBSHOW SLAVE STATUS;\fR
2788-.fi
2789-.if n \{\
2790-.RE
2791-.\}
2792-.RE
2793-.sp
2794-.RS 4
2795-.ie n \{\
2796-\h'-04' 2.\h'+01'\c
2797-.\}
2798-.el \{\
2799-.sp -1
2800-.IP " 2." 4.2
2801-.\}
2802-From the output of the
2803-SHOW SLAVE STATUS
2804-statement, the binary log coordinates of the master server from which the new slave should start replicating are the values of the
2805-Relay_Master_Log_File
2806-and
2807-Exec_Master_Log_Pos
2808-fields\&. Denote those values as
2809-\fIfile_name\fR
2810-and
2811-\fIfile_pos\fR\&.
2812-.RE
2813-.sp
2814-.RS 4
2815-.ie n \{\
2816-\h'-04' 3.\h'+01'\c
2817-.\}
2818-.el \{\
2819-.sp -1
2820-.IP " 3." 4.2
2821-.\}
2822-Dump the slave server:
2823-.sp
2824-.if n \{\
2825-.RS 4
2826-.\}
2827-.nf
2828-shell> \fBmysqldump \-\-master\-data=2 \-\-all\-databases > dumpfile\fR
2829-.fi
2830-.if n \{\
2831-.RE
2832-.\}
2833-.sp
2834-Using
2835-\fB\-\-master\-data=2\fR
2836-works only if binary logging has been enabled on the slave\&. Otherwise,
2837-\fBmysqldump\fR
2838-fails with the error
2839-Binlogging on server not active\&. In this case you must handle any locking issues in another manner, using one or more of
2840-\fB\-\-add\-locks\fR,
2841-\fB\-\-lock\-tables\fR,
2842-\fB\-\-lock\-all\-tables\fR, or
2843-\fB\-\-single\-transaction\fR, as required by your application and environment\&.
2844-.RE
2845-.sp
2846-.RS 4
2847-.ie n \{\
2848-\h'-04' 4.\h'+01'\c
2849-.\}
2850-.el \{\
2851-.sp -1
2852-.IP " 4." 4.2
2853-.\}
2854-Restart the slave:
2855-.sp
2856-.if n \{\
2857-.RS 4
2858-.\}
2859-.nf
2860-mysql> \fBSTART SLAVE;\fR
2861-.fi
2862-.if n \{\
2863-.RE
2864-.\}
2865-.RE
2866-.sp
2867-.RS 4
2868-.ie n \{\
2869-\h'-04' 5.\h'+01'\c
2870-.\}
2871-.el \{\
2872-.sp -1
2873-.IP " 5." 4.2
2874-.\}
2875-On the new slave, load the dump file:
2876-.sp
2877-.if n \{\
2878-.RS 4
2879-.\}
2880-.nf
2881-shell> \fBmysql < dumpfile\fR
2882-.fi
2883-.if n \{\
2884-.RE
2885-.\}
2886-.RE
2887-.sp
2888-.RS 4
2889-.ie n \{\
2890-\h'-04' 6.\h'+01'\c
2891-.\}
2892-.el \{\
2893-.sp -1
2894-.IP " 6." 4.2
2895-.\}
2896-On the new slave, set the replication coordinates to those of the master server obtained earlier:
2897-.sp
2898-.if n \{\
2899-.RS 4
2900-.\}
2901-.nf
2902-mysql> \fBCHANGE MASTER TO\fR
2903- \-> \fBMASTER_LOG_FILE = \*(Aq\fR\fB\fIfile_name\fR\fR\fB\*(Aq, MASTER_LOG_POS = \fR\fB\fIfile_pos\fR\fR\fB;\fR
2904-.fi
2905-.if n \{\
2906-.RE
2907-.\}
2908-.sp
2909-The
2910-CHANGE MASTER TO
2911-statement might also need other parameters, such as
2912-MASTER_HOST
2913-to point the slave to the correct master server host\&. Add any such parameters as necessary\&.
2914-.RE
2915+It is also possible to set up a slave by dumping an existing slave of the master, using the
2916+\fB\-\-dump\-slave\fR
2917+option\&.
2918 .sp
2919 Prior to MySQL 5\&.6\&.4, this option was required for dumping the replication log tables (see
2920 Section\ \&16.2.2, \(lqReplication Relay and Status Logs\(rq)\&.
2921@@ -2515,6 +2380,11 @@
2922 performance_schema
2923 database\&.
2924 .PP
2925+\fBmysqldump\fR
2926+also does not dump the MySQL Cluster
2927+ndbinfo
2928+information database\&.
2929+.PP
2930 Before MySQL 5\&.6\&.6,
2931 \fBmysqldump\fR
2932 does not dump the
2933
2934=== modified file 'Percona-Server/man/mysqldumpslow.1'
2935--- Percona-Server/man/mysqldumpslow.1 2013-05-30 15:34:14 +0000
2936+++ Percona-Server/man/mysqldumpslow.1 2013-06-20 17:28:44 +0000
2937@@ -2,12 +2,12 @@
2938 .\" Title: \fBmysqldumpslow\fR
2939 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2940 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2941-.\" Date: 04/05/2013
2942+.\" Date: 05/21/2013
2943 .\" Manual: MySQL Database System
2944 .\" Source: MySQL 5.6
2945 .\" Language: English
2946 .\"
2947-.TH "\FBMYSQLDUMPSLOW\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2948+.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2949 .\" -----------------------------------------------------------------
2950 .\" * Define some portability stuff
2951 .\" -----------------------------------------------------------------
2952
2953=== modified file 'Percona-Server/man/mysqlhotcopy.1'
2954--- Percona-Server/man/mysqlhotcopy.1 2013-05-30 15:34:14 +0000
2955+++ Percona-Server/man/mysqlhotcopy.1 2013-06-20 17:28:44 +0000
2956@@ -2,12 +2,12 @@
2957 .\" Title: \fBmysqlhotcopy\fR
2958 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2959 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2960-.\" Date: 04/05/2013
2961+.\" Date: 05/21/2013
2962 .\" Manual: MySQL Database System
2963 .\" Source: MySQL 5.6
2964 .\" Language: English
2965 .\"
2966-.TH "\FBMYSQLHOTCOPY\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2967+.TH "\FBMYSQLHOTCOPY\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2968 .\" -----------------------------------------------------------------
2969 .\" * Define some portability stuff
2970 .\" -----------------------------------------------------------------
2971
2972=== modified file 'Percona-Server/man/mysqlimport.1'
2973--- Percona-Server/man/mysqlimport.1 2013-05-30 15:34:14 +0000
2974+++ Percona-Server/man/mysqlimport.1 2013-06-20 17:28:44 +0000
2975@@ -2,12 +2,12 @@
2976 .\" Title: \fBmysqlimport\fR
2977 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2978 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2979-.\" Date: 04/05/2013
2980+.\" Date: 05/21/2013
2981 .\" Manual: MySQL Database System
2982 .\" Source: MySQL 5.6
2983 .\" Language: English
2984 .\"
2985-.TH "\FBMYSQLIMPORT\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
2986+.TH "\FBMYSQLIMPORT\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
2987 .\" -----------------------------------------------------------------
2988 .\" * Define some portability stuff
2989 .\" -----------------------------------------------------------------
2990
2991=== modified file 'Percona-Server/man/mysqlshow.1'
2992--- Percona-Server/man/mysqlshow.1 2013-05-30 15:34:14 +0000
2993+++ Percona-Server/man/mysqlshow.1 2013-06-20 17:28:44 +0000
2994@@ -2,12 +2,12 @@
2995 .\" Title: \fBmysqlshow\fR
2996 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2997 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
2998-.\" Date: 04/05/2013
2999+.\" Date: 05/21/2013
3000 .\" Manual: MySQL Database System
3001 .\" Source: MySQL 5.6
3002 .\" Language: English
3003 .\"
3004-.TH "\FBMYSQLSHOW\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
3005+.TH "\FBMYSQLSHOW\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
3006 .\" -----------------------------------------------------------------
3007 .\" * Define some portability stuff
3008 .\" -----------------------------------------------------------------
3009
3010=== modified file 'Percona-Server/man/mysqlslap.1'
3011--- Percona-Server/man/mysqlslap.1 2013-05-30 15:34:14 +0000
3012+++ Percona-Server/man/mysqlslap.1 2013-06-20 17:28:44 +0000
3013@@ -2,12 +2,12 @@
3014 .\" Title: \fBmysqlslap\fR
3015 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3016 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
3017-.\" Date: 04/05/2013
3018+.\" Date: 05/21/2013
3019 .\" Manual: MySQL Database System
3020 .\" Source: MySQL 5.6
3021 .\" Language: English
3022 .\"
3023-.TH "\FBMYSQLSLAP\FR" "1" "04/05/2013" "MySQL 5\&.6" "MySQL Database System"
3024+.TH "\FBMYSQLSLAP\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
3025 .\" -----------------------------------------------------------------
3026 .\" * Define some portability stuff
3027 .\" -----------------------------------------------------------------
3028
3029=== modified file 'Percona-Server/man/mysqltest.1'
3030--- Percona-Server/man/mysqltest.1 2013-05-30 15:34:14 +0000
3031+++ Percona-Server/man/mysqltest.1 2013-06-20 17:28:44 +0000
3032@@ -2,12 +2,12 @@
3033 .\" Title: \fBmysqltest\fR
3034 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3035 .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
3036-.\" Date: 03/28/2013
3037+.\" Date: 05/16/2013
3038 .\" Manual: MySQL Database System
3039 .\" Source: MySQL
3040 .\" Language: English
3041 .\"
3042-.TH "\FBMYSQLTEST\FR" "1" "03/28/2013" "MySQL" "MySQL Database System"
3043+.TH "\FBMYSQLTEST\FR" "1" "05/16/2013" "MySQL" "MySQL Database System"
3044 .\" -----------------------------------------------------------------
3045 .\" * Define some portability stuff
3046 .\" -----------------------------------------------------------------
3047
3048=== added file 'Percona-Server/man/ndb-common-options.1'
3049--- Percona-Server/man/ndb-common-options.1 1970-01-01 00:00:00 +0000
3050+++ Percona-Server/man/ndb-common-options.1 2013-06-20 17:28:44 +0000
3051@@ -0,0 +1,679 @@
3052+'\" t
3053+.\" Title: Options Common to MySQL Cluster Programs
3054+.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3055+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
3056+.\" Date: 05/21/2013
3057+.\" Manual: MySQL Database System
3058+.\" Source: MySQL 5.6
3059+.\" Language: English
3060+.\"
3061+.TH "OPTIONS COMMON TO MY" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
3062+.\" -----------------------------------------------------------------
3063+.\" * Define some portability stuff
3064+.\" -----------------------------------------------------------------
3065+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3066+.\" http://bugs.debian.org/507673
3067+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
3068+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3069+.ie \n(.g .ds Aq \(aq
3070+.el .ds Aq '
3071+.\" -----------------------------------------------------------------
3072+.\" * set default formatting
3073+.\" -----------------------------------------------------------------
3074+.\" disable hyphenation
3075+.nh
3076+.\" disable justification (adjust text to left margin only)
3077+.ad l
3078+.\" -----------------------------------------------------------------
3079+.\" * MAIN CONTENT STARTS HERE *
3080+.\" -----------------------------------------------------------------
3081+.\" MySQL Cluster: administration
3082+.\" command-line options (MySQL Cluster)
3083+.\" program options (MySQL Cluster)
3084+.\" MySQL Cluster: ndbd
3085+.\" MySQL Cluster: mgm
3086+.\" MySQL Cluster: mgmd
3087+.SH "NAME"
3088+ndb-common-options \- MySQL Cluster Common Program Options
3089+.SH "DESCRIPTION"
3090+.PP
3091+All MySQL Cluster programs accept the options described in this section, with the following exceptions:
3092+.sp
3093+.RS 4
3094+.ie n \{\
3095+\h'-04'\(bu\h'+03'\c
3096+.\}
3097+.el \{\
3098+.sp -1
3099+.IP \(bu 2.3
3100+.\}
3101+\fBmysqld\fR
3102+.RE
3103+.sp
3104+.RS 4
3105+.ie n \{\
3106+\h'-04'\(bu\h'+03'\c
3107+.\}
3108+.el \{\
3109+.sp -1
3110+.IP \(bu 2.3
3111+.\}
3112+\fBndb_print_backup_file\fR
3113+.RE
3114+.sp
3115+.RS 4
3116+.ie n \{\
3117+\h'-04'\(bu\h'+03'\c
3118+.\}
3119+.el \{\
3120+.sp -1
3121+.IP \(bu 2.3
3122+.\}
3123+\fBndb_print_schema_file\fR
3124+.RE
3125+.sp
3126+.RS 4
3127+.ie n \{\
3128+\h'-04'\(bu\h'+03'\c
3129+.\}
3130+.el \{\
3131+.sp -1
3132+.IP \(bu 2.3
3133+.\}
3134+\fBndb_print_sys_file\fR
3135+.RE
3136+.PP
3137+Users of earlier MySQL Cluster versions should note that some of these options have been changed to make them consistent with one another as well as with
3138+\fBmysqld\fR\&. You can use the
3139+\fB\-\-help\fR
3140+option with any MySQL Cluster program\(emwith the exception of
3141+\fBndb_print_backup_file\fR,
3142+\fBndb_print_schema_file\fR, and
3143+\fBndb_print_sys_file\fR\(emto view a list of the options which the program supports\&.
3144+.PP
3145+The options in the following table are common to all MySQL Cluster executables (except those noted previously in this section)\&.
3146+.sp
3147+.it 1 an-trap
3148+.nr an-no-space-flag 1
3149+.nr an-break-flag 1
3150+.br
3151+.B Table\ \&17.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.3
3152+.TS
3153+allbox tab(:);
3154+lB lB lB.
3155+T{
3156+Format
3157+T}:T{
3158+Description
3159+T}:T{
3160+Added / Removed
3161+T}
3162+.T&
3163+l l l
3164+l l l
3165+l l l
3166+l l l
3167+l l l
3168+l l l
3169+l l l
3170+l l l
3171+l l l.
3172+T{
3173+.PP
3174+--help,
3175+.PP
3176+--usage,
3177+.PP
3178+-?
3179+T}:T{
3180+Display help message and exit
3181+T}:T{
3182+.PP
3183+All MySQL 5\&.6 based releases
3184+T}
3185+T{
3186+.PP
3187+--ndb-connectstring=connectstring,
3188+.PP
3189+--connect-string=connectstring,
3190+.PP
3191+-c
3192+T}:T{
3193+Set connectstring for connecting to ndb_mgmd\&. Syntax:
3194+ [nodeid=<id>;][host=]<hostname>[:<port>]\&.
3195+ Overrides entries specified in NDB_CONNECTSTRING or my\&.cnf\&.
3196+T}:T{
3197+.PP
3198+All MySQL 5\&.6 based releases
3199+T}
3200+T{
3201+.PP
3202+--ndb-mgmd-host=host[:port]
3203+T}:T{
3204+Set the host (and port, if desired) for connecting to the management
3205+ server
3206+T}:T{
3207+.PP
3208+All MySQL 5\&.6 based releases
3209+T}
3210+T{
3211+.PP
3212+--ndb-nodeid=#
3213+T}:T{
3214+Set node id for this node
3215+T}:T{
3216+.PP
3217+All MySQL 5\&.6 based releases
3218+T}
3219+T{
3220+.PP
3221+--ndb-optimized-node-selection
3222+T}:T{
3223+Select nodes for transactions in a more optimal way
3224+T}:T{
3225+.PP
3226+All MySQL 5\&.6 based releases
3227+T}
3228+T{
3229+.PP
3230+--character-sets-dir=path
3231+T}:T{
3232+Directory where character sets are
3233+T}:T{
3234+.PP
3235+All MySQL 5\&.6 based releases
3236+T}
3237+T{
3238+.PP
3239+--debug=options
3240+T}:T{
3241+Enable output from debug calls\&. Can be used only for versions compiled
3242+ with debugging enabled
3243+T}:T{
3244+.PP
3245+All MySQL 5\&.6 based releases
3246+T}
3247+T{
3248+.PP
3249+--core-file
3250+T}:T{
3251+Write core on errors (defaults to TRUE in debug builds)
3252+T}:T{
3253+.PP
3254+All MySQL 5\&.6 based releases
3255+T}
3256+T{
3257+.PP
3258+--version,
3259+.PP
3260+-V
3261+T}:T{
3262+Output version information and exit
3263+T}:T{
3264+.PP
3265+All MySQL 5\&.6 based releases
3266+T}
3267+.TE
3268+.sp 1
3269+.PP
3270+For options specific to individual MySQL Cluster programs, see
3271+Section\ \&17.4, \(lqMySQL Cluster Programs\(rq\&.
3272+.PP
3273+See
3274+Section\ \&17.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
3275+\fBmysqld\fR
3276+options relating to MySQL Cluster\&.
3277+.sp
3278+.RS 4
3279+.ie n \{\
3280+\h'-04'\(bu\h'+03'\c
3281+.\}
3282+.el \{\
3283+.sp -1
3284+.IP \(bu 2.3
3285+.\}
3286+.\" help option (MySQL Cluster programs)
3287+.\" usage option (MySQL Cluster programs)
3288+.\" -? option (MySQL Cluster programs)
3289+\fB\-\-help\fR,
3290+\fB\-\-usage\fR,
3291+\fB\-?\fR
3292+.TS
3293+allbox tab(:);
3294+l l s s
3295+l l s s
3296+l l s s.
3297+T{
3298+\fBCommand\-Line Format\fR
3299+T}:T{
3300+\-\-help
3301+T}
3302+T{
3303+T}:T{
3304+\-\-usage
3305+T}
3306+T{
3307+T}:T{
3308+\-?
3309+T}
3310+.TE
3311+.sp 1
3312+Prints a short list with descriptions of the available command options\&.
3313+.RE
3314+.sp
3315+.RS 4
3316+.ie n \{\
3317+\h'-04'\(bu\h'+03'\c
3318+.\}
3319+.el \{\
3320+.sp -1
3321+.IP \(bu 2.3
3322+.\}
3323+.\" character-sets-dir option (MySQL Cluster programs)
3324+.\" character-sets-dir option (MySQL Cluster programs)
3325+\fB\-\-character\-sets\-dir=\fR\fB\fIname\fR\fR
3326+.TS
3327+allbox tab(:);
3328+l l s s
3329+l l s s
3330+^ l l s
3331+^ l l s.
3332+T{
3333+\fBCommand\-Line Format\fR
3334+T}:T{
3335+\-\-character\-sets\-dir=path
3336+T}
3337+T{
3338+\ \&
3339+T}:T{
3340+\fBPermitted Values \fR
3341+T}
3342+:T{
3343+\fBType\fR
3344+T}:T{
3345+file name
3346+T}
3347+:T{
3348+\fBDefault\fR
3349+T}:T{
3350+T}
3351+.TE
3352+.sp 1
3353+Tells the program where to find character set information\&.
3354+.RE
3355+.sp
3356+.RS 4
3357+.ie n \{\
3358+\h'-04'\(bu\h'+03'\c
3359+.\}
3360+.el \{\
3361+.sp -1
3362+.IP \(bu 2.3
3363+.\}
3364+.\" ndb-connectstring option (MySQL Cluster programs)
3365+.\" connect-string option (MySQL Cluster programs)
3366+.\" -c option (MySQL Cluster programs)
3367+\fB\-\-ndb\-connectstring=\fR\fB\fIconnect_string\fR\fR,
3368+\fB\-\-connect\-string=\fR\fB\fIconnect_string\fR\fR,
3369+\fB\-c \fR\fB\fIconnect_string\fR\fR
3370+.TS
3371+allbox tab(:);
3372+l l s s
3373+l l s s
3374+l l s s
3375+l l s s
3376+^ l l s
3377+^ l l s.
3378+T{
3379+\fBCommand\-Line Format\fR
3380+T}:T{
3381+\-\-ndb\-connectstring=connectstring
3382+T}
3383+T{
3384+T}:T{
3385+\-\-connect\-string=connectstring
3386+T}
3387+T{
3388+T}:T{
3389+\-c
3390+T}
3391+T{
3392+\ \&
3393+T}:T{
3394+\fBPermitted Values \fR
3395+T}
3396+:T{
3397+\fBType\fR
3398+T}:T{
3399+string
3400+T}
3401+:T{
3402+\fBDefault\fR
3403+T}:T{
3404+localhost:1186
3405+T}
3406+.TE
3407+.sp 1
3408+This option takes a MySQL Cluster connectstring that specifies the management server for the application to connect to, as shown here:
3409+.sp
3410+.if n \{\
3411+.RS 4
3412+.\}
3413+.nf
3414+shell> \fBndbd \-\-ndb\-connectstring="nodeid=2;host=ndb_mgmd\&.mysql\&.com:1186"\fR
3415+.fi
3416+.if n \{\
3417+.RE
3418+.\}
3419+.sp
3420+For more information, see
3421+Section\ \&17.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq\&.
3422+.RE
3423+.sp
3424+.RS 4
3425+.ie n \{\
3426+\h'-04'\(bu\h'+03'\c
3427+.\}
3428+.el \{\
3429+.sp -1
3430+.IP \(bu 2.3
3431+.\}
3432+.\" core-file option (MySQL Cluster programs)
3433+\fB\-\-core\-file\fR
3434+.TS
3435+allbox tab(:);
3436+l l s s
3437+l l s s
3438+^ l l s
3439+^ l l s.
3440+T{
3441+\fBCommand\-Line Format\fR
3442+T}:T{
3443+\-\-core\-file
3444+T}
3445+T{
3446+\ \&
3447+T}:T{
3448+\fBPermitted Values \fR
3449+T}
3450+:T{
3451+\fBType\fR
3452+T}:T{
3453+boolean
3454+T}
3455+:T{
3456+\fBDefault\fR
3457+T}:T{
3458+FALSE
3459+T}
3460+.TE
3461+.sp 1
3462+Write a core file if the program dies\&. The name and location of the core file are system\-dependent\&. (For MySQL Cluster programs nodes running on Linux, the default location is the program\*(Aqs working directory\(emfor a data node, this is the node\*(Aqs
3463+DataDir\&.) For some systems, there may be restrictions or limitations; for example, it might be necessary to execute
3464+\fBulimit \-c unlimited\fR
3465+before starting the server\&. Consult your system documentation for detailed information\&.
3466+.sp
3467+If MySQL Cluster was built using the
3468+\fB\-\-debug\fR
3469+option for
3470+\fBconfigure\fR, then
3471+\fB\-\-core\-file\fR
3472+is enabled by default\&. For regular builds,
3473+\fB\-\-core\-file\fR
3474+is disabled by default\&.
3475+.RE
3476+.sp
3477+.RS 4
3478+.ie n \{\
3479+\h'-04'\(bu\h'+03'\c
3480+.\}
3481+.el \{\
3482+.sp -1
3483+.IP \(bu 2.3
3484+.\}
3485+.\" debug option (MySQL Cluster programs)
3486+\fB\-\-debug[=\fR\fB\fIoptions\fR\fR\fB]\fR
3487+.TS
3488+allbox tab(:);
3489+l l s s
3490+l l s s
3491+^ l l s
3492+^ l l s.
3493+T{
3494+\fBCommand\-Line Format\fR
3495+T}:T{
3496+\-\-debug=options
3497+T}
3498+T{
3499+\ \&
3500+T}:T{
3501+\fBPermitted Values \fR
3502+T}
3503+:T{
3504+\fBType\fR
3505+T}:T{
3506+string
3507+T}
3508+:T{
3509+\fBDefault\fR
3510+T}:T{
3511+d:t:O,/tmp/ndb_restore\&.trace
3512+T}
3513+.TE
3514+.sp 1
3515+This option can be used only for versions compiled with debugging enabled\&. It is used to enable output from debug calls in the same manner as for the
3516+\fBmysqld\fR
3517+process\&.
3518+.RE
3519+.sp
3520+.RS 4
3521+.ie n \{\
3522+\h'-04'\(bu\h'+03'\c
3523+.\}
3524+.el \{\
3525+.sp -1
3526+.IP \(bu 2.3
3527+.\}
3528+.\" ndb-mgmd-host option (MySQL Cluster programs)
3529+\fB\-\-ndb\-mgmd\-host=\fR\fB\fIhost\fR\fR\fB[:\fR\fB\fIport\fR\fR\fB]\fR
3530+.TS
3531+allbox tab(:);
3532+l l s s
3533+l l s s
3534+l l s s
3535+^ l l s
3536+^ l l s.
3537+T{
3538+\fBCommand\-Line Format\fR
3539+T}:T{
3540+\-\-ndb\-mgmd\-host=host[:port]
3541+T}
3542+T{
3543+\fBOption\-File Format\fR
3544+T}:T{
3545+ndb\-mgmd\-host
3546+T}
3547+T{
3548+\ \&
3549+T}:T{
3550+\fBPermitted Values \fR
3551+T}
3552+:T{
3553+\fBType\fR
3554+T}:T{
3555+string
3556+T}
3557+:T{
3558+\fBDefault\fR
3559+T}:T{
3560+localhost:1186
3561+T}
3562+.TE
3563+.sp 1
3564+Can be used to set the host and port number of a single management server for the program to connect to\&. If the program requires node IDs or references to multiple management servers (or both) in its connection information, use the
3565+\fB\-\-ndb\-connectstring\fR
3566+option instead\&.
3567+.RE
3568+.sp
3569+.RS 4
3570+.ie n \{\
3571+\h'-04'\(bu\h'+03'\c
3572+.\}
3573+.el \{\
3574+.sp -1
3575+.IP \(bu 2.3
3576+.\}
3577+.\" ndb-nodeid option (MySQL Cluster programs)
3578+\fB\-\-ndb\-nodeid=\fR\fB\fI#\fR\fR
3579+.TS
3580+allbox tab(:);
3581+l l s s
3582+l l s s
3583+^ l l s
3584+^ l l s.
3585+T{
3586+\fBCommand\-Line Format\fR
3587+T}:T{
3588+\-\-ndb\-nodeid=#
3589+T}
3590+T{
3591+\ \&
3592+T}:T{
3593+\fBPermitted Values \fR
3594+T}
3595+:T{
3596+\fBType\fR
3597+T}:T{
3598+numeric
3599+T}
3600+:T{
3601+\fBDefault\fR
3602+T}:T{
3603+0
3604+T}
3605+.TE
3606+.sp 1
3607+Sets this node\*(Aqs MySQL Cluster node ID\&.
3608+\fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See
3609+Section\ \&17.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
3610+.RE
3611+.sp
3612+.RS 4
3613+.ie n \{\
3614+\h'-04'\(bu\h'+03'\c
3615+.\}
3616+.el \{\
3617+.sp -1
3618+.IP \(bu 2.3
3619+.\}
3620+.\" ndb-optimized-node-selection option (MySQL Cluster)
3621+\fB\-\-ndb\-optimized\-node\-selection\fR
3622+.TS
3623+allbox tab(:);
3624+l l s s
3625+l l s s
3626+^ l l s
3627+^ l l s.
3628+T{
3629+\fBCommand\-Line Format\fR
3630+T}:T{
3631+\-\-ndb\-optimized\-node\-selection
3632+T}
3633+T{
3634+\ \&
3635+T}:T{
3636+\fBPermitted Values \fR
3637+T}
3638+:T{
3639+\fBType\fR
3640+T}:T{
3641+boolean
3642+T}
3643+:T{
3644+\fBDefault\fR
3645+T}:T{
3646+TRUE
3647+T}
3648+.TE
3649+.sp 1
3650+Optimize selection of nodes for transactions\&. Enabled by default\&.
3651+.RE
3652+.sp
3653+.RS 4
3654+.ie n \{\
3655+\h'-04'\(bu\h'+03'\c
3656+.\}
3657+.el \{\
3658+.sp -1
3659+.IP \(bu 2.3
3660+.\}
3661+.\" version option (MySQL Cluster programs)
3662+.\" -V option (MySQL Cluster programs)
3663+\fB\-\-version\fR,
3664+\fB\-V\fR
3665+.TS
3666+allbox tab(:);
3667+l l s s
3668+l l s s.
3669+T{
3670+\fBCommand\-Line Format\fR
3671+T}:T{
3672+\-\-version
3673+T}
3674+T{
3675+T}:T{
3676+\-V
3677+T}
3678+.TE
3679+.sp 1
3680+Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.
3681+.sp
3682+See
3683+Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
3684+.RE
3685+.SH "COPYRIGHT"
3686+.br
3687+.PP
3688+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3689+.PP
3690+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
3691+.PP
3692+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
3693+.PP
3694+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
3695+.PP
3696+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
3697+.PP
3698+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
3699+.PP
3700+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
3701+.PP
3702+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
3703+.PP
3704+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
3705+.PP
3706+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
3707+.PP
3708+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
3709+.PP
3710+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
3711+\m[blue]\fBMySQL Contact & Questions\fR\m[].
3712+.PP
3713+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
3714+Preface and Legal Notices.
3715+.PP
3716+For help with using MySQL, please visit either the
3717+\m[blue]\fBMySQL Forums\fR\m[]
3718+or
3719+\m[blue]\fBMySQL Mailing Lists\fR\m[]
3720+where you can discuss your issues with other MySQL users.
3721+.PP
3722+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
3723+\m[blue]\fBMySQL Documentation Library\fR\m[].
3724+.sp
3725+.SH "SEE ALSO"
3726+For more information, please refer to the MySQL Reference Manual,
3727+which may already be installed locally and which is also available
3728+online at http://dev.mysql.com/doc/.
3729+.SH AUTHOR
3730+Oracle Corporation (http://dev.mysql.com/).
3731
3732=== modified file 'Percona-Server/man/ndb_config.1'
3733--- Percona-Server/man/ndb_config.1 2013-05-10 09:39:17 +0000
3734+++ Percona-Server/man/ndb_config.1 2013-06-20 17:28:44 +0000
3735@@ -1,13 +1,22 @@
3736 '\" t
3737 .\" Title: \fBndb_config\fR
3738 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3739-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
3740-.\" Date: 03/02/2012
3741+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
3742+.\" Date: 05/21/2013
3743 .\" Manual: MySQL Database System
3744-.\" Source: MySQL 5.5
3745+.\" Source: MySQL 5.6
3746 .\" Language: English
3747 .\"
3748-.TH "\FBNDB_CONFIG\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
3749+.TH "\FBNDB_CONFIG\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
3750+.\" -----------------------------------------------------------------
3751+.\" * Define some portability stuff
3752+.\" -----------------------------------------------------------------
3753+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3754+.\" http://bugs.debian.org/507673
3755+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
3756+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3757+.ie \n(.g .ds Aq \(aq
3758+.el .ds Aq '
3759 .\" -----------------------------------------------------------------
3760 .\" * set default formatting
3761 .\" -----------------------------------------------------------------
3762@@ -52,8 +61,193 @@
3763 \fB\-\-connections\fR\&.
3764 .PP
3765 The following table includes options that are specific to
3766-\fBndb_config\fR\&. Additional descriptions follow the table\&. For options common to all MySQL Cluster programs, see
3767-Section\ \&16.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
3768+\fBndb_config\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
3769+\fBndb_config\fR), see
3770+Options Common to MySQL Cluster Programs(1)\&.
3771+.sp
3772+.it 1 an-trap
3773+.nr an-no-space-flag 1
3774+.nr an-break-flag 1
3775+.br
3776+.B Table\ \&17.14.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.3
3777+.TS
3778+allbox tab(:);
3779+lB lB lB.
3780+T{
3781+Format
3782+T}:T{
3783+Description
3784+T}:T{
3785+Added / Removed
3786+T}
3787+.T&
3788+l l l
3789+l l l
3790+l l l
3791+l l l
3792+l l l
3793+l l l
3794+l l l
3795+l l l
3796+l l l
3797+l l l
3798+l l l
3799+l l l
3800+l l l
3801+l l l
3802+l l l.
3803+T{
3804+.PP
3805+--nodes
3806+T}:T{
3807+Print node information (DB section) only\&.
3808+T}:T{
3809+.PP
3810+All MySQL 5\&.6 based releases
3811+T}
3812+T{
3813+.PP
3814+--connections
3815+T}:T{
3816+Print CONNECTIONS section information only\&. Cannot be used with \-\-nodes
3817+ or \-\-system option\&.
3818+T}:T{
3819+.PP
3820+All MySQL 5\&.6 based releases
3821+T}
3822+T{
3823+.PP
3824+--query=string,
3825+.PP
3826+-q
3827+T}:T{
3828+One or more query options (attributes)
3829+T}:T{
3830+.PP
3831+All MySQL 5\&.6 based releases
3832+T}
3833+T{
3834+.PP
3835+--host=name
3836+T}:T{
3837+Specify host
3838+T}:T{
3839+.PP
3840+All MySQL 5\&.6 based releases
3841+T}
3842+T{
3843+.PP
3844+--type=name
3845+T}:T{
3846+Specify node type
3847+T}:T{
3848+.PP
3849+All MySQL 5\&.6 based releases
3850+T}
3851+T{
3852+.PP
3853+--nodeid,
3854+.PP
3855+--id
3856+T}:T{
3857+Get configuration of node with this ID
3858+T}:T{
3859+.PP
3860+All MySQL 5\&.6 based releases
3861+T}
3862+T{
3863+.PP
3864+--fields=string,
3865+.PP
3866+-f
3867+T}:T{
3868+Field separator
3869+T}:T{
3870+.PP
3871+All MySQL 5\&.6 based releases
3872+T}
3873+T{
3874+.PP
3875+--rows=string,
3876+.PP
3877+-r
3878+T}:T{
3879+Row separator
3880+T}:T{
3881+.PP
3882+All MySQL 5\&.6 based releases
3883+T}
3884+T{
3885+.PP
3886+--config-file=path
3887+T}:T{
3888+Set the path to config\&.ini file
3889+T}:T{
3890+.PP
3891+All MySQL 5\&.6 based releases
3892+T}
3893+T{
3894+.PP
3895+--mycnf
3896+T}:T{
3897+Read configuration data from my\&.cnf file
3898+T}:T{
3899+.PP
3900+All MySQL 5\&.6 based releases
3901+T}
3902+T{
3903+.PP
3904+-c
3905+T}:T{
3906+Short form for \-\-ndb\-connectstring
3907+T}:T{
3908+.PP
3909+All MySQL 5\&.6 based releases
3910+T}
3911+T{
3912+.PP
3913+--configinfo
3914+T}:T{
3915+Dumps information about all NDB configuration parameters in text format
3916+ with default, maximum, and minimum values\&. Use with \-\-xml to
3917+ obtain XML output\&.
3918+T}:T{
3919+.PP
3920+All MySQL 5\&.6 based releases
3921+T}
3922+T{
3923+.PP
3924+--configinfo --xml
3925+T}:T{
3926+Use \-\-xml with \-\-configinfo to obtain a dump of all NDB configuration
3927+ parameters in XML format with default, maximum, and minimum
3928+ values\&.
3929+T}:T{
3930+.PP
3931+All MySQL 5\&.6 based releases
3932+T}
3933+T{
3934+.PP
3935+--system
3936+T}:T{
3937+Print SYSTEM section information only\&. Cannot be used with \-\-nodes or
3938+ \-\-connections option\&.
3939+T}:T{
3940+.PP
3941+All MySQL 5\&.6 based releases
3942+T}
3943+T{
3944+.PP
3945+--config_from_node=#
3946+T}:T{
3947+Obtain configuration data from the node having this ID (must be a data
3948+ node)\&.
3949+T}:T{
3950+.PP
3951+All MySQL 5\&.6 based releases
3952+T}
3953+.TE
3954+.sp 1
3955 .sp
3956 .RS 4
3957 .ie n \{\
3958@@ -138,7 +332,7 @@
3959 T}
3960 .TE
3961 .sp 1
3962-Obtain the cluster\'s configuration data from the data node that has this ID\&.
3963+Obtain the cluster\*(Aqs configuration data from the data node that has this ID\&.
3964 .sp
3965 If the node having this ID is not a data node,
3966 \fBndb_config\fR
3967@@ -189,9 +383,46 @@
3968 .\" ndb-connectstring option: ndb_config
3969 \fB\-\-ndb\-connectstring=\fR\fB\fIconnect_string\fR\fR,
3970 \fB\-c \fR\fB\fIconnect_string\fR\fR
3971-.sp
3972+.TS
3973+allbox tab(:);
3974+l l s s
3975+l l s s
3976+l l s s
3977+l l s s
3978+^ l l s
3979+^ l l s.
3980+T{
3981+\fBCommand\-Line Format\fR
3982+T}:T{
3983+\-\-ndb\-connectstring=connectstring
3984+T}
3985+T{
3986+T}:T{
3987+\-\-connect\-string=connectstring
3988+T}
3989+T{
3990+T}:T{
3991+\-c
3992+T}
3993+T{
3994+\ \&
3995+T}:T{
3996+\fBPermitted Values \fR
3997+T}
3998+:T{
3999+\fBType\fR
4000+T}:T{
4001+string
4002+T}
4003+:T{
4004+\fBDefault\fR
4005+T}:T{
4006+localhost:1186
4007+T}
4008+.TE
4009+.sp 1
4010 Specifies the connectstring to use in connecting to the management server\&. The format for the connectstring is the same as described in
4011-Section\ \&16.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq, and defaults to
4012+Section\ \&17.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq, and defaults to
4013 localhost:1186\&.
4014 .RE
4015 .sp
4016@@ -233,7 +464,7 @@
4017 T}
4018 .TE
4019 .sp 1
4020-Gives the path to the management server\'s configuration file (config\&.ini)\&. This may be a relative or absolute path\&. If the management node resides on a different host from the one on which
4021+Gives the path to the management server\*(Aqs configuration file (config\&.ini)\&. This may be a relative or absolute path\&. If the management node resides on a different host from the one on which
4022 \fBndb_config\fR
4023 is invoked, then an absolute path must be used\&.
4024 .RE
4025@@ -446,7 +677,34 @@
4026 .\" ndb_config: nodeid option
4027 .\" nodeid option: ndb_config
4028 \fB\-\-nodeid=\fR\fB\fInode_id\fR\fR
4029-.sp
4030+.TS
4031+allbox tab(:);
4032+l l s s
4033+l l s s
4034+^ l l s
4035+^ l l s.
4036+T{
4037+\fBCommand\-Line Format\fR
4038+T}:T{
4039+\-\-ndb\-nodeid=#
4040+T}
4041+T{
4042+\ \&
4043+T}:T{
4044+\fBPermitted Values \fR
4045+T}
4046+:T{
4047+\fBType\fR
4048+T}:T{
4049+numeric
4050+T}
4051+:T{
4052+\fBDefault\fR
4053+T}:T{
4054+0
4055+T}
4056+.TE
4057+.sp 1
4058 Either of these options can be used to specify the node ID of the node for which configuration information is to be obtained\&.
4059 \fB\-\-nodeid\fR
4060 is the preferred form\&.
4061@@ -619,7 +877,9 @@
4062 l l s s
4063 ^ l l s
4064 ^ l l s
4065-^ l l s.
4066+^ lt l s
4067+^ ^ l s
4068+^ ^ l s.
4069 T{
4070 \fBCommand\-Line Format\fR
4071 T}:T{
4072@@ -643,9 +903,11 @@
4073 \fBValid Values\fR
4074 T}:T{
4075 ndbd
4076-.sp
4077+T}
4078+::T{
4079 mysqld
4080-.sp
4081+T}
4082+::T{
4083 ndb_mgmd
4084 T}
4085 .TE
4086@@ -825,7 +1087,7 @@
4087 .sp -1
4088 .IP \(bu 2.3
4089 .\}
4090-A brief description of each parameter\'s purpose, effects, and usage
4091+A brief description of each parameter\*(Aqs purpose, effects, and usage
4092 .RE
4093 .sp
4094 .RS 4
4095@@ -849,29 +1111,29 @@
4096 .sp -1
4097 .IP \(bu 2.3
4098 .\}
4099-The parameter\'s data type or unit of measurement
4100-.RE
4101-.sp
4102-.RS 4
4103-.ie n \{\
4104-\h'-04'\(bu\h'+03'\c
4105-.\}
4106-.el \{\
4107-.sp -1
4108-.IP \(bu 2.3
4109-.\}
4110-Where applicable, the parameter\'s default, minimum, and maximum values
4111-.RE
4112-.sp
4113-.RS 4
4114-.ie n \{\
4115-\h'-04'\(bu\h'+03'\c
4116-.\}
4117-.el \{\
4118-.sp -1
4119-.IP \(bu 2.3
4120-.\}
4121-A brief description of the parameter\'s purpose, effects, and usage
4122+The parameter\*(Aqs data type or unit of measurement
4123+.RE
4124+.sp
4125+.RS 4
4126+.ie n \{\
4127+\h'-04'\(bu\h'+03'\c
4128+.\}
4129+.el \{\
4130+.sp -1
4131+.IP \(bu 2.3
4132+.\}
4133+Where applicable, the parameter\*(Aqs default, minimum, and maximum values
4134+.RE
4135+.sp
4136+.RS 4
4137+.ie n \{\
4138+\h'-04'\(bu\h'+03'\c
4139+.\}
4140+.el \{\
4141+.sp -1
4142+.IP \(bu 2.3
4143+.\}
4144+A brief description of the parameter\*(Aqs purpose, effects, and usage
4145 .RE
4146 .sp
4147 .RS 4
4148@@ -884,7 +1146,7 @@
4149 .\}
4150 MySQL Cluster release version and build information
4151 .RE
4152-.RS 4
4153+.sp
4154 By default, this output is in text format\&. Part of this output is shown here:
4155 .sp
4156 .if n \{\
4157@@ -959,7 +1221,7 @@
4158 .\}
4159 .nf
4160 shell> \fBndb_config \-\-configinfo \-\-xml\fR
4161-<configvariables protocolversion="1" ndbversionstring="mysql\-5\&.1\&.34 ndb\-7\&.0\&.6"
4162+<configvariables protocolversion="1" ndbversionstring="5\&.6\&.11\-ndb\-7\&.3\&.2"
4163 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
4164 ndbversionbuild="6">
4165 <section name="SYSTEM">
4166@@ -971,9 +1233,11 @@
4167 type="unsigned" default="0" min="0" max="4294967039"/>
4168 </section>
4169 <section name="NDBD">
4170- <param name="MaxNoOfSubscriptions" comment="Max no of subscriptions (default 0 == MaxNoOfTables)"
4171+ <param name="MaxNoOfSubscriptions"
4172+ comment="Max no of subscriptions (default 0 == MaxNoOfTables)"
4173 type="unsigned" default="0" min="0" max="4294967039"/>
4174- <param name="MaxNoOfSubscribers" comment="Max no of subscribers (default 0 == 2 * MaxNoOfTables)"
4175+ <param name="MaxNoOfSubscribers"
4176+ comment="Max no of subscribers (default 0 == 2 * MaxNoOfTables)"
4177 type="unsigned" default="0" min="0" max="4294967039"/>
4178 \&...
4179 </section>
4180@@ -1111,7 +1375,7 @@
4181 \fB\-\-configinfo\fR
4182 serves no purpose\&.
4183 .RE
4184- Examples
4185+ Examples
4186 .sp
4187 .RS 4
4188 .ie n \{\
4189@@ -1127,7 +1391,7 @@
4190 .RS 4
4191 .\}
4192 .nf
4193-shell> \fB\&./ndb_config \-\-query=id,type \-\-fields=\':\' \-\-rows=\'\en\'\fR
4194+shell> \fB\&./ndb_config \-\-query=id,type \-\-fields=\*(Aq:\*(Aq \-\-rows=\*(Aq\en\*(Aq\fR
4195 1:ndbd
4196 2:ndbd
4197 3:ndbd
4198@@ -1163,7 +1427,8 @@
4199 .RS 4
4200 .\}
4201 .nf
4202-shell> \fB\&./ndb_config \-\-config\-file=usr/local/mysql/cluster\-data/config\&.ini \-\-query=hostname,portnumber \-\-fields=: \-\-rows=, \-\-type=ndb_mgmd\fR
4203+shell> \fB\&./ndb_config \-\-config\-file=usr/local/mysql/cluster\-data/config\&.ini \e
4204+\-\-query=hostname,portnumber \-\-fields=: \-\-rows=, \-\-type=ndb_mgmd\fR
4205 192\&.168\&.0\&.179:1186
4206 .fi
4207 .if n \{\
4208@@ -1183,7 +1448,7 @@
4209 \fBndb_config\fR
4210 checks only data nodes (using the
4211 \fB\-\-type\fR
4212-option), and shows the values for each node\'s ID and host name, as well as the values set for its
4213+option), and shows the values for each node\*(Aqs ID and host name, as well as the values set for its
4214 DataMemory,
4215 IndexMemory, and
4216 DataDir
4217@@ -1193,7 +1458,7 @@
4218 .RS 4
4219 .\}
4220 .nf
4221-shell> \fB\&./ndb_config \-\-type=ndbd \-\-query=id,host,datamemory,indexmemory,datadir \-f \' : \' \-r \'\en\'\fR
4222+shell> \fB\&./ndb_config \-\-type=ndbd \-\-query=id,host,datamemory,indexmemory,datadir \-f \*(Aq : \*(Aq \-r \*(Aq\en\*(Aq\fR
4223 1 : 192\&.168\&.0\&.193 : 83886080 : 18874368 : /usr/local/mysql/cluster\-data
4224 2 : 192\&.168\&.0\&.112 : 83886080 : 18874368 : /usr/local/mysql/cluster\-data
4225 3 : 192\&.168\&.0\&.176 : 83886080 : 18874368 : /usr/local/mysql/cluster\-data
4226@@ -1226,7 +1491,7 @@
4227 .RS 4
4228 .\}
4229 .nf
4230-shell> \fB\&./ndb_config \-\-host=192\&.168\&.0\&.176 \-f : \-r \'\en\' \-q id,type\fR
4231+shell> \fB\&./ndb_config \-\-host=192\&.168\&.0\&.176 \-f : \-r \*(Aq\en\*(Aq \-q id,type\fR
4232 3:ndbd
4233 5:ndb_mgmd
4234 .fi
4235@@ -1247,13 +1512,42 @@
4236 .SH "COPYRIGHT"
4237 .br
4238 .PP
4239-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
4240-.PP
4241-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
4242-.PP
4243-This documentation 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.
4244-.PP
4245-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
4246+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
4247+.PP
4248+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
4249+.PP
4250+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
4251+.PP
4252+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
4253+.PP
4254+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
4255+.PP
4256+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
4257+.PP
4258+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
4259+.PP
4260+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
4261+.PP
4262+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
4263+.PP
4264+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
4265+.PP
4266+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
4267+.PP
4268+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
4269+\m[blue]\fBMySQL Contact & Questions\fR\m[].
4270+.PP
4271+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
4272+Preface and Legal Notices.
4273+.PP
4274+For help with using MySQL, please visit either the
4275+\m[blue]\fBMySQL Forums\fR\m[]
4276+or
4277+\m[blue]\fBMySQL Mailing Lists\fR\m[]
4278+where you can discuss your issues with other MySQL users.
4279+.PP
4280+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
4281+\m[blue]\fBMySQL Documentation Library\fR\m[].
4282 .sp
4283 .SH "SEE ALSO"
4284 For more information, please refer to the MySQL Reference Manual,
4285
4286=== modified file 'Percona-Server/man/ndb_cpcd.1'
4287--- Percona-Server/man/ndb_cpcd.1 2013-05-10 09:39:17 +0000
4288+++ Percona-Server/man/ndb_cpcd.1 2013-06-20 17:28:44 +0000
4289@@ -1,13 +1,22 @@
4290 '\" t
4291 .\" Title: \fBndb_cpcd\fR
4292 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4293-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
4294-.\" Date: 03/02/2012
4295+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
4296+.\" Date: 05/21/2013
4297 .\" Manual: MySQL Database System
4298-.\" Source: MySQL 5.5
4299+.\" Source: MySQL 5.6
4300 .\" Language: English
4301 .\"
4302-.TH "\FBNDB_CPCD\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
4303+.TH "\FBNDB_CPCD\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
4304+.\" -----------------------------------------------------------------
4305+.\" * Define some portability stuff
4306+.\" -----------------------------------------------------------------
4307+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4308+.\" http://bugs.debian.org/507673
4309+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
4310+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4311+.ie \n(.g .ds Aq \(aq
4312+.el .ds Aq '
4313 .\" -----------------------------------------------------------------
4314 .\" * set default formatting
4315 .\" -----------------------------------------------------------------
4316@@ -26,17 +35,46 @@
4317 \fBndb_cpcd \fR\fB\fIoptions\fR\fR
4318 .SH "DESCRIPTION"
4319 .PP
4320-A utility having this name was formerly part of an internal automated test framework used in testing and debugging MySQL Cluster\&. It was deprecated in MySQL Cluster NDB 7\&.0, and removed from MySQL Cluster distributions provided by Oracle beginning with MySQL Cluster NDB 7\&.2\&.1\&.
4321+A utility having this name was formerly part of an internal automated test framework used in testing and debugging MySQL Cluster\&. It is no longer included in MySQL Cluster distributions provided by Oracle\&.
4322 .SH "COPYRIGHT"
4323 .br
4324 .PP
4325-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
4326-.PP
4327-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
4328-.PP
4329-This documentation 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.
4330-.PP
4331-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
4332+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
4333+.PP
4334+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
4335+.PP
4336+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
4337+.PP
4338+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
4339+.PP
4340+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
4341+.PP
4342+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
4343+.PP
4344+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
4345+.PP
4346+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
4347+.PP
4348+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
4349+.PP
4350+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
4351+.PP
4352+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
4353+.PP
4354+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
4355+\m[blue]\fBMySQL Contact & Questions\fR\m[].
4356+.PP
4357+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
4358+Preface and Legal Notices.
4359+.PP
4360+For help with using MySQL, please visit either the
4361+\m[blue]\fBMySQL Forums\fR\m[]
4362+or
4363+\m[blue]\fBMySQL Mailing Lists\fR\m[]
4364+where you can discuss your issues with other MySQL users.
4365+.PP
4366+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
4367+\m[blue]\fBMySQL Documentation Library\fR\m[].
4368 .sp
4369 .SH "SEE ALSO"
4370 For more information, please refer to the MySQL Reference Manual,
4371
4372=== modified file 'Percona-Server/man/ndb_delete_all.1'
4373--- Percona-Server/man/ndb_delete_all.1 2013-05-10 09:39:17 +0000
4374+++ Percona-Server/man/ndb_delete_all.1 2013-06-20 17:28:44 +0000
4375@@ -1,13 +1,22 @@
4376 '\" t
4377 .\" Title: \fBndb_delete_all\fR
4378 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4379-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
4380-.\" Date: 03/02/2012
4381+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
4382+.\" Date: 05/21/2013
4383 .\" Manual: MySQL Database System
4384-.\" Source: MySQL 5.5
4385+.\" Source: MySQL 5.6
4386 .\" Language: English
4387 .\"
4388-.TH "\FBNDB_DELETE_ALL\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
4389+.TH "\FBNDB_DELETE_ALL\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
4390+.\" -----------------------------------------------------------------
4391+.\" * Define some portability stuff
4392+.\" -----------------------------------------------------------------
4393+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4394+.\" http://bugs.debian.org/507673
4395+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
4396+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4397+.ie \n(.g .ds Aq \(aq
4398+.el .ds Aq '
4399 .\" -----------------------------------------------------------------
4400 .\" * set default formatting
4401 .\" -----------------------------------------------------------------
4402@@ -33,7 +42,7 @@
4403 DELETE
4404 or even
4405 TRUNCATE TABLE\&.
4406- Usage
4407+ Usage
4408 .sp
4409 .if n \{\
4410 .RS 4
4411@@ -51,7 +60,74 @@
4412 \fIdb_name\fR\&. It is exactly equivalent to executing
4413 TRUNCATE \fIdb_name\fR\&.\fItbl_name\fR
4414 in MySQL\&.
4415- Additional Options
4416+.PP
4417+The following table includes options that are specific to
4418+\fBndb_delete_all\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
4419+\fBndb_delete_all\fR), see
4420+Options Common to MySQL Cluster Programs(1)\&.
4421+.sp
4422+.it 1 an-trap
4423+.nr an-no-space-flag 1
4424+.nr an-break-flag 1
4425+.br
4426+.B Table\ \&17.15.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.3
4427+.TS
4428+allbox tab(:);
4429+lB lB lB.
4430+T{
4431+Format
4432+T}:T{
4433+Description
4434+T}:T{
4435+Added / Removed
4436+T}
4437+.T&
4438+l l l
4439+l l l
4440+l l l
4441+l l l.
4442+T{
4443+.PP
4444+\-\-database=dbname,
4445+.PP
4446+\-d
4447+T}:T{
4448+Name of the database in which the table is found
4449+T}:T{
4450+.PP
4451+All MySQL 5\&.6 based releases
4452+T}
4453+T{
4454+.PP
4455+--transactional,
4456+.PP
4457+-t
4458+T}:T{
4459+Perform the delete in a single transaction (may run out of operations)
4460+T}:T{
4461+.PP
4462+All MySQL 5\&.6 based releases
4463+T}
4464+T{
4465+.PP
4466+\-\-tupscan
4467+T}:T{
4468+Run tup scan
4469+T}:T{
4470+.PP
4471+All MySQL 5\&.6 based releases
4472+T}
4473+T{
4474+.PP
4475+\-\-diskscan
4476+T}:T{
4477+Run disk scan
4478+T}:T{
4479+.PP
4480+All MySQL 5\&.6 based releases
4481+T}
4482+.TE
4483+.sp 1
4484 .sp
4485 .RS 4
4486 .ie n \{\
4487@@ -86,13 +162,42 @@
4488 .SH "COPYRIGHT"
4489 .br
4490 .PP
4491-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
4492-.PP
4493-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
4494-.PP
4495-This documentation 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.
4496-.PP
4497-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
4498+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
4499+.PP
4500+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
4501+.PP
4502+The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
4503+.PP
4504+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
4505+.PP
4506+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
4507+.PP
4508+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
4509+.PP
4510+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. MySQL is a trademark of Oracle Corporation and/or its affiliates, and shall not be used without Oracle's express written authorization. Other names may be trademarks of their respective owners.
4511+.PP
4512+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
4513+.PP
4514+This document in any form, software or printed matter, contains proprietary information that is the exclusive property of Oracle. Your access to and use of this material is subject to the terms and conditions of your Oracle Software License and Service Agreement, which has been executed and with which you agree to comply. This document and information contained herein may not be disclosed, copied, reproduced, or distributed to anyone outside Oracle without prior written consent of Oracle or as specifically provided below. This document is not part of your license agreement nor can it be incorporated into any contractual agreement with Oracle or its subsidiaries or affiliates.
4515+.PP
4516+This documentation is NOT distributed under a GPL license. Use of this documentation is subject to the following terms:
4517+.PP
4518+You may create a printed copy of this documentation solely for your own personal use. Conversion to other formats is allowed as long as the actual content is not altered or edited in any way. You shall not publish or distribute this documentation in any form or on any media, except if you distribute the documentation in a manner similar to how Oracle disseminates it (that is, electronically for download on a Web site with the software) or on a CD-ROM or similar medium, provided however that the documentation is disseminated together with the software on the same medium. Any other use, such as any dissemination of printed copies or use of this documentation, in whole or in part, in another publication, requires the prior written consent from an authorized representative of Oracle. Oracle and/or its affiliates reserve any and all rights to this documentation not expressly granted above.
4519+.PP
4520+For more information on the terms of this license, or for details on how the MySQL documentation is built and produced, please visit
4521+\m[blue]\fBMySQL Contact & Questions\fR\m[].
4522+.PP
4523+For additional licensing information, including licenses for third-party libraries used by MySQL products, see
4524+Preface and Legal Notices.
4525+.PP
4526+For help with using MySQL, please visit either the
4527+\m[blue]\fBMySQL Forums\fR\m[]
4528+or
4529+\m[blue]\fBMySQL Mailing Lists\fR\m[]
4530+where you can discuss your issues with other MySQL users.
4531+.PP
4532+For additional documentation on MySQL products, including translations of the documentation into other languages, and downloadable versions in variety of formats, including HTML and PDF formats, see the
4533+\m[blue]\fBMySQL Documentation Library\fR\m[].
4534 .sp
4535 .SH "SEE ALSO"
4536 For more information, please refer to the MySQL Reference Manual,
4537
4538=== modified file 'Percona-Server/man/ndb_desc.1'
4539--- Percona-Server/man/ndb_desc.1 2013-05-10 09:39:17 +0000
4540+++ Percona-Server/man/ndb_desc.1 2013-06-20 17:28:44 +0000
4541@@ -1,13 +1,22 @@
4542 '\" t
4543 .\" Title: \fBndb_desc\fR
4544 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4545-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
4546-.\" Date: 03/02/2012
4547+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
4548+.\" Date: 05/21/2013
4549 .\" Manual: MySQL Database System
4550-.\" Source: MySQL 5.5
4551+.\" Source: MySQL 5.6
4552 .\" Language: English
4553 .\"
4554-.TH "\FBNDB_DESC\FR" "1" "03/02/2012" "MySQL 5\&.5" "MySQL Database System"
4555+.TH "\FBNDB_DESC\FR" "1" "05/21/2013" "MySQL 5\&.6" "MySQL Database System"
4556+.\" -----------------------------------------------------------------
4557+.\" * Define some portability stuff
4558+.\" -----------------------------------------------------------------
4559+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4560+.\" http://bugs.debian.org/507673
4561+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
4562+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4563+.ie \n(.g .ds Aq \(aq
4564+.el .ds Aq '
4565 .\" -----------------------------------------------------------------
4566 .\" * set default formatting
4567 .\" -----------------------------------------------------------------
4568@@ -30,20 +39,21 @@
4569 provides a detailed description of one or more
4570 NDB
4571 tables\&.
4572- Usage
4573+ Usage
4574 .sp
4575 .if n \{\
4576 .RS 4
4577 .\}
4578 .nf
4579 ndb_desc \-c \fIconnect_string\fR \fItbl_name\fR \-d \fIdb_name\fR [\-p]
4580+ndb_desc \-c \fIconnect_string\fR \fIindex_name\fR \-d \fIdb_name\fR \-t \fItbl_name\fR
4581 .fi
4582 .if n \{\
4583 .RE
4584 .\}
4585 .sp
4586- Sample Output
4587- .PP
4588+ Sample Output
4589+.PP
4590 MySQL table creation and population statements:
4591 .sp
4592 .if n \{\
4593@@ -60,9 +70,9 @@
4594 UNIQUE KEY uk (name)
4595 ) ENGINE=NDB;
4596 INSERT INTO fish VALUES
4597- (\'\',\'guppy\', 35, 2), (\'\',\'tuna\', 2500, 150000),
4598- (\'\',\'shark\', 3000, 110000), (\'\',\'manta ray\', 1500, 50000),
4599- (\'\',\'grouper\', 900, 125000), (\'\',\'puffer\', 250, 2500);
4600+ (\*(Aq\*(Aq,\*(Aqguppy\*(Aq, 35, 2), (\*(Aq\*(Aq,\*(Aqtuna\*(Aq, 2500, 150000),
4601+ (\*(Aq\*(Aq,\*(Aqshark\*(Aq, 3000, 110000), (\*(Aq\*(Aq,\*(Aqmanta ray\*(Aq, 1500, 50000),
4602+ (\*(Aq\*(Aq,\*(Aqgrouper\*(Aq, 900, 125000), (\*(Aq\*(Aq,\*(Aqpuffer\*(Aq, 250, 2500);
4603 .fi
4604 .if n \{\
4605 .RE
4606@@ -103,9 +113,12 @@
4607 uk$unique(name) \- UniqueHashIndex
4608 uk(name) \- OrderedIndex
4609 \-\- Per partition info \-\-
4610-Partition Row count Commit count Frag fixed memory Frag varsized memory Extent_space Free extent_space
4611-0 2 2 32768 32768 0 0
4612-1 4 4 32768 32768 0 0
4613+Partition Row count Commit count Frag fixed memory \&.\&.\&.
4614+0 2 2 32768 \&.\&.\&.
4615+1 4 4 32768 \&.\&.\&.
4616+\&.\&.\&. Frag varsized memory Extent_space Free extent_space
4617+\&.\&.\&. 32768 0 0
4618+\&.\&.\&. 32768 0 0
4619 NDBT_ProgramExit: 0 \- OK
4620 .fi
4621 .if n \{\
4622@@ -116,6 +129,66 @@
4623 \fBndb_desc\fR
4624 by using their names, separated by spaces\&. All of the tables must be in the same database\&.
4625 .PP
4626+You can obtain additional information about a specific index using the
4627+\fB\-\-table\fR
4628+(short form:
4629+\fB\-t\fR) option supplying the name of the index as the first argument to
4630+\fBndb_desc\fR, as shown here:
4631+.sp
4632+.if n \{\
4633+.RS 4
4634+.\}
4635+.nf
4636+shell> \fB\&./ndb_desc uk \-d test \-t fish\fR
4637+\-\- uk \-\-
4638+Version: 3
4639+Base table: fish
4640+Number of attributes: 1
4641+Logging: 0
4642+Index type: OrderedIndex
4643+Index status: Retrieved
4644+\-\- Attributes \-\-
4645+name Varchar(20;latin1_swedish_ci) NOT NULL AT=SHORT_VAR ST=MEMORY
4646+\-\- IndexTable 10/uk \-\-
4647+Version: 3
4648+Fragment type: FragUndefined
4649+K Value: 6
4650+Min load factor: 78
4651+Max load factor: 80
4652+Temporary table: yes
4653+Number of attributes: 2
4654+Number of primary keys: 1
4655+Length of frm data: 0
4656+Row Checksum: 1
4657+Row GCI: 1
4658+SingleUserMode: 2
4659+ForceVarPart: 0
4660+FragmentCount: 4
4661+ExtraRowGciBits: 0
4662+ExtraRowAuthorBits: 0
4663+TableStatus: Retrieved
4664+\-\- Attributes \-\-
4665+name Varchar(20;latin1_swedish_ci) NOT NULL AT=SHORT_VAR ST=MEMORY
4666+NDB$TNODE Unsigned [64] PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
4667+\-\- Indexes \-\-
4668+PRIMARY KEY(NDB$TNODE) \- UniqueHashIndex
4669+NDBT_ProgramExit: 0 \- OK
4670+.fi
4671+.if n \{\
4672+.RE
4673+.\}
4674+.PP
4675+When an index is specified in this way, the
4676+\fB\-\-extra\-partition\-info\fR
4677+and
4678+\fB\-\-extra\-node\-info\fR
4679+options have no effect\&.
4680+.PP
4681+The
4682+Version
4683+column in the output contains the table\*(Aqs schema object version\&. For information about interpreting this value, see
4684+\m[blue]\fBNDB Schema Object Versions\fR\m[]\&\s-2\u[1]\d\s+2\&.
4685+.PP
4686 The
4687 Extent_space
4688 and
4689@@ -132,21 +205,21 @@
4690 .\}
4691 .nf
4692 CREATE LOGFILE GROUP lg_1
4693- ADD UNDOFILE \'undo_1\&.log\'
4694+ ADD UNDOFILE \*(Aqundo_1\&.log\*(Aq
4695 INITIAL_SIZE 16M
4696 UNDO_BUFFER_SIZE 2M
4697 ENGINE NDB;
4698 ALTER LOGFILE GROUP lg_1
4699- ADD UNDOFILE \'undo_2\&.log\'
4700+ ADD UNDOFILE \*(Aqundo_2\&.log\*(Aq
4701 INITIAL_SIZE 12M
4702 ENGINE NDB;
4703 CREATE TABLESPACE ts_1
4704- ADD DATAFILE \'data_1\&.dat\'
4705+ ADD DATAFILE \*(Aqdata_1\&.dat\*(Aq
4706 USE LOGFILE GROUP lg_1
4707 INITIAL_SIZE 32M
4708 ENGINE NDB;
4709 ALTER TABLESPACE ts_1
4710- ADD DATAFILE \'data_2\&.dat\'
4711+ ADD DATAFILE \*(Aqdata_2\&.dat\*(Aq
4712 INITIAL_SIZE 48M
4713 ENGINE NDB;
4714 .fi
4715@@ -155,9 +228,9 @@
4716 .\}
4717 .PP
4718 (For more information on the statements just shown and the objects created by them, see
4719-Section\ \&16.5.11.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
4720-Section\ \&12.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
4721-Section\ \&12.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
4722+Section\ \&17.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
4723+Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
4724+Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
4725 .PP
4726 Now we can create and populate a version of the
4727 fish
4728@@ -177,9 +250,9 @@
4729 ) TABLESPACE ts_1 STORAGE DISK
4730 ENGINE=NDB;
4731 INSERT INTO fish VALUES
4732- (\'\',\'guppy\', 35, 2), (\'\',\'tuna\', 2500, 150000),
4733- (\'\',\'shark\', 3000, 110000), (\'\',\'manta ray\', 1500, 50000),
4734- (\'\',\'grouper\', 900, 125000), (\'\',\'puffer\', 250, 2500);
4735+ (\*(Aq\*(Aq,\*(Aqguppy\*(Aq, 35, 2), (\*(Aq\*(Aq,\*(Aqtuna\*(Aq, 2500, 150000),
4736+ (\*(Aq\*(Aq,\*(Aqshark\*(Aq, 3000, 110000), (\*(Aq\*(Aq,\*(Aqmanta ray\*(Aq, 1500, 50000),
4737+ (\*(Aq\*(Aq,\*(Aqgrouper\*(Aq, 900, 125000), (\*(Aq\*(Aq,\*(Aqpuffer\*(Aq, 250, 2500);
4738 .fi
4739 .if n \{\
4740 .RE
4741@@ -221,39 +294,136 @@
4742 uk$unique(name) \- UniqueHashIndex
4743 uk(name) \- OrderedIndex
4744 \-\- Per partition info \-\-
4745-Partition Row count Commit count Frag fixed memory Frag varsized memory Extent_space Free extent_space
4746-0 2 2 32768 32768 1048576 1044440
4747-1 4 4 32768 32768 1048576 1044400
4748+Partition Row count Commit count Frag fixed memory \&.\&.\&.
4749+0 2 2 32768 \&.\&.\&.
4750+1 4 4 32768 \&.\&.\&.
4751+\&.\&.\&. Frag varsized memory Extent_space Free extent_space
4752+\&.\&.\&. 32768 0 0
4753+\&.\&.\&. 32768 0 0
4754 NDBT_ProgramExit: 0 \- OK
4755 .fi
4756 .if n \{\
4757 .RE
4758 .\}
4759 .PP
4760-This means that 1048576 bytes are allocated from the tablespace for this table on each partition, of which 1044440 bytes remain free for additional storage\&. In other words, 1048576 \- 1044440 = 4136 bytes per partition is currently being used to store the data from this table\'s disk\-based columns\&. The number of bytes shown as
4761+This means that 1048576 bytes are allocated from the tablespace for this table on each partition, of which 1044440 bytes remain free for additional storage\&. In other words, 1048576 \- 1044440 = 4136 bytes per partition is currently being used to store the data from this table\*(Aqs disk\-based columns\&. The number of bytes shown as
4762 Free extent_space
4763 is available for storing on\-disk column data from the
4764 fish
4765 table only; for this reason, it is not visible when selecting from the
4766 INFORMATION_SCHEMA\&.FILES
4767 table\&.
4768- Additional Options
4769-.sp
4770-.RS 4
4771-.ie n \{\
4772-\h'-04'\(bu\h'+03'\c
4773-.\}
4774-.el \{\
4775-.sp -1
4776-.IP \(bu 2.3
4777-.\}
4778-.\" ndb_desc: extra-partition-info option
4779-.\" extra-partition-info option: ndb_desc
4780-\fB\-\-extra\-partition\-info\fR,
4781-\fB\-p\fR
4782-.sp
4783-Print additional information about the table\'s partitions\&.
4784-.RE
4785+.PP
4786+The following table includes options that are specific to
4787+\fBndb_desc\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
4788+\fBndb_desc\fR), see
4789+Options Common to MySQL Cluster Programs(1)\&.
4790+.sp
4791+.it 1 an-trap
4792+.nr an-no-space-flag 1
4793+.nr an-break-flag 1
4794+.br
4795+.B Table\ \&17.16.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.3
4796+.TS
4797+allbox tab(:);
4798+lB lB lB.
4799+T{
4800+Format
4801+T}:T{
4802+Description
4803+T}:T{
4804+Added / Removed
4805+T}
4806+.T&
4807+l l l
4808+l l l
4809+l l l
4810+l l l
4811+l l l
4812+l l l
4813+l l l.
4814+T{
4815+.PP
4816+--blob-info,
4817+.PP
4818+-b
4819+T}:T{
4820+Include partition information for BLOB tables in output\&. Requires that
4821+ the \-p option also be used
4822+T}:T{
4823+.PP
4824+All MySQL 5\&.6 based releases
4825+T}
4826+T{
4827+.PP
4828+--database=dbname,
4829+.PP
4830+-d
4831+T}:T{
4832+Name of database containing table
4833+T}:T{
4834+.PP
4835+All MySQL 5\&.6 based releases
4836+T}
4837+T{
4838+.PP
4839+--extra-node-info,
4840+.PP
4841+-n
4842+T}:T{
4843+Include partition\-to\-data\-node mappings in output\&. Requires that the \-p
4844+ option also be used
4845+T}:T{
4846+.PP
4847+All MySQL 5\&.6 based releases
4848+T}
4849+T{
4850+.PP
4851+--extra-partition-info,
4852+.PP
4853+-p
4854+T}:T{
4855+Display information about partitions
4856+T}:T{
4857+.PP
4858+All MySQL 5\&.6 based releases
4859+T}
4860+T{
4861+.PP
4862+--retries=#,
4863+.PP
4864+-r
4865+T}:T{
4866+Number of times to retry the connection (once per second)
4867+T}:T{
4868+.PP
4869+All MySQL 5\&.6 based releases
4870+T}
4871+T{
4872+.PP
4873+--table=tbl_name,
4874+.PP
4875+-t
4876+T}:T{
4877+Specify the table in which to find an index\&. When this option is used,
4878+ \-p and \-n have no effect and are ignored\&.
4879+T}:T{
4880+.PP
4881+All MySQL 5\&.6 based releases
4882+T}
4883+T{
4884+.PP
4885+--unqualified,
4886+.PP
4887+-u
4888+T}:T{
4889+Use unqualified table names
4890+T}:T{
4891+.PP
4892+All MySQL 5\&.6 based releases
4893+T}
4894+.TE
4895+.sp 1
4896 .sp
4897 .RS 4
4898 .ie n \{\
4899@@ -287,6 +457,22 @@
4900 .sp -1
4901 .IP \(bu 2.3
4902 .\}
4903+.\" ndb_desc: database option
4904+.\" database option: ndb_desc
4905+\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
4906+\fB\-d\fR
4907+.sp
4908+Specify the database in which the table should be found\&.
4909+.RE
4910+.sp
4911+.RS 4
4912+.ie n \{\
4913+\h'-04'\(bu\h'+03'\c
4914+.\}
4915+.el \{\
4916+.sp -1
4917+.IP \(bu 2.3
4918+.\}
4919 .\" ndb_desc: extra-node-info option
4920 .\" extra-node-info option: ndb_desc
4921 \fB\-\-extra\-node\-info\fR,
4922@@ -298,17 +484,116 @@
4923 \fB\-\-extra\-partition\-info\fR
4924 (\fB\-p\fR) option\&.
4925 .RE
4926+.sp
4927+.RS 4
4928+.ie n \{\
4929+\h'-04'\(bu\h'+03'\c
4930+.\}
4931+.el \{\
4932+.sp -1
4933+.IP \(bu 2.3
4934+.\}
4935+.\" ndb_desc: extra-partition-info option
4936+.\" extra-partition-info option: ndb_desc
4937+\fB\-\-extra\-partition\-info\fR,
4938+\fB\-p\fR
4939+.sp
4940+Print additional information about the table\*(Aqs partitions\&.
4941+.RE
4942+.sp
4943+.RS 4
4944+.ie n \{\
4945+\h'-04'\(bu\h'+03'\c
4946+.\}
4947+.el \{\
4948+.sp -1
4949+.IP \(bu 2.3
4950+.\}
4951+.\" ndb_desc: retries option
4952+.\" retries option: ndb_desc
4953+\fB\-\-retries=\fR\fB\fI#\fR\fR,
4954+\fB\-r\fR
4955+.sp
4956+Try to connect this many times before giving up\&. One connect attempt is made per second\&.
4957+.RE
4958+.sp
4959+.RS 4
4960+.ie n \{\
4961+\h'-04'\(bu\h'+03'\c
4962+.\}
4963+.el \{\
4964+.sp -1
4965+.IP \(bu 2.3
4966+.\}
4967+.\" ndb_desc: table option
4968+.\" table option: ndb_desc
4969+\fB\-\-table=\fR\fB\fItbl_name\fR\fR,
4970+\fB\-t\fR
4971+.sp
4972+Specify the table in which to look for an index\&.
4973+.RE
4974+.sp
4975+.RS 4
4976+.ie n \{\
4977+\h'-04'\(bu\h'+03'\c
4978+.\}
4979+.el \{\
4980+.sp -1
4981+.IP \(bu 2.3
4982+.\}
4983+.\" ndb_desc: unqualified option
4984+.\" unqualified option: ndb_desc
4985+\fB\-\-unqualified\fR,
4986+\fB\-u\fR
4987+.sp
4988+Use unqualified table names\&.
4989+.RE
4990 .SH "COPYRIGHT"
4991 .br
4992 .PP
4993-Copyright \(co 1997, 2012, Oracle and/or its affiliates. All rights reserved.
4994-.PP
4995-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
4996-.PP
4997-This documentation 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.
4998-.PP
4999-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
5000+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches