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

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 579
Merged at revision: 580
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.6.17
Merge into: lp:percona-server/5.6
Diff against target: 52963 lines (+16518/-4673)
1243 files modified
CMakeLists.txt (+8/-7)
VERSION (+2/-2)
client/mysql.cc (+4/-4)
client/mysql_config_editor.cc (+15/-9)
client/mysql_upgrade.c (+1/-0)
client/mysqladmin.cc (+7/-2)
client/mysqlbinlog.cc (+7/-1)
client/mysqlcheck.c (+7/-2)
client/mysqldump.c (+8/-2)
client/mysqlimport.c (+7/-2)
client/mysqlshow.c (+7/-1)
client/mysqlslap.c (+7/-1)
cmake/libutils.cmake (+1/-1)
extra/yassl/README (+30/-1)
extra/yassl/certs/ca-cert.pem (+73/-42)
extra/yassl/certs/ca-key.pem (+25/-7)
extra/yassl/certs/client-cert.pem (+69/-37)
extra/yassl/certs/client-key.pem (+25/-7)
extra/yassl/certs/client-keyEnc.pem (+25/-7)
extra/yassl/certs/dsa-cert.pem (+20/-68)
extra/yassl/certs/server-cert.pem (+148/-30)
extra/yassl/certs/server-key.pem (+25/-7)
extra/yassl/certs/server-keyEnc.pem (+25/-7)
extra/yassl/include/cert_wrapper.hpp (+5/-2)
extra/yassl/include/openssl/crypto.h (+1/-0)
extra/yassl/include/openssl/des.h (+1/-0)
extra/yassl/include/openssl/des_old.h (+1/-0)
extra/yassl/include/openssl/engine.h (+1/-0)
extra/yassl/include/openssl/err.h (+1/-0)
extra/yassl/include/openssl/evp.h (+1/-0)
extra/yassl/include/openssl/generate_prefix_files.pl (+1/-0)
extra/yassl/include/openssl/hmac.h (+1/-0)
extra/yassl/include/openssl/lhash.h (+1/-0)
extra/yassl/include/openssl/md4.h (+1/-0)
extra/yassl/include/openssl/md5.h (+1/-0)
extra/yassl/include/openssl/objects.h (+1/-0)
extra/yassl/include/openssl/opensslv.h (+1/-0)
extra/yassl/include/openssl/pem.h (+1/-0)
extra/yassl/include/openssl/pkcs12.h (+1/-0)
extra/yassl/include/openssl/prefix_crypto.h (+1/-0)
extra/yassl/include/openssl/rand.h (+1/-0)
extra/yassl/include/openssl/rsa.h (+1/-0)
extra/yassl/include/openssl/sha.h (+1/-0)
extra/yassl/include/openssl/ssl.h (+2/-2)
extra/yassl/include/openssl/x509.h (+1/-0)
extra/yassl/include/openssl/x509v3.h (+1/-0)
extra/yassl/src/cert_wrapper.cpp (+12/-2)
extra/yassl/src/crypto_wrapper.cpp (+2/-2)
extra/yassl/src/handshake.cpp (+3/-1)
extra/yassl/src/yassl_imp.cpp (+28/-10)
extra/yassl/taocrypt/include/integer.hpp (+8/-0)
extra/yassl/taocrypt/include/misc.hpp (+8/-1)
extra/yassl/taocrypt/src/aes.cpp (+54/-28)
extra/yassl/taocrypt/src/arc4.cpp (+29/-20)
extra/yassl/taocrypt/src/blowfish.cpp (+25/-18)
extra/yassl/taocrypt/src/des.cpp (+27/-25)
extra/yassl/taocrypt/src/integer.cpp (+4/-2)
extra/yassl/taocrypt/src/md5.cpp (+29/-21)
extra/yassl/taocrypt/src/rabbit.cpp (+10/-5)
extra/yassl/taocrypt/src/ripemd.cpp (+28/-19)
extra/yassl/taocrypt/src/sha.cpp (+31/-20)
extra/yassl/taocrypt/src/twofish.cpp (+29/-20)
extra/yassl/taocrypt/test/test.cpp (+7/-7)
include/atomic/nolock.h (+2/-2)
include/my_aes.h (+103/-41)
include/my_base.h (+5/-2)
include/my_rnd.h (+1/-0)
include/mysql_version.h.in (+4/-3)
include/queues.h (+1/-0)
include/t_ctype.h (+1/-0)
libmysql/libmysql.c (+21/-1)
libmysqld/CMakeLists.txt (+35/-1)
libmysqld/examples/test-run (+1/-0)
man/comp_err.1 (+4/-4)
man/innochecksum.1 (+2/-2)
man/msql2mysql.1 (+18/-2)
man/my_print_defaults.1 (+12/-5)
man/myisam_ftdump.1 (+2/-2)
man/myisamchk.1 (+4/-4)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+4/-4)
man/mysql-stress-test.pl.1 (+2/-2)
man/mysql-test-run.pl.1 (+2/-2)
man/mysql.1 (+34/-8)
man/mysql.server.1 (+3/-3)
man/mysql_client_test.1 (+2/-2)
man/mysql_config.1 (+2/-2)
man/mysql_config_editor.1 (+4/-4)
man/mysql_convert_table_format.1 (+19/-3)
man/mysql_find_rows.1 (+18/-2)
man/mysql_fix_extensions.1 (+18/-2)
man/mysql_install_db.1 (+3/-3)
man/mysql_plugin.1 (+2/-2)
man/mysql_secure_installation.1 (+3/-3)
man/mysql_setpermission.1 (+19/-3)
man/mysql_tzinfo_to_sql.1 (+2/-2)
man/mysql_upgrade.1 (+24/-4)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+18/-2)
man/mysqladmin.1 (+64/-6)
man/mysqlbinlog.1 (+79/-5)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+64/-6)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+3/-3)
man/mysqld_safe.1 (+2/-2)
man/mysqldump.1 (+63/-5)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+2/-2)
man/mysqlimport.1 (+63/-5)
man/mysqlshow.1 (+63/-5)
man/mysqlslap.1 (+64/-6)
man/mysqltest.1 (+2/-2)
man/ndb-common-options.1 (+2/-2)
man/ndb_blob_tool.1 (+2/-2)
man/ndb_config.1 (+4/-3)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+2/-2)
man/ndb_desc.1 (+2/-2)
man/ndb_drop_index.1 (+3/-3)
man/ndb_drop_table.1 (+2/-2)
man/ndb_error_reporter.1 (+2/-2)
man/ndb_index_stat.1 (+2/-2)
man/ndb_mgm.1 (+2/-2)
man/ndb_mgmd.8 (+2/-2)
man/ndb_print_backup_file.1 (+2/-2)
man/ndb_print_schema_file.1 (+2/-2)
man/ndb_print_sys_file.1 (+2/-2)
man/ndb_restore.1 (+2/-2)
man/ndb_select_all.1 (+2/-2)
man/ndb_select_count.1 (+2/-2)
man/ndb_setup.py.1 (+2/-2)
man/ndb_show_tables.1 (+2/-2)
man/ndb_size.pl.1 (+2/-2)
man/ndb_waiter.1 (+2/-2)
man/ndbd.8 (+2/-2)
man/ndbd_redo_log_reader.1 (+3/-3)
man/ndbinfo_select_all.1 (+2/-2)
man/ndbmtd.8 (+2/-2)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+2/-2)
man/resolveip.1 (+2/-2)
mysql-test/collections/default.daily (+4/-0)
mysql-test/collections/default.push (+1/-1)
mysql-test/collections/default.weekly (+2/-0)
mysql-test/collections/disabled-gtid-on.list (+1/-0)
mysql-test/extra/rpl_tests/grep_pattern.inc (+0/-22)
mysql-test/extra/rpl_tests/rpl_auto_increment.test (+18/-18)
mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_blackhole.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_change_master.test (+4/-4)
mysql-test/extra/rpl_tests/rpl_charset.test (+8/-8)
mysql-test/extra/rpl_tests/rpl_commit_after_flush.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_conflicts.test (+3/-4)
mysql-test/extra/rpl_tests/rpl_crash_safe.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_ddl.test (+4/-4)
mysql-test/extra/rpl_tests/rpl_delete_no_where.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_filters.test (+2/-3)
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_foreign_key.test (+4/-4)
mysql-test/extra/rpl_tests/rpl_heartbeat_2slaves.inc (+4/-2)
mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_insert_delayed.test (+6/-6)
mysql-test/extra/rpl_tests/rpl_insert_id.test (+21/-21)
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test (+5/-5)
mysql-test/extra/rpl_tests/rpl_insert_ignore.test (+4/-2)
mysql-test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc (+17/-0)
mysql-test/extra/rpl_tests/rpl_loaddata.test (+5/-5)
mysql-test/extra/rpl_tests/rpl_loaddata_s.inc (+2/-2)
mysql-test/extra/rpl_tests/rpl_loadfile.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_log.test (+19/-6)
mysql-test/extra/rpl_tests/rpl_max_relay_size.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_multi_query.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_multi_update.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_multi_update2.test (+5/-6)
mysql-test/extra/rpl_tests/rpl_multi_update3.test (+4/-4)
mysql-test/extra/rpl_tests/rpl_not_null.test (+8/-8)
mysql-test/extra/rpl_tests/rpl_parallel_load.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_record_compare.test (+6/-6)
mysql-test/extra/rpl_tests/rpl_relayrotate.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_row_001.test (+2/-0)
mysql-test/extra/rpl_tests/rpl_row_UUID.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_row_basic.test (+44/-42)
mysql-test/extra/rpl_tests/rpl_row_blob.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test (+1/-0)
mysql-test/extra/rpl_tests/rpl_row_event_max_size.inc (+4/-4)
mysql-test/extra/rpl_tests/rpl_row_func003.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_row_idempotency.test (+55/-55)
mysql-test/extra/rpl_tests/rpl_row_sp002.test (+6/-6)
mysql-test/extra/rpl_tests/rpl_row_sp003.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_row_sp006.test (+3/-3)
mysql-test/extra/rpl_tests/rpl_row_sp007.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_set_null.test (+6/-6)
mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc (+2/-2)
mysql-test/extra/rpl_tests/rpl_stress_test.inc (+1/-1)
mysql-test/extra/rpl_tests/rpl_sv_relay_space.test (+1/-1)
mysql-test/extra/rpl_tests/rpl_trig004.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_truncate_helper.test (+5/-5)
mysql-test/include/default_my.cnf (+1/-0)
mysql-test/include/func_aes_block.inc (+130/-0)
mysql-test/include/have_perfschema.inc (+1/-0)
mysql-test/include/rpl_change_topology.inc (+10/-0)
mysql-test/include/rpl_end.inc (+6/-0)
mysql-test/include/rpl_init.inc (+4/-0)
mysql-test/include/subquery.inc (+16/-0)
mysql-test/include/truncate_file.inc (+3/-3)
mysql-test/lib/mtr_cases.pm (+2/-2)
mysql-test/lib/mtr_match.pm (+1/-0)
mysql-test/mysql-test-run.pl (+3/-4)
mysql-test/purify.supp (+1/-0)
mysql-test/r/alter_table.result (+4/-20)
mysql-test/r/create.result (+2/-0)
mysql-test/r/ctype_ldml.result (+1/-1)
mysql-test/r/ctype_uca.result (+14/-0)
mysql-test/r/delayed.result (+5/-0)
mysql-test/r/derived.result (+32/-0)
mysql-test/r/events_bugs.result (+4/-0)
mysql-test/r/func_aes.result (+411/-0)
mysql-test/r/func_aes_cfb1.result (+132/-0)
mysql-test/r/func_aes_cfb128.result (+132/-0)
mysql-test/r/func_aes_cfb8.result (+132/-0)
mysql-test/r/func_aes_misc.result (+255/-0)
mysql-test/r/func_aes_ofb.result (+132/-0)
mysql-test/r/information_schema-big.result (+4/-2)
mysql-test/r/innodb_mysql_lock.result (+4/-1)
mysql-test/r/innodb_mysql_sync.result (+181/-0)
mysql-test/r/insert.result (+2/-0)
mysql-test/r/max_statement_time_func.result (+1/-1)
mysql-test/r/mysql_upgrade.result (+2/-0)
mysql-test/r/mysqlcheck.result (+0/-3)
mysql-test/r/mysqld--help-notwin.result (+3/-0)
mysql-test/r/mysqld--help-win.result (+3/-0)
mysql-test/r/openssl_1.result (+1/-1)
mysql-test/r/parser.result (+25/-0)
mysql-test/r/partition.result (+2/-0)
mysql-test/r/partition_index_innodb.result (+116/-0)
mysql-test/r/partition_index_myisam.result (+83/-0)
mysql-test/r/partition_innodb.result (+27/-0)
mysql-test/r/sp.result (+10/-0)
mysql-test/r/strict.result (+17/-0)
mysql-test/r/subquery_all.result (+13/-0)
mysql-test/r/subquery_all_bka.result (+13/-0)
mysql-test/r/subquery_all_bka_nixbnl.result (+13/-0)
mysql-test/r/subquery_nomat_nosj.result (+13/-0)
mysql-test/r/subquery_nomat_nosj_bka.result (+13/-0)
mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result (+13/-0)
mysql-test/r/subquery_none.result (+13/-0)
mysql-test/r/subquery_none_bka.result (+13/-0)
mysql-test/r/subquery_none_bka_nixbnl.result (+13/-0)
mysql-test/r/temporal_literal.result (+4/-0)
mysql-test/r/type_date.result (+16/-0)
mysql-test/r/type_datetime.result (+16/-0)
mysql-test/r/type_temporal_fractional.result (+257/-0)
mysql-test/r/type_timestamp.result (+16/-0)
mysql-test/r/type_timestamp_explicit.result (+16/-0)
mysql-test/suite/binlog/r/binlog_unsafe.result (+9/-0)
mysql-test/suite/binlog/t/binlog_unsafe.test (+3/-0)
mysql-test/suite/funcs_1/r/storedproc.result (+2/-0)
mysql-test/suite/innodb/r/blob-update-debug.result (+15/-0)
mysql-test/suite/innodb/r/create-index.result (+9/-0)
mysql-test/suite/innodb/r/innodb-autoinc.result (+27/-0)
mysql-test/suite/innodb/r/innodb-double-write.result (+239/-0)
mysql-test/suite/innodb/r/innodb-update-insert.result (+43/-0)
mysql-test/suite/innodb/r/innodb.result (+1/-1)
mysql-test/suite/innodb/r/innodb_ctype_ldml.result (+1/-1)
mysql-test/suite/innodb/t/blob-update-debug.test (+17/-0)
mysql-test/suite/innodb/t/create-index.test (+11/-0)
mysql-test/suite/innodb/t/innodb-autoinc.test (+14/-0)
mysql-test/suite/innodb/t/innodb-double-write.test (+364/-0)
mysql-test/suite/innodb/t/innodb-update-insert.test (+38/-0)
mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result (+2/-0)
mysql-test/suite/perfschema/r/func_file_io.result (+1/-0)
mysql-test/suite/perfschema/r/func_mutex.result (+1/-0)
mysql-test/suite/perfschema/r/innodb_table_io.result (+0/-3)
mysql-test/suite/perfschema/r/myisam_file_io.result (+1/-0)
mysql-test/suite/perfschema/t/func_file_io.test (+1/-0)
mysql-test/suite/perfschema/t/func_mutex.test (+1/-0)
mysql-test/suite/perfschema/t/myisam_file_io.test (+1/-0)
mysql-test/suite/perfschema/t/nesting.test (+1/-0)
mysql-test/suite/rpl/r/rpl_000010.result (+2/-0)
mysql-test/suite/rpl/r/rpl_000011.result (+3/-0)
mysql-test/suite/rpl/r/rpl_000017.result (+1/-0)
mysql-test/suite/rpl/r/rpl_DML_error.result (+4/-0)
mysql-test/suite/rpl/r/rpl_LD_INFILE.result (+2/-0)
mysql-test/suite/rpl/r/rpl_alter.result (+2/-0)
mysql-test/suite/rpl/r/rpl_alter_db.result (+2/-0)
mysql-test/suite/rpl/r/rpl_alter_repository.result (+5/-0)
mysql-test/suite/rpl/r/rpl_auto_increment.result (+18/-0)
mysql-test/suite/rpl/r/rpl_auto_increment_11932.result (+1/-0)
mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result (+2/-0)
mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result (+28/-0)
mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result (+3/-0)
mysql-test/suite/rpl/r/rpl_binlog_gcommit_options.result (+2/-0)
mysql-test/suite/rpl/r/rpl_bit.result (+2/-0)
mysql-test/suite/rpl/r/rpl_bit_npk.result (+3/-0)
mysql-test/suite/rpl/r/rpl_blackhole.result (+12/-0)
mysql-test/suite/rpl/r/rpl_bug31076.result (+1/-0)
mysql-test/suite/rpl/r/rpl_bug37426.result (+2/-0)
mysql-test/suite/rpl/r/rpl_bug41902.result (+1/-0)
mysql-test/suite/rpl/r/rpl_charset.result (+8/-0)
mysql-test/suite/rpl/r/rpl_charset_sjis.result (+2/-0)
mysql-test/suite/rpl/r/rpl_check_gtid.result (+28/-0)
mysql-test/suite/rpl/r/rpl_checksum_cache.result (+7/-0)
mysql-test/suite/rpl/r/rpl_colSize.result (+7/-0)
mysql-test/suite/rpl/r/rpl_commit_after_flush.result (+2/-0)
mysql-test/suite/rpl/r/rpl_concurrency_error.result (+2/-0)
mysql-test/suite/rpl/r/rpl_conditional_comments.result (+3/-0)
mysql-test/suite/rpl/r/rpl_corruption.result (+3/-0)
mysql-test/suite/rpl/r/rpl_crash_safe_master.result (+6/-0)
mysql-test/suite/rpl/r/rpl_create_database.result (+4/-0)
mysql-test/suite/rpl/r/rpl_create_if_not_exists.result (+5/-0)
mysql-test/suite/rpl/r/rpl_current_user.result (+8/-0)
mysql-test/suite/rpl/r/rpl_delete_no_where.result (+3/-0)
mysql-test/suite/rpl/r/rpl_do_db_filter.result (+2/-0)
mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result (+2/-0)
mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result (+2/-0)
mysql-test/suite/rpl/r/rpl_drop.result (+1/-0)
mysql-test/suite/rpl/r/rpl_drop_view.result (+2/-0)
mysql-test/suite/rpl/r/rpl_dual_pos_advance.result (+4/-0)
mysql-test/suite/rpl/r/rpl_err_ignoredtable.result (+4/-0)
mysql-test/suite/rpl/r/rpl_events.result (+3/-0)
mysql-test/suite/rpl/r/rpl_extra_row_data.result (+2/-0)
mysql-test/suite/rpl/r/rpl_filter_database.result (+3/-0)
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result (+7/-0)
mysql-test/suite/rpl/r/rpl_filter_warnings.result (+21/-0)
mysql-test/suite/rpl/r/rpl_flush_logs.result (+7/-0)
mysql-test/suite/rpl/r/rpl_flushlog_loop.result (+4/-0)
mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result (+4/-0)
mysql-test/suite/rpl/r/rpl_free_items.result (+2/-0)
mysql-test/suite/rpl/r/rpl_function_defaults.result (+2/-0)
mysql-test/suite/rpl/r/rpl_general_log.result (+2/-0)
mysql-test/suite/rpl/r/rpl_geometry.result (+1/-0)
mysql-test/suite/rpl/r/rpl_get_lock.result (+2/-0)
mysql-test/suite/rpl/r/rpl_grant.result (+12/-0)
mysql-test/suite/rpl/r/rpl_grant_plugin.result (+4/-0)
mysql-test/suite/rpl/r/rpl_group_commit_deadlock.result (+2/-0)
mysql-test/suite/rpl/r/rpl_gtid_binlog_errors.result (+270/-0)
mysql-test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result (+40/-0)
mysql-test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result (+40/-0)
mysql-test/suite/rpl/r/rpl_gtid_empty_group.result (+2/-0)
mysql-test/suite/rpl/r/rpl_gtid_execution.result (+110/-0)
mysql-test/suite/rpl/r/rpl_gtid_failover.result (+4/-0)
mysql-test/suite/rpl/r/rpl_gtid_heartbeat_2slave.result (+53/-0)
mysql-test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result (+40/-0)
mysql-test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result (+40/-0)
mysql-test/suite/rpl/r/rpl_gtid_loaddata_s.result (+21/-0)
mysql-test/suite/rpl/r/rpl_gtid_mode.result (+4/-0)
mysql-test/suite/rpl/r/rpl_gtid_parallel.result (+1/-0)
mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result (+2/-0)
mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result (+11/-0)
mysql-test/suite/rpl/r/rpl_gtid_row_event_max_size.result (+70/-0)
mysql-test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result (+203/-0)
mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result (+1/-0)
mysql-test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result (+84/-0)
mysql-test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result (+182/-0)
mysql-test/suite/rpl/r/rpl_heartbeat.result (+2/-0)
mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result (+2/-0)
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result (+10/-0)
mysql-test/suite/rpl/r/rpl_idempotency.result (+40/-35)
mysql-test/suite/rpl/r/rpl_ignore_db_filter.result (+2/-0)
mysql-test/suite/rpl/r/rpl_ignore_revoke.result (+3/-0)
mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result (+2/-0)
mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result (+2/-0)
mysql-test/suite/rpl/r/rpl_incident.result (+1/-0)
mysql-test/suite/rpl/r/rpl_init_slave.result (+3/-0)
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result (+1/-0)
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result (+1/-0)
mysql-test/suite/rpl/r/rpl_insert.result (+2/-0)
mysql-test/suite/rpl/r/rpl_insert_id.result (+21/-0)
mysql-test/suite/rpl/r/rpl_insert_id_pk.result (+5/-0)
mysql-test/suite/rpl/r/rpl_insert_ignore.result (+4/-0)
mysql-test/suite/rpl/r/rpl_invoked_features.result (+3/-0)
mysql-test/suite/rpl/r/rpl_killed_ddl.result (+1/-0)
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result (+2/-0)
mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result (+1/-0)
mysql-test/suite/rpl/r/rpl_loaddata.result (+5/-0)
mysql-test/suite/rpl/r/rpl_loaddata_charset.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddata_m.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddata_map.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddata_s.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddata_simple.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddata_symlink.result (+2/-0)
mysql-test/suite/rpl/r/rpl_loaddatalocal.result (+13/-0)
mysql-test/suite/rpl/r/rpl_loadfile.result (+3/-0)
mysql-test/suite/rpl/r/rpl_locale.result (+2/-0)
mysql-test/suite/rpl/r/rpl_log_pos.result (+2/-0)
mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result (+1/-0)
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result (+5/-0)
mysql-test/suite/rpl/r/rpl_many_optimize.result (+1/-0)
mysql-test/suite/rpl/r/rpl_master_pos_wait.result (+1/-0)
mysql-test/suite/rpl/r/rpl_migration_crash_safe.result (+2/-0)
mysql-test/suite/rpl/r/rpl_misc_functions.result (+3/-0)
mysql-test/suite/rpl/r/rpl_mix_found_rows.result (+6/-0)
mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result (+6/-0)
mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result (+2/-0)
mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result (+3/-0)
mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result (+2/-0)
mysql-test/suite/rpl/r/rpl_mts_debug.result (+3/-0)
mysql-test/suite/rpl/r/rpl_multi_delete.result (+1/-0)
mysql-test/suite/rpl/r/rpl_multi_delete2.result (+1/-0)
mysql-test/suite/rpl/r/rpl_multi_engine.result (+254/-249)
mysql-test/suite/rpl/r/rpl_multi_update.result (+1/-0)
mysql-test/suite/rpl/r/rpl_multi_update2.result (+4/-0)
mysql-test/suite/rpl/r/rpl_multi_update3.result (+4/-0)
mysql-test/suite/rpl/r/rpl_multi_update4.result (+2/-0)
mysql-test/suite/rpl/r/rpl_mysql_upgrade.result (+2/-0)
mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result (+1/-0)
mysql-test/suite/rpl/r/rpl_name_const.result (+1/-0)
mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result (+1/-0)
mysql-test/suite/rpl/r/rpl_not_null_innodb.result (+8/-0)
mysql-test/suite/rpl/r/rpl_not_null_myisam.result (+8/-0)
mysql-test/suite/rpl/r/rpl_optimize.result (+1/-0)
mysql-test/suite/rpl/r/rpl_packet.result (+8/-0)
mysql-test/suite/rpl/r/rpl_parallel.result (+18/-0)
mysql-test/suite/rpl/r/rpl_parallel_change_master.result (+2/-0)
mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result (+2/-0)
mysql-test/suite/rpl/r/rpl_parallel_conflicts.result (+2/-0)
mysql-test/suite/rpl/r/rpl_parallel_ddl.result (+3/-0)
mysql-test/suite/rpl/r/rpl_parallel_innodb.result (+18/-0)
mysql-test/suite/rpl/r/rpl_parallel_multi_db.result (+6/-0)
mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result (+1/-0)
mysql-test/suite/rpl/r/rpl_parallel_start_stop.result (+9/-0)
mysql-test/suite/rpl/r/rpl_parallel_temp_query.result (+4/-0)
mysql-test/suite/rpl/r/rpl_plugin_load.result (+2/-0)
mysql-test/suite/rpl/r/rpl_ps.result (+3/-0)
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result (+1/-0)
mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result (+1/-0)
mysql-test/suite/rpl/r/rpl_read_only.result (+5/-0)
mysql-test/suite/rpl/r/rpl_relay_space_innodb.result (+1/-0)
mysql-test/suite/rpl/r/rpl_relay_space_myisam.result (+1/-0)
mysql-test/suite/rpl/r/rpl_relayrotate.result (+1/-0)
mysql-test/suite/rpl/r/rpl_replicate_do.result (+5/-0)
mysql-test/suite/rpl/r/rpl_replicate_event_after_sync_stage.result (+31/-0)
mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result (+3/-0)
mysql-test/suite/rpl/r/rpl_report_port.result (+1/-0)
mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result (+2/-0)
mysql-test/suite/rpl/r/rpl_rewrt_db.result (+9/-0)
mysql-test/suite/rpl/r/rpl_rotate_logs.result (+6/-0)
mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_001.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_4_bytes.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_NOW.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_USER.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_UUID.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result (+17/-0)
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result (+42/-0)
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result (+42/-0)
mysql-test/suite/rpl/r/rpl_row_basic_8partition.result (+9/-0)
mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result (+42/-0)
mysql-test/suite/rpl/r/rpl_row_blob_innodb.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_blob_myisam.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_colSize.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_conflicts.result (+6/-0)
mysql-test/suite/rpl/r/rpl_row_corruption.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_crash_safe.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_drop.result (+5/-0)
mysql-test/suite/rpl/r/rpl_row_event_max_size.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_find_row.result (+8/-0)
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_func001.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_func002.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_func003.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_hash_scan.result (+18/-0)
mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_idempotency.result (+100/-70)
mysql-test/suite/rpl/r/rpl_row_ignorable_event.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_img_misc.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_img_sanity.result (+48/-0)
mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result (+6/-0)
mysql-test/suite/rpl/r/rpl_row_log.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_log_innodb.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_merge_engine.result (+3/-0)
mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_mts_show_relaylog_events.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result (+6/-0)
mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result (+8/-0)
mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_sp001.result (+5/-0)
mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result (+6/-0)
mysql-test/suite/rpl/r/rpl_row_sp003.result (+3/-0)
mysql-test/suite/rpl/r/rpl_row_sp005.result (+3/-0)
mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result (+3/-0)
mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_sp008.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_sp009.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_sp010.result (+3/-0)
mysql-test/suite/rpl/r/rpl_row_sp011.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_sp012.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result (+13/-0)
mysql-test/suite/rpl/r/rpl_row_trig001.result (+3/-0)
mysql-test/suite/rpl/r/rpl_row_trig002.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_trig003.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_trig004.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_trunc_temp.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result (+2/-0)
mysql-test/suite/rpl/r/rpl_row_until.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_utf16.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_utf32.result (+1/-0)
mysql-test/suite/rpl/r/rpl_row_view01.result (+4/-0)
mysql-test/suite/rpl/r/rpl_row_wide_table.result (+2/-0)
mysql-test/suite/rpl/r/rpl_seconds_behind_master.result (+5/-0)
mysql-test/suite/rpl/r/rpl_semi_sync.result (+11/-0)
mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result (+2/-0)
mysql-test/suite/rpl/r/rpl_semi_sync_event.result (+1/-0)
mysql-test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result (+2/-0)
mysql-test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result (+2/-0)
mysql-test/suite/rpl/r/rpl_sequential.result (+18/-0)
mysql-test/suite/rpl/r/rpl_server_id2.result (+1/-0)
mysql-test/suite/rpl/r/rpl_server_id_ignore.result (+3/-0)
mysql-test/suite/rpl/r/rpl_server_uuid.result (+2/-0)
mysql-test/suite/rpl/r/rpl_session_var.result (+4/-0)
mysql-test/suite/rpl/r/rpl_set_charset.result (+2/-0)
mysql-test/suite/rpl/r/rpl_set_null_innodb.result (+6/-0)
mysql-test/suite/rpl/r/rpl_set_null_myisam.result (+6/-0)
mysql-test/suite/rpl/r/rpl_show_errors.result (+1/-0)
mysql-test/suite/rpl/r/rpl_show_slave_running.result (+1/-0)
mysql-test/suite/rpl/r/rpl_skip_error.result (+9/-0)
mysql-test/suite/rpl/r/rpl_skip_incident.result (+2/-0)
mysql-test/suite/rpl/r/rpl_skip_slave_err_warnings.result (+13/-0)
mysql-test/suite/rpl/r/rpl_slave_grp_exec.result (+6/-0)
mysql-test/suite/rpl/r/rpl_slave_load_in.result (+2/-0)
mysql-test/suite/rpl/r/rpl_slave_skip.result (+7/-0)
mysql-test/suite/rpl/r/rpl_slave_status.result (+3/-0)
mysql-test/suite/rpl/r/rpl_slow_query_log.result (+7/-0)
mysql-test/suite/rpl/r/rpl_sp.result (+28/-0)
mysql-test/suite/rpl/r/rpl_sp004.result (+4/-0)
mysql-test/suite/rpl/r/rpl_sp_effects.result (+10/-0)
mysql-test/suite/rpl/r/rpl_spec_variables.result (+8/-0)
mysql-test/suite/rpl/r/rpl_sporadic_master.result (+3/-0)
mysql-test/suite/rpl/r/rpl_ssl.result (+27/-7)
mysql-test/suite/rpl/r/rpl_ssl1.result (+5/-0)
mysql-test/suite/rpl/r/rpl_stm_000001.result (+6/-0)
mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result (+4/-0)
mysql-test/suite/rpl/r/rpl_stm_conflicts.result (+3/-0)
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_found_rows.result (+3/-0)
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result (+2/-0)
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result (+6/-0)
mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result (+5/-0)
mysql-test/suite/rpl/r/rpl_stm_loadfile.result (+2/-0)
mysql-test/suite/rpl/r/rpl_stm_log.result (+4/-0)
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result (+2/-0)
mysql-test/suite/rpl/r/rpl_stm_mix_mts_show_relaylog_events.result (+2/-0)
mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result (+2/-0)
mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result (+3/-0)
mysql-test/suite/rpl/r/rpl_stm_multi_query.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_no_op.result (+10/-0)
mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result (+3/-0)
mysql-test/suite/rpl/r/rpl_stm_sql_mode.result (+1/-0)
mysql-test/suite/rpl/r/rpl_stm_until.result (+3/-0)
mysql-test/suite/rpl/r/rpl_stm_user_variables.result (+9/-0)
mysql-test/suite/rpl/r/rpl_stop_slave.result (+2/-0)
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result (+14/-0)
mysql-test/suite/rpl/r/rpl_sync.result (+3/-0)
mysql-test/suite/rpl/r/rpl_temp_table.result (+1/-0)
mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result (+8/-0)
mysql-test/suite/rpl/r/rpl_temporal_fractional.result (+6/-0)
mysql-test/suite/rpl/r/rpl_temporary.result (+10/-0)
mysql-test/suite/rpl/r/rpl_temporary_errors.result (+2/-0)
mysql-test/suite/rpl/r/rpl_timezone.result (+10/-0)
mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result (+1/-0)
mysql-test/suite/rpl/r/rpl_trigger.result (+40/-0)
mysql-test/suite/rpl/r/rpl_trunc_temp.result (+3/-0)
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result (+10/-0)
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result (+10/-0)
mysql-test/suite/rpl/r/rpl_typeconv.result (+1/-0)
mysql-test/suite/rpl/r/rpl_typeconv_innodb.result (+2/-0)
mysql-test/suite/rpl/r/rpl_user.result (+6/-0)
mysql-test/suite/rpl/r/rpl_user_variables.result (+17/-0)
mysql-test/suite/rpl/r/rpl_variables.result (+5/-0)
mysql-test/suite/rpl/r/rpl_variables_stm.result (+3/-0)
mysql-test/suite/rpl/r/rpl_view.result (+15/-1)
mysql-test/suite/rpl/r/rpl_view_multi.result (+4/-0)
mysql-test/suite/rpl/t/rpl_000010.test (+3/-2)
mysql-test/suite/rpl/t/rpl_000011.test (+3/-3)
mysql-test/suite/rpl/t/rpl_000017.test (+1/-1)
mysql-test/suite/rpl/t/rpl_DML_error.test (+4/-4)
mysql-test/suite/rpl/t/rpl_LD_INFILE.test (+2/-3)
mysql-test/suite/rpl/t/rpl_alter.test (+2/-2)
mysql-test/suite/rpl/t/rpl_alter_db.test (+2/-2)
mysql-test/suite/rpl/t/rpl_alter_repository.test (+6/-5)
mysql-test/suite/rpl/t/rpl_auto_increment_11932.test (+1/-1)
mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test (+1/-0)
mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test (+2/-2)
mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test (+8/-8)
mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test (+3/-3)
mysql-test/suite/rpl/t/rpl_binlog_corruption.test (+1/-0)
mysql-test/suite/rpl/t/rpl_binlog_errors.test (+5/-0)
mysql-test/suite/rpl/t/rpl_binlog_gcommit_options.test (+3/-2)
mysql-test/suite/rpl/t/rpl_binlog_index.test (+1/-0)
mysql-test/suite/rpl/t/rpl_bit.test (+2/-2)
mysql-test/suite/rpl/t/rpl_bit_npk.test (+3/-3)
mysql-test/suite/rpl/t/rpl_blackhole.test (+2/-2)
mysql-test/suite/rpl/t/rpl_bug31076.test (+1/-1)
mysql-test/suite/rpl/t/rpl_bug37426.test (+2/-2)
mysql-test/suite/rpl/t/rpl_bug41902.test (+1/-1)
mysql-test/suite/rpl/t/rpl_charset_sjis.test (+2/-2)
mysql-test/suite/rpl/t/rpl_check_gtid.test (+7/-7)
mysql-test/suite/rpl/t/rpl_checksum.test (+1/-0)
mysql-test/suite/rpl/t/rpl_checksum_cache.test (+7/-12)
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test (+1/-0)
mysql-test/suite/rpl/t/rpl_colSize.test (+13/-8)
mysql-test/suite/rpl/t/rpl_concurrency_error.test (+2/-2)
mysql-test/suite/rpl/t/rpl_conditional_comments.test (+3/-3)
mysql-test/suite/rpl/t/rpl_corruption.test (+3/-3)
mysql-test/suite/rpl/t/rpl_crash_safe_master.test (+7/-6)
mysql-test/suite/rpl/t/rpl_create_database.test (+4/-4)
mysql-test/suite/rpl/t/rpl_create_if_not_exists.test (+5/-5)
mysql-test/suite/rpl/t/rpl_critical_errors.test (+1/-1)
mysql-test/suite/rpl/t/rpl_current_user.test (+13/-8)
mysql-test/suite/rpl/t/rpl_deadlock_innodb.test (+1/-0)
mysql-test/suite/rpl/t/rpl_delayed_slave.test (+3/-3)
mysql-test/suite/rpl/t/rpl_do_db_filter.test (+1/-1)
mysql-test/suite/rpl/t/rpl_do_grant.test (+1/-0)
mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive.test (+10/-0)
mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive.test (+9/-0)
mysql-test/suite/rpl/t/rpl_drop.test (+1/-1)
mysql-test/suite/rpl/t/rpl_drop_db.test (+1/-0)
mysql-test/suite/rpl/t/rpl_drop_temp.test (+1/-0)
mysql-test/suite/rpl/t/rpl_drop_view.test (+2/-2)
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test (+18/-4)
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test (+4/-4)
mysql-test/suite/rpl/t/rpl_events.test (+3/-3)
mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test (+1/-0)
mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test (+1/-0)
mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test (+1/-0)
mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test (+1/-0)
mysql-test/suite/rpl/t/rpl_extra_row_data.test (+2/-2)
mysql-test/suite/rpl/t/rpl_failed_optimize.test (+4/-0)
mysql-test/suite/rpl/t/rpl_filter_database.test (+3/-3)
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test (+8/-7)
mysql-test/suite/rpl/t/rpl_filter_warnings-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_filter_warnings.test (+49/-0)
mysql-test/suite/rpl/t/rpl_flush_logs.test (+8/-5)
mysql-test/suite/rpl/t/rpl_flushlog_loop.test (+8/-4)
mysql-test/suite/rpl/t/rpl_free_items.test (+2/-2)
mysql-test/suite/rpl/t/rpl_function_defaults.test (+2/-2)
mysql-test/suite/rpl/t/rpl_general_log.test (+2/-2)
mysql-test/suite/rpl/t/rpl_geometry.test (+1/-1)
mysql-test/suite/rpl/t/rpl_get_lock.test (+2/-2)
mysql-test/suite/rpl/t/rpl_grant.test (+13/-12)
mysql-test/suite/rpl/t/rpl_grant_plugin.test (+4/-4)
mysql-test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_binlog_errors.test (+6/-0)
mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive.test (+9/-0)
mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive.test (+9/-0)
mysql-test/suite/rpl/t/rpl_gtid_empty_group-master.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_empty_group-slave.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_empty_group.test (+2/-2)
mysql-test/suite/rpl/t/rpl_gtid_execution-master.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_execution-slave.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_execution.test (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_failover.test (+8/-4)
mysql-test/suite/rpl/t/rpl_gtid_heartbeat_2slave.cnf (+12/-0)
mysql-test/suite/rpl/t/rpl_gtid_heartbeat_2slave.test (+10/-0)
mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive.test (+8/-0)
mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test (+9/-0)
mysql-test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_loaddata_s.test (+7/-0)
mysql-test/suite/rpl/t/rpl_gtid_mode.test (+5/-4)
mysql-test/suite/rpl/t/rpl_gtid_parallel-master.opt (+0/-1)
mysql-test/suite/rpl/t/rpl_gtid_parallel-slave.opt (+0/-1)
mysql-test/suite/rpl/t/rpl_gtid_parallel.test (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test (+2/-2)
mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test (+3/-3)
mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size.test (+10/-0)
mysql-test/suite/rpl/t/rpl_gtid_row_show_relaylog_events.test (+15/-0)
mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test (+1/-1)
mysql-test/suite/rpl/t/rpl_gtid_stm_insert_delayed.test (+2/-0)
mysql-test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test (+15/-0)
mysql-test/suite/rpl/t/rpl_heartbeat.test (+2/-2)
mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test (+2/-0)
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test (+12/-11)
mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test (+1/-0)
mysql-test/suite/rpl/t/rpl_idempotency.test (+5/-5)
mysql-test/suite/rpl/t/rpl_ignore_db_filter.test (+1/-1)
mysql-test/suite/rpl/t/rpl_ignore_revoke.test (+3/-3)
mysql-test/suite/rpl/t/rpl_ignore_table.test (+1/-0)
mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive.test (+8/-0)
mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive.test (+8/-0)
mysql-test/suite/rpl/t/rpl_incident.test (+2/-1)
mysql-test/suite/rpl/t/rpl_init_slave.test (+3/-3)
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test (+1/-1)
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test (+1/-1)
mysql-test/suite/rpl/t/rpl_insert.test (+3/-2)
mysql-test/suite/rpl/t/rpl_invoked_features.test (+6/-3)
mysql-test/suite/rpl/t/rpl_killed_ddl.test (+1/-1)
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test (+2/-2)
mysql-test/suite/rpl/t/rpl_lcase_tblnames_rewrite_db.test (+1/-1)
mysql-test/suite/rpl/t/rpl_loaddata.test (+1/-0)
mysql-test/suite/rpl/t/rpl_loaddata_charset.test (+2/-2)
mysql-test/suite/rpl/t/rpl_loaddata_fatal.test (+3/-2)
mysql-test/suite/rpl/t/rpl_loaddata_m.test (+2/-2)
mysql-test/suite/rpl/t/rpl_loaddata_map.test (+2/-2)
mysql-test/suite/rpl/t/rpl_loaddata_s.test (+6/-0)
mysql-test/suite/rpl/t/rpl_loaddata_simple.test (+2/-2)
mysql-test/suite/rpl/t/rpl_loaddata_symlink.test (+2/-2)
mysql-test/suite/rpl/t/rpl_loaddatalocal.test (+9/-9)
mysql-test/suite/rpl/t/rpl_loadfile.test (+1/-1)
mysql-test/suite/rpl/t/rpl_locale.test (+2/-2)
mysql-test/suite/rpl/t/rpl_log_pos.test (+3/-2)
mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test (+1/-1)
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test (+6/-5)
mysql-test/suite/rpl/t/rpl_many_optimize.test (+1/-1)
mysql-test/suite/rpl/t/rpl_master_pos_wait.test (+1/-1)
mysql-test/suite/rpl/t/rpl_migration_crash_safe.test (+2/-2)
mysql-test/suite/rpl/t/rpl_misc_functions.test (+3/-3)
mysql-test/suite/rpl/t/rpl_mix_found_rows.test (+6/-6)
mysql-test/suite/rpl/t/rpl_mix_insert_delayed.test (+1/-0)
mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test (+2/-2)
mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test (+3/-3)
mysql-test/suite/rpl/t/rpl_mts_debug.test (+4/-3)
mysql-test/suite/rpl/t/rpl_multi_delete.test (+1/-1)
mysql-test/suite/rpl/t/rpl_multi_delete2.test (+1/-1)
mysql-test/suite/rpl/t/rpl_multi_engine.test (+5/-5)
mysql-test/suite/rpl/t/rpl_multi_update2.test (+1/-0)
mysql-test/suite/rpl/t/rpl_multi_update4.test (+3/-2)
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test (+2/-2)
mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on-master.opt (+0/-1)
mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on-slave.opt (+0/-1)
mysql-test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test (+3/-1)
mysql-test/suite/rpl/t/rpl_name_const.test (+1/-1)
mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test (+1/-1)
mysql-test/suite/rpl/t/rpl_optimize.test (+1/-1)
mysql-test/suite/rpl/t/rpl_packet.test (+8/-8)
mysql-test/suite/rpl/t/rpl_parallel_change_master.test (+3/-2)
mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test (+2/-2)
mysql-test/suite/rpl/t/rpl_parallel_conflicts.test (+2/-2)
mysql-test/suite/rpl/t/rpl_parallel_ddl.test (+3/-3)
mysql-test/suite/rpl/t/rpl_parallel_multi_db.test (+6/-6)
mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test (+1/-1)
mysql-test/suite/rpl/t/rpl_parallel_start_stop.test (+9/-9)
mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test (+1/-0)
mysql-test/suite/rpl/t/rpl_parallel_temp_query.test (+4/-4)
mysql-test/suite/rpl/t/rpl_plugin_load.test (+2/-2)
mysql-test/suite/rpl/t/rpl_ps.test (+4/-4)
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test (+1/-1)
mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test (+2/-1)
mysql-test/suite/rpl/t/rpl_read_only.test (+5/-5)
mysql-test/suite/rpl/t/rpl_replicate_do.test (+5/-5)
mysql-test/suite/rpl/t/rpl_replicate_event_after_sync_stage.test (+66/-0)
mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test (+4/-3)
mysql-test/suite/rpl/t/rpl_report_port.test (+1/-1)
mysql-test/suite/rpl/t/rpl_rewrt_db.test (+9/-9)
mysql-test/suite/rpl/t/rpl_rotate_logs.test (+6/-6)
mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_4_bytes.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_NOW.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_USER.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test (+17/-17)
mysql-test/suite/rpl/t/rpl_row_basic_8partition.test (+9/-9)
mysql-test/suite/rpl/t/rpl_row_colSize.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_corruption.test (+4/-4)
mysql-test/suite/rpl/t/rpl_row_create_table.test (+19/-19)
mysql-test/suite/rpl/t/rpl_row_drop.test (+5/-5)
mysql-test/suite/rpl/t/rpl_row_event_max_size.test (+11/-0)
mysql-test/suite/rpl/t/rpl_row_find_row.test (+8/-8)
mysql-test/suite/rpl/t/rpl_row_func001.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_func002.test (+5/-5)
mysql-test/suite/rpl/t/rpl_row_hash_scan.test (+19/-18)
mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_ignorable_event.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_img_eng_full.test (+1/-0)
mysql-test/suite/rpl/t/rpl_row_img_misc.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_img_sanity.test (+16/-16)
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_insert_delayed.test (+1/-0)
mysql-test/suite/rpl/t/rpl_row_lcase_tblnames.test (+1/-0)
mysql-test/suite/rpl/t/rpl_row_merge_engine.test (+3/-3)
mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test (+1/-0)
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test (+1/-0)
mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_record_find_myisam.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test (+5/-0)
mysql-test/suite/rpl/t/rpl_row_sp001.test (+6/-6)
mysql-test/suite/rpl/t/rpl_row_sp005.test (+3/-3)
mysql-test/suite/rpl/t/rpl_row_sp008.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_sp009.test (+4/-4)
mysql-test/suite/rpl/t/rpl_row_sp010.test (+3/-3)
mysql-test/suite/rpl/t/rpl_row_sp011.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_sp012.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test (+4/-4)
mysql-test/suite/rpl/t/rpl_row_trig001.test (+3/-3)
mysql-test/suite/rpl/t/rpl_row_trig002.test (+4/-4)
mysql-test/suite/rpl/t/rpl_row_trig003.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_trunc_temp.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_until.test (+5/-4)
mysql-test/suite/rpl/t/rpl_row_utf16.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_utf32.test (+1/-1)
mysql-test/suite/rpl/t/rpl_row_view01.test (+4/-4)
mysql-test/suite/rpl/t/rpl_row_wide_table.test (+2/-2)
mysql-test/suite/rpl/t/rpl_seconds_behind_master.test (+5/-5)
mysql-test/suite/rpl/t/rpl_semi_sync.test (+11/-11)
mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test (+2/-2)
mysql-test/suite/rpl/t/rpl_semi_sync_event.test (+1/-1)
mysql-test/suite/rpl/t/rpl_server_id2-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_server_id2-slave.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_server_id2.test (+2/-2)
mysql-test/suite/rpl/t/rpl_server_id_ignore-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_server_id_ignore-slave.opt (+1/-1)
mysql-test/suite/rpl/t/rpl_server_id_ignore.test (+3/-3)
mysql-test/suite/rpl/t/rpl_server_uuid.cnf (+1/-0)
mysql-test/suite/rpl/t/rpl_server_uuid.test (+3/-2)
mysql-test/suite/rpl/t/rpl_session_var.test (+4/-4)
mysql-test/suite/rpl/t/rpl_set_charset.test (+2/-2)
mysql-test/suite/rpl/t/rpl_show_errors.test (+1/-1)
mysql-test/suite/rpl/t/rpl_show_slave_running.test (+1/-1)
mysql-test/suite/rpl/t/rpl_skip_error.test (+9/-9)
mysql-test/suite/rpl/t/rpl_skip_incident.test (+2/-2)
mysql-test/suite/rpl/t/rpl_skip_slave_err_warnings-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_skip_slave_err_warnings.test (+38/-0)
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test (+6/-6)
mysql-test/suite/rpl/t/rpl_slave_load_in.test (+2/-2)
mysql-test/suite/rpl/t/rpl_slave_skip.test (+8/-7)
mysql-test/suite/rpl/t/rpl_slave_status.test (+3/-3)
mysql-test/suite/rpl/t/rpl_slow_query_log.test (+7/-7)
mysql-test/suite/rpl/t/rpl_sp.test (+28/-28)
mysql-test/suite/rpl/t/rpl_sp004.test (+4/-4)
mysql-test/suite/rpl/t/rpl_sp_effects.test (+10/-10)
mysql-test/suite/rpl/t/rpl_spec_variables.test (+8/-8)
mysql-test/suite/rpl/t/rpl_sporadic_master.test (+4/-3)
mysql-test/suite/rpl/t/rpl_ssl.test (+36/-13)
mysql-test/suite/rpl/t/rpl_ssl1.test (+5/-5)
mysql-test/suite/rpl/t/rpl_stm_000001.test (+7/-6)
mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test (+4/-4)
mysql-test/suite/rpl/t/rpl_stm_found_rows.test (+3/-3)
mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test (+2/-0)
mysql-test/suite/rpl/t/rpl_stm_lcase_tblnames.test (+1/-0)
mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test (+2/-0)
mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test (+4/-0)
mysql-test/suite/rpl/t/rpl_stm_mixed_mts_crash_safe.test (+1/-0)
mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test (+3/-3)
mysql-test/suite/rpl/t/rpl_stm_no_op.test (+10/-10)
mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test (+3/-3)
mysql-test/suite/rpl/t/rpl_stm_sql_mode.test (+1/-1)
mysql-test/suite/rpl/t/rpl_stm_until.test (+3/-2)
mysql-test/suite/rpl/t/rpl_stm_user_variables.test (+9/-9)
mysql-test/suite/rpl/t/rpl_stop_slave.test (+2/-2)
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test (+14/-14)
mysql-test/suite/rpl/t/rpl_sync.test (+3/-3)
mysql-test/suite/rpl/t/rpl_temp_table.test (+1/-1)
mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test (+8/-8)
mysql-test/suite/rpl/t/rpl_temporal_fractional.test (+6/-6)
mysql-test/suite/rpl/t/rpl_temporary.test (+14/-13)
mysql-test/suite/rpl/t/rpl_temporary_errors.test (+2/-2)
mysql-test/suite/rpl/t/rpl_timezone.test (+10/-10)
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test (+1/-1)
mysql-test/suite/rpl/t/rpl_trigger.test (+13/-13)
mysql-test/suite/rpl/t/rpl_trunc_temp.test (+3/-3)
mysql-test/suite/rpl/t/rpl_typeconv.test (+2/-1)
mysql-test/suite/rpl/t/rpl_typeconv_innodb.test (+2/-2)
mysql-test/suite/rpl/t/rpl_user.test (+6/-6)
mysql-test/suite/rpl/t/rpl_user_variables.test (+18/-14)
mysql-test/suite/rpl/t/rpl_variables.test (+3/-3)
mysql-test/suite/rpl/t/rpl_variables_stm.test (+3/-3)
mysql-test/suite/rpl/t/rpl_view.test (+15/-16)
mysql-test/suite/rpl/t/rpl_view_multi.test (+4/-4)
mysql-test/suite/sys_vars/r/block_encryption_mode_basic.result (+200/-0)
mysql-test/suite/sys_vars/r/general_log_file_basic.result (+1/-0)
mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result (+26/-0)
mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result (+10/-4)
mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result (+26/-0)
mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result (+30/-0)
mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result (+1/-0)
mysql-test/suite/sys_vars/r/sql_mode_basic.result (+16/-0)
mysql-test/suite/sys_vars/t/block_encryption_mode_basic.test (+225/-0)
mysql-test/suite/sys_vars/t/general_log_file_basic.test (+1/-1)
mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test (+34/-0)
mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_basic.test (+4/-1)
mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test (+35/-0)
mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test (+18/-0)
mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test (+1/-0)
mysql-test/suite/sys_vars/t/pfs_session_connect_attrs_size_basic.test (+1/-0)
mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test (+1/-1)
mysql-test/t/alter_table.test (+0/-22)
mysql-test/t/ctype_uca.test (+48/-0)
mysql-test/t/derived.test (+37/-0)
mysql-test/t/func_aes.test (+225/-0)
mysql-test/t/func_aes_cfb1.test (+20/-0)
mysql-test/t/func_aes_cfb128.test (+20/-0)
mysql-test/t/func_aes_cfb8.test (+20/-0)
mysql-test/t/func_aes_misc.test (+180/-0)
mysql-test/t/func_aes_ofb.test (+20/-0)
mysql-test/t/information_schema-big.test (+2/-0)
mysql-test/t/innodb_mysql_sync.test (+199/-0)
mysql-test/t/mysqlcheck.test (+0/-3)
mysql-test/t/openssl_1.test (+1/-1)
mysql-test/t/parser.test (+25/-0)
mysql-test/t/partition_index_innodb.test (+143/-0)
mysql-test/t/partition_index_myisam.test (+108/-0)
mysql-test/t/partition_innodb.test (+20/-0)
mysql-test/t/type_temporal_fractional.test (+147/-0)
mysys/mf_arr_appstr.c (+1/-0)
mysys/mf_qsort2.c (+1/-0)
mysys/mf_same.c (+1/-0)
mysys/mf_soundex.c (+1/-0)
mysys/mf_wcomp.c (+1/-0)
mysys/mulalloc.c (+1/-0)
mysys/my_alarm.c (+1/-0)
mysys/my_crc32.c (+1/-0)
mysys/my_div.c (+1/-0)
mysys/my_getpagesize.c (+1/-0)
mysys/my_handler_errors.h (+2/-1)
mysys/my_libwrap.c (+1/-0)
mysys/my_memmem.c (+1/-0)
mysys/test_dir.c (+1/-0)
mysys/test_xml.c (+1/-0)
mysys_ssl/CMakeLists.txt (+13/-1)
mysys_ssl/my_aes.cc (+31/-276)
mysys_ssl/my_aes_impl.h (+31/-0)
mysys_ssl/my_aes_openssl.cc (+220/-0)
mysys_ssl/my_aes_yassl.cc (+240/-0)
mysys_ssl/my_default.cc (+5/-5)
mysys_ssl/my_rnd.cc (+39/-23)
packaging/rpm-fedora/CMakeLists.txt (+1/-2)
packaging/rpm-fedora/mysql-5.6-libmysqlclient-symbols.patch (+65/-143)
packaging/rpm-fedora/mysql-5.6.16-mysql-install.patch (+11/-79)
packaging/rpm-fedora/mysql-embedded-check.c (+0/-26)
packaging/rpm-fedora/mysql.spec.in (+21/-76)
packaging/rpm-oel/CMakeLists.txt (+2/-2)
packaging/rpm-oel/mysql-5.6-libmysqlclient-symbols.patch (+960/-0)
packaging/rpm-oel/mysql-5.6.16-mysql-install.patch (+11/-79)
packaging/rpm-oel/mysql-embedded-check.c (+0/-26)
packaging/rpm-oel/mysql.spec.in (+140/-46)
plugin/innodb_memcached/daemon_memcached/CMakeLists.txt (+2/-2)
plugin/innodb_memcached/daemon_memcached/daemon/memcached.c (+10/-0)
plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc (+14/-1)
plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h (+3/-1)
plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_binary.h (+1/-0)
plugin/innodb_memcached/innodb_memcache/CMakeLists.txt (+2/-2)
plugin/semisync/semisync.cc (+1/-0)
plugin/semisync/semisync.h (+1/-0)
plugin/semisync/semisync_master.cc (+10/-3)
plugin/semisync/semisync_master_plugin.cc (+6/-1)
plugin/semisync/semisync_slave_plugin.cc (+1/-0)
scripts/CMakeLists.txt (+9/-1)
scripts/fill_help_tables.sql (+2/-1)
scripts/msql2mysql.sh (+3/-1)
scripts/mysql_config.pl.in (+2/-2)
scripts/mysql_config.sh (+4/-4)
scripts/mysql_convert_table_format.sh (+3/-1)
scripts/mysql_find_rows.sh (+3/-1)
scripts/mysql_fix_extensions.sh (+2/-1)
scripts/mysql_install_db.pl.in (+52/-20)
scripts/mysql_setpermission.sh (+3/-1)
scripts/mysql_test_data_timezone.sql (+1/-0)
scripts/mysqlaccess.sh (+4/-2)
scripts/mysqlbug.sh (+1/-0)
sql-common/client_authentication.cc (+6/-1)
sql-common/my_time.c (+11/-1)
sql-common/pack.c (+1/-0)
sql/binlog.cc (+33/-3)
sql/ha_partition.cc (+171/-19)
sql/ha_partition.h (+13/-7)
sql/handler.cc (+1/-0)
sql/handler.h (+8/-3)
sql/item.cc (+4/-2)
sql/item.h (+12/-1)
sql/item_create.cc (+94/-19)
sql/item_strfunc.cc (+177/-15)
sql/item_strfunc.h (+20/-0)
sql/item_subselect.cc (+11/-10)
sql/log_event.cc (+152/-50)
sql/log_event.h (+76/-29)
sql/mysqld.cc (+3/-2)
sql/opt_range.cc (+3/-0)
sql/replication.h (+18/-23)
sql/rpl_gtid_execution.cc (+7/-1)
sql/rpl_handler.cc (+12/-2)
sql/rpl_handler.h (+3/-2)
sql/rpl_master.cc (+49/-28)
sql/rpl_rli.h (+0/-7)
sql/rpl_slave.cc (+9/-112)
sql/share/charsets/Index.xml (+1/-0)
sql/share/charsets/armscii8.xml (+1/-0)
sql/share/charsets/ascii.xml (+1/-0)
sql/share/charsets/cp1250.xml (+1/-0)
sql/share/charsets/cp1256.xml (+1/-0)
sql/share/charsets/cp1257.xml (+1/-0)
sql/share/charsets/cp850.xml (+1/-0)
sql/share/charsets/cp852.xml (+1/-0)
sql/share/charsets/cp866.xml (+1/-0)
sql/share/charsets/dec8.xml (+1/-0)
sql/share/charsets/geostd8.xml (+1/-0)
sql/share/charsets/greek.xml (+1/-0)
sql/share/charsets/hebrew.xml (+1/-0)
sql/share/charsets/hp8.xml (+1/-0)
sql/share/charsets/keybcs2.xml (+1/-0)
sql/share/charsets/koi8r.xml (+1/-0)
sql/share/charsets/koi8u.xml (+1/-0)
sql/share/charsets/languages.html (+1/-0)
sql/share/charsets/latin1.xml (+1/-0)
sql/share/charsets/latin2.xml (+1/-0)
sql/share/charsets/latin5.xml (+1/-0)
sql/share/charsets/latin7.xml (+1/-0)
sql/share/charsets/macce.xml (+1/-0)
sql/share/charsets/macroman.xml (+1/-0)
sql/share/charsets/swe7.xml (+1/-0)
sql/share/errmsg-utf8.txt (+4/-0)
sql/sql_acl.cc (+9/-1)
sql/sql_admin.cc (+27/-5)
sql/sql_alter.h (+3/-1)
sql/sql_class.cc (+11/-6)
sql/sql_class.h (+17/-1)
sql/sql_executor.cc (+2/-12)
sql/sql_state.c (+1/-0)
sql/sql_table.cc (+27/-22)
sql/sql_table.h (+3/-2)
sql/sql_trigger.cc (+7/-0)
sql/sql_yacc.yy (+15/-1)
sql/sys_vars.cc (+48/-0)
sql/table.cc (+27/-24)
storage/archive/archive_test.c (+1/-0)
storage/heap/_check.c (+1/-0)
storage/heap/_rectest.c (+1/-0)
storage/heap/hp_extra.c (+1/-0)
storage/heap/hp_rfirst.c (+1/-0)
storage/heap/hp_rlast.c (+1/-0)
storage/heap/hp_rnext.c (+1/-0)
storage/heap/hp_rprev.c (+1/-0)
storage/heap/hp_rrnd.c (+1/-0)
storage/heap/hp_rsame.c (+1/-0)
storage/heap/hp_scan.c (+1/-0)
storage/heap/hp_update.c (+1/-0)
storage/innobase/api/api0api.cc (+32/-21)
storage/innobase/btr/btr0cur.cc (+6/-9)
storage/innobase/buf/buf0buddy.cc (+1/-1)
storage/innobase/buf/buf0buf.cc (+29/-9)
storage/innobase/buf/buf0dblwr.cc (+37/-17)
storage/innobase/buf/buf0flu.cc (+6/-4)
storage/innobase/buf/buf0lru.cc (+8/-6)
storage/innobase/dict/dict0dict.cc (+4/-5)
storage/innobase/dict/dict0load.cc (+2/-1)
storage/innobase/dict/dict0stats.cc (+128/-53)
storage/innobase/fil/fil0fil.cc (+25/-35)
storage/innobase/fts/fts0blex.cc (+231/-233)
storage/innobase/fts/fts0fts.cc (+1/-1)
storage/innobase/fts/fts0opt.cc (+4/-4)
storage/innobase/fts/fts0pars.cc (+15/-9)
storage/innobase/fts/fts0que.cc (+31/-27)
storage/innobase/fts/fts0sql.cc (+3/-2)
storage/innobase/fts/fts0tlex.cc (+39/-38)
storage/innobase/handler/ha_innodb.cc (+155/-51)
storage/innobase/handler/handler0alter.cc (+11/-4)
storage/innobase/handler/i_s.cc (+169/-118)
storage/innobase/ibuf/ibuf0ibuf.cc (+3/-2)
storage/innobase/include/buf0buf.h (+10/-1)
storage/innobase/include/buf0buf.ic (+3/-3)
storage/innobase/include/buf0dblwr.h (+4/-3)
storage/innobase/include/db0err.h (+2/-0)
storage/innobase/include/fil0fil.h (+24/-1)
storage/innobase/include/lock0lock.h (+4/-11)
storage/innobase/include/log0recv.h (+6/-2)
storage/innobase/include/os0sync.h (+2/-2)
storage/innobase/include/os0sync.ic (+4/-2)
storage/innobase/include/row0log.h (+7/-6)
storage/innobase/include/sync0rw.ic (+24/-13)
storage/innobase/include/sync0sync.ic (+4/-2)
storage/innobase/include/ut0ut.h (+14/-1)
storage/innobase/lock/lock0lock.cc (+118/-99)
storage/innobase/log/log0recv.cc (+3/-14)
storage/innobase/os/os0sync.cc (+2/-2)
storage/innobase/page/page0zip.cc (+77/-65)
storage/innobase/pars/lexyy.cc (+28/-26)
storage/innobase/pars/pars0pars.cc (+3/-2)
storage/innobase/rem/rem0cmp.cc (+16/-15)
storage/innobase/row/row0ftsort.cc (+12/-9)
storage/innobase/row/row0ins.cc (+5/-1)
storage/innobase/row/row0log.cc (+277/-96)
storage/innobase/row/row0quiesce.cc (+5/-5)
storage/innobase/row/row0uins.cc (+2/-3)
storage/innobase/row/row0umod.cc (+9/-6)
storage/innobase/row/row0upd.cc (+10/-41)
storage/innobase/row/row0vers.cc (+34/-9)
storage/innobase/srv/srv0conc.cc (+1/-1)
storage/innobase/srv/srv0srv.cc (+5/-3)
storage/innobase/srv/srv0start.cc (+37/-4)
storage/innobase/sync/sync0arr.cc (+1/-1)
storage/innobase/trx/trx0trx.cc (+2/-1)
storage/innobase/ut/ut0ut.cc (+2/-0)
storage/myisam/ftbench/Ecompare.pl (+1/-0)
storage/myisam/ftbench/Ecreate.pl (+1/-0)
storage/myisam/ftbench/Ereport.pl (+1/-0)
storage/myisam/ftbench/ft-test-run.sh (+1/-0)
storage/myisam/mi_rfirst.c (+1/-0)
storage/myisam/mi_rlast.c (+1/-0)
storage/myisam/mi_rrnd.c (+1/-0)
storage/myisam/mi_rsamepos.c (+1/-0)
storage/myisam/mi_test_all.sh (+1/-0)
storage/myisam/rt_index.h (+1/-0)
storage/myisam/rt_key.c (+1/-0)
storage/myisam/rt_key.h (+1/-0)
storage/myisam/rt_mbr.h (+1/-0)
storage/myisam/sp_defs.h (+1/-0)
storage/myisammrg/myrg_delete.c (+1/-0)
storage/myisammrg/myrg_locking.c (+1/-0)
storage/myisammrg/myrg_panic.c (+1/-0)
storage/myisammrg/myrg_range.c (+1/-0)
storage/myisammrg/myrg_records.c (+1/-0)
storage/myisammrg/myrg_rfirst.c (+1/-0)
storage/myisammrg/myrg_rlast.c (+1/-0)
storage/myisammrg/myrg_rnext.c (+1/-0)
storage/myisammrg/myrg_rnext_same.c (+1/-0)
storage/myisammrg/myrg_rprev.c (+1/-0)
storage/myisammrg/myrg_rrnd.c (+1/-0)
storage/myisammrg/myrg_rsame.c (+1/-0)
storage/myisammrg/myrg_update.c (+1/-0)
storage/myisammrg/myrg_write.c (+1/-0)
storage/ndb/CMakeLists.txt (+3/-3)
storage/ndb/config/type_mgmapiclient.cmake (+1/-0)
storage/ndb/config/type_ndbapiclient.cmake (+1/-0)
storage/ndb/config/type_util.cmake (+1/-0)
storage/ndb/docs/doxygen/Doxyfile.mgmapi (+1/-0)
storage/ndb/docs/doxygen/Doxyfile.ndb (+1/-0)
storage/ndb/docs/doxygen/Doxyfile.ndbapi (+1/-0)
storage/ndb/docs/doxygen/Doxyfile.odbc (+1/-0)
storage/ndb/docs/doxygen/postdoxy.pl (+1/-0)
storage/ndb/include/kernel/signaldata/AlterIndxImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/CreateIndxImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/CreateNodegroupImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/DictSignal.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/DihScanTab.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/DropIndxImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/DropNodegroup.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/DropNodegroupImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/EnableCom.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/HashMapImpl.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/LqhTransReq.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/StopForCrash.hpp (+1/-0)
storage/ndb/include/kernel/signaldata/TabCommit.hpp (+1/-0)
storage/ndb/src/common/CMakeLists.txt (+1/-0)
storage/ndb/src/common/debugger/signaldata/AlterIndxImpl.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/BuildIndx.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/BuildIndxImpl.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/CreateIndxImpl.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/CreateTab.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/CreateTable.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/DropIndxImpl.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/DropTable.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/DropTrigImpl.cpp (+1/-0)
storage/ndb/src/common/debugger/signaldata/GetTabInfo.cpp (+1/-0)
storage/ndb/src/kernel/blocks/RestoreProxy.cpp (+1/-0)
storage/ndb/src/kernel/blocks/RestoreProxy.hpp (+1/-0)
storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp (+1/-0)
storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp (+1/-0)
storage/ndb/src/kernel/error/CMakeLists.txt (+1/-0)
storage/ndb/src/kernel/vm/GlobalData.cpp (+1/-0)
storage/ndb/src/kernel/vm/SimulatedBlock_mt.cpp (+1/-0)
storage/ndb/src/kernel/vm/SimulatedBlock_nonmt.cpp (+1/-0)
storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp (+1/-0)
storage/ndb/src/kernel/vm/TransporterCallback_mt.cpp (+1/-0)
storage/ndb/src/kernel/vm/TransporterCallback_nonmt.cpp (+1/-0)
storage/ndb/test/ndbapi/bank/CMakeLists.txt (+1/-0)
storage/ndb/test/ndbapi/testSingleUserMode.cpp (+1/-0)
storage/ndb/test/run-test/16node-tests.txt (+1/-0)
storage/ndb/test/run-test/atrt-analyze-result.sh (+1/-0)
storage/ndb/test/run-test/atrt-mysql-test-run (+1/-0)
storage/ndb/test/run-test/atrt-testBackup (+1/-0)
storage/ndb/test/run-test/basic.txt (+1/-0)
storage/ndb/test/run-test/make-config.sh (+1/-0)
storage/ndb/test/run-test/make-html-reports.sh (+1/-0)
storage/ndb/test/run-test/make-index.sh (+1/-0)
storage/ndb/test/run-test/ndb-autotest.sh (+1/-0)
storage/ndb/test/run-test/upgrade-boot.sh (+1/-0)
storage/ndb/test/src/getarg.c (+1/-0)
storage/perfschema/ha_perfschema.cc (+8/-2)
storage/perfschema/ha_perfschema.h (+36/-1)
storage/perfschema/pfs.cc (+3/-1)
storage/perfschema/pfs_digest.cc (+2/-1)
storage/perfschema/table_helper.h (+2/-2)
storage/perfschema/table_threads.cc (+16/-2)
strings/ctype-uca.c (+10/-6)
strings/t_ctype.h (+1/-0)
support-files/MacOSX/Description.plist.sh (+1/-0)
support-files/MacOSX/Info.plist.sh (+1/-0)
support-files/MacOSX/MySQLCOM (+1/-0)
support-files/MacOSX/StartupItem.Description.plist (+1/-0)
support-files/MacOSX/StartupItem.Info.plist (+1/-0)
support-files/MacOSX/StartupItem.postinstall (+1/-0)
support-files/MacOSX/StartupParameters.plist.sh (+1/-0)
support-files/MacOSX/mwar-wrapper (+1/-0)
support-files/MacOSX/mwcc-wrapper (+1/-0)
support-files/MacOSX/postflight.sh (+1/-0)
support-files/MacOSX/preflight.sh (+1/-0)
support-files/RHEL4-SElinux/mysql.fc (+1/-0)
support-files/RHEL4-SElinux/mysql.te (+1/-0)
support-files/mysql.m4 (+1/-0)
tests/connect_test.c (+1/-0)
tests/deadlock_test.c (+1/-0)
tests/drop_test.pl (+1/-0)
tests/export.pl (+1/-0)
tests/fork2_test.pl (+1/-0)
tests/fork_big.pl (+1/-0)
tests/fork_big2.pl (+1/-0)
tests/index_corrupt.pl (+1/-0)
tests/insert_and_repair.pl (+1/-0)
tests/insert_test.c (+1/-0)
tests/list_test.c (+1/-0)
tests/lock_test.pl (+1/-0)
tests/mysql_client_fw.c (+12/-1)
tests/pmail.pl (+1/-0)
tests/rename_test.pl (+1/-0)
tests/select_test.c (+1/-0)
tests/showdb_test.c (+1/-0)
tests/ssl_test.c (+1/-0)
tests/table_types.pl (+1/-0)
tests/test_delayed_insert.pl (+1/-0)
tests/truncate.pl (+1/-0)
unittest/examples/simple-t.c (+1/-0)
unittest/gunit/yassl/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.6.17
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+217003@code.launchpad.net

This proposal supersedes a proposal from 2014-04-22.

Description of the change

Merge MySQL 5.6.17 and restore compatibility with older system OpenSSL versions.

3rd MP:
- Removed lock_rec_other_trx_holds_expl quadratic behaviour, changed lock_rec_has_expl and lock_rec_other_has_expl_req to accept trx ids instead of trxs, adjusted callers to match, and changed lock_rec_queue_validate and lock_rec_convert_impl_to_explt to use transaction descriptors.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/592/

2nd MP:

- Rewrote lock_rec_other_trx_holds_expl for transaction descriptors.
- Replace OpenSSL version-based IV hack with making ECB mode always ignore IV.

http://jenkins.percona.com/job/percona-server-5.6-param/588/
A separate -DWITH_SSL=bundled run is no longer required.

1st MP:

http://jenkins.percona.com/job/percona-server-5.6-param/580/
-DWITH_SSL=bundled run: http://jenkins.percona.com/job/percona-server-5.6-param/581/

If the SSL changes are OK, I will create a blueprint to add a new doc page re. system OpenSSL compatibility.

Restore -DWITH_SSL=system support for OpenSSL versions <= 0.9.8k.

MySQL 5.6.17 introduced support for block encryption modes and
initialization vectors for AES_ENCRYPT/AES_DECRYPT functions. This
change broke backwards compatibility for older OpenSSL system
versions, as the ciphers there disagree with recent OpenSSL versions
whether they need initialization vectors or not. As AES functions
directly check with OpenSSL for IV requirement and provide a
corresponding function signature, these differences result in SQL
incompatibilities.

Fixed by
- Not passing IV to OpenSSL if OpenSSL <= 0.9.8k, as 5.6.16- did.
- Exporting OPENSSL_VERSION_NUMBER define as Openssl_version server
  status variable.
- New MTR include file skip_if_old_openssl.inc, included in func_aes,
  func_aes_misc, func_aes_cfb1, func_aes_cfb8, func_aes_cfb128, and
  func_aes_ofb - the testcases that expect IVs in AES SQL functions.

  Merge MySQL 5.6.17, implementing
  https://blueprints.launchpad.net/percona-server/+spec/merge-5.6.17 and
  taking upstream fixes for
  https://bugs.launchpad.net/percona-server/5.6/+bug/1208921
  https://bugs.launchpad.net/percona-server/5.6/+bug/1282104
  https://bugs.launchpad.net/percona-server/5.6/+bug/1282132

  Non-trivial merge bits:
  - in lock_rec_other_trx_holds_expl, replaced trx_rw_is_active call
    with trx_rw_get_active_trx_by_id and moved trx_sys->mutex locking up
    from the if statement to satisfy trx_rw_get_activity_trx_by_id
    locking invariant.

  - Moved Percona-specific error messages to the end of errmsg-utf8.txt,
    re-recorded max_statement_time_func testcase.

  At the same time fixed bug 1299688 /
  http://bugs.mysql.com/bug.php?id=72163 (lp:mysql-server/5.6 rev 5774
  broke rpl_plugin_load) by re-recording the testcase.

  Update man pages from mysql-5.6.17.tar.gz.

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

Laurynas,

  Changes to lock_rec_other_trx_holds_expl() look okay-ish, though they
  could benefit from the trx descriptors optimization by replacing
  pointers to transactions with their IDs. I don’t insist, since it’s a
  debug-only code.

  But the OpenSSL changes are wrong. It looks like the only issue with
  OpenSSL < 0.9.8l that breaks AES_ENCRYPT/AES_DECRYPT compatibility is
  that those old versions incorrectly report the required IV length with
  AES in ECB mode. IV is not required by the ECB cipher, so
  EVP_CIPHER_iv_length() should return 0, whereas old versions
  return 16.

  Which confuses my_aes_needs_iv(), in particular, and makes the server
  believe AES_*() functions require the 3rd argument with
  block_encryption_mode=aes-128-ecb (i.e. an IV).

  Which is also an upstream issue, i.e. a workaround for old OpenSSL
  libs is required. And the workaround is simple: whenever
  EVP_CIPHER_iv_length() is used to get the required IV length, also
  check EVP_CIPHER_mode(). If it’s EVP_CIPH_ECB_MODE, disregard the
  value returned by EVP_CIPHER_iv_length() and assume the
  required IV length to be 0.

  The approach implemented in this MP is rather dangerous: we make the
  server pretend that it accepts IV when required, when in fact it is
  ignored for old OpenSSL versions. Security folks may get upset :)

  Speaking of the new Openssl_version variable, its only purpose in this
  MP was to patch up the test suite to hide the fact that IV is ignored
  for old OpenSSL versions. Which means there’s no need for it
  anymore. Besides, it is misleading: it shows the OpenSSL version that
  the server was built against. Which, in case of dynamic linking may
  differ from the OpenSSL library actually being used. Which can make
  quite a difference in the light of recent events.

review: Needs Fixing
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal
Download full text (3.6 KiB)

> Changes to lock_rec_other_trx_holds_expl() look okay-ish, though they
> could benefit from the trx descriptors optimization by replacing
> pointers to transactions with their IDs. I don’t insist, since it’s a
> debug-only code.

Debug-only code was the reason why I did not do this the first time
around, but why not. Does the following look reasonable?

 lock_mutex_enter();
 mutex_enter(&trx_sys->mutex);

 trx_id_t* impl_trx_desc = trx_find_descriptor(trx_sys->descriptors,
            trx_sys->descr_n_used,
            trx_id);
 if (impl_trx_desc) {
  trx_id_t impl_trx_id = *impl_trx_desc;
  ulint heap_no = page_rec_get_heap_no(rec);
  ulint rw_trx_count = trx_sys->descr_n_used;
  trx_id_t* rw_trx_snapshot = static_cast<trx_id_t *>
   (ut_malloc(sizeof(trx_id_t) * rw_trx_count));
  memcpy(rw_trx_snapshot, trx_sys->descriptors,
         sizeof(trx_id_t) * rw_trx_count);

  mutex_exit(&trx_sys->mutex);

  for (ulint i = 0; i < rw_trx_count; i++) {

   mutex_enter(&trx_sys->mutex);
   trx_t* t = trx_rw_get_active_trx_by_id(
    rw_trx_snapshot[i], NULL);
   mutex_exit(&trx_sys->mutex);

   lock_t* expl_lock = lock_rec_has_expl(precise_mode,
             block, heap_no,
             t);
   if (expl_lock && expl_lock->trx->id != impl_trx_id) {
    /* An explicit lock is held by trx other than
    the trx holding the implicit lock. */
    holds = expl_lock->trx;
    break;
   }
  }

  ut_free(rw_trx_snapshot);

 } else {
  mutex_exit(&trx_sys->mutex);
 }

 lock_mutex_exit();

> But the OpenSSL changes are wrong. It looks like the only issue with
> OpenSSL < 0.9.8l that breaks AES_ENCRYPT/AES_DECRYPT compatibility is
> that those old versions incorrectly report the required IV length with
> AES in ECB mode. IV is not required by the ECB cipher, so
> EVP_CIPHER_iv_length() should return 0, whereas old versions
> return 16.

Yes.

> Which confuses my_aes_needs_iv(), in particular, and makes the server
> believe AES_*() functions require the 3rd argument with
> block_encryption_mode=aes-128-ecb (i.e. an IV).

Yes.

> Which is also an upstream issue, i.e. a workaround for old OpenSSL
> libs is required. And the workaround is simple: whenever
> EVP_CIPHER_iv_length() is used to get the required IV length, also
> check EVP_CIPHER_mode(). If it’s EVP_CIPH_ECB_MODE, disregard the
> value returned by EVP_CIPHER_iv_length() and assume the
> required IV length to be 0.

OK, that's a better workaround than mine.

> The approach implemented in this MP is rather dangerous: we make the
> server pretend that it accepts IV when required, when in fact it is
> ignored for old OpenSSL versions. Security folks may get upset :)

My idea was to make MySQL call OpenSSL in exactly same way (Foo vs
FooEx aside) it was in 5.6.16-, including 5.5 GA etc. So that
implementation would be as secure or insecure as, say, current 5.5.

> Speaking of the new Openssl_version variable, its only purpose in this
> MP was to patch up the test suite to hide the fact that IV is ignored
> for old OpenSSL versions. Which means there’s no need for it
> anymore.

Right, removing.

> Besides, it is misleading: it shows the OpenSSL version t...

Read more...

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

Hi Laurynas,

On Tue, Apr 22 2014 17:42:58 +0400, Laurynas Biveinis wrote:

>> Changes to lock_rec_other_trx_holds_expl() look okay-ish, though they
>> could benefit from the trx descriptors optimization by replacing
>> pointers to transactions with their IDs. I don’t insist, since it’s a
>> debug-only code.
>
> Debug-only code was the reason why I did not do this the first time
> around, but why not. Does the following look reasonable?
>

Hm, not quite. It still looks up pointers to transactions, and for that
it has iterate rw_trx_list by calling trx_rw_get_active_trx_by_id(). And
it also has to do so for each trx from rw_trx_snapshot, which makes it
even less efficient than the upstream implementation. It looks like
lock_rec_has_expl() does not really need a pointer to a transaction
either. It only uses it to match against lock->trx. So by changing it to
accept trx ID as the last argument and matching against lock->trx->id
instead, we can avoid the trx_rw_get_active_trx_by_id() call in
lock_rec_other_has_expl(), and potentially optimize some non-debug code
as well!

But again, I don’t insist. Just pointing out that the current implementation
is even less efficient than the upstream one.

>> But the OpenSSL changes are wrong. It looks like the only issue with
>> OpenSSL < 0.9.8l that breaks AES_ENCRYPT/AES_DECRYPT compatibility is
>> that those old versions incorrectly report the required IV length with
>> AES in ECB mode. IV is not required by the ECB cipher, so
>> EVP_CIPHER_iv_length() should return 0, whereas old versions
>> return 16.
>
> Yes.
>
>> Which confuses my_aes_needs_iv(), in particular, and makes the server
>> believe AES_*() functions require the 3rd argument with
>> block_encryption_mode=aes-128-ecb (i.e. an IV).
>
> Yes.
>
>> Which is also an upstream issue, i.e. a workaround for old OpenSSL
>> libs is required. And the workaround is simple: whenever
>> EVP_CIPHER_iv_length() is used to get the required IV length, also
>> check EVP_CIPHER_mode(). If it’s EVP_CIPH_ECB_MODE, disregard the
>> value returned by EVP_CIPHER_iv_length() and assume the
>> required IV length to be 0.
>
> OK, that's a better workaround than mine.
>

Will you report it upstream? AFAIK it is not documented anywhere that
OpenSSL < 0.9.8l is not supported, so it’s a genuine upstream issue.

>> The approach implemented in this MP is rather dangerous: we make the
>> server pretend that it accepts IV when required, when in fact it is
>> ignored for old OpenSSL versions. Security folks may get upset :)
>
> My idea was to make MySQL call OpenSSL in exactly same way (Foo vs
> FooEx aside) it was in 5.6.16-, including 5.5 GA etc. So that
> implementation would be as secure or insecure as, say, current 5.5.
>

I meant that by accepting IV for ciphers that require it, but ignoring
it the server would:

1. Generate cryptographically weak results with non-default
block_encryption_mode values, while users would assume them to be
cryptographically strong.

2. Generate results that would not be decryptable on servers with recent
OpenSSL versions that would actually take IV into account.

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

Not sure how you would like to address comments related to lock_rec_other_trx_holds_expl(). I see 3 options on the order of descending efficiency: 1) implement my suggestions 2) revert to the previous implementation 3) leave as is. I'm fine with all of them, so setting to Approved.

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

*** TODO Reply to the 2nd review round of MySQL 5.6.17 merge :@internet:
> Hm, not quite. It still looks up pointers to transactions, and for that
> it has iterate rw_trx_list by calling trx_rw_get_active_trx_by_id(). And
> it also has to do so for each trx from rw_trx_snapshot, which makes it
> even less efficient than the upstream implementation.

Oh, I completely missed that trx_rw_get_active_trx_by_id is O(n), yes,
that's not very reasonable implementation.

> It looks like
> lock_rec_has_expl() does not really need a pointer to a transaction
> either. It only uses it to match against lock->trx. So by changing it to
> accept trx ID as the last argument and matching against lock->trx->id
> instead, we can avoid the trx_rw_get_active_trx_by_id() call in
> lock_rec_other_has_expl(), and potentially optimize some non-debug code
> as well!

Done. Other changed code is lock_rec_queue_validate and
lock_rec_convert_impl_to_expl, the latter being non-debug code.

> But again, I don’t insist. Just pointing out that the current implementation
> is even less efficient than the upstream one.
>
> [...]
> Will you report it upstream? AFAIK it is not documented anywhere that
> OpenSSL < 0.9.8l is not supported, so it’s a genuine upstream issue.

I would, but we already had older OpenSSL version bug reported, which
was closed as "Unsupported":
http://bugs.mysql.com/bug.php?id=70489. That leaves us with an option
to report a bug that -DWITH_SSL=system should reject old versions at
configure time, but that is likely to be duplicate of
Bug 14167227 - CMAKE SHOULD REJECT -DWITH_SSL=SYSTEM IF OPENSSL IS
OLDER THAN 1.0.0
referenced in that bug report.

>
> >> The approach implemented in this MP is rather dangerous: we make the
> >> server pretend that it accepts IV when required, when in fact it is
> >> ignored for old OpenSSL versions. Security folks may get upset :)
> >
> > My idea was to make MySQL call OpenSSL in exactly same way (Foo vs
> > FooEx aside) it was in 5.6.16-, including 5.5 GA etc. So that
> > implementation would be as secure or insecure as, say, current 5.5.
> >
>
> I meant that by accepting IV for ciphers that require it, but ignoring
> it the server would:
>
> 1. Generate cryptographically weak results with non-default
> block_encryption_mode values, while users would assume them to be
> cryptographically strong.
>
> 2. Generate results that would not be decryptable on servers with recent
> OpenSSL versions that would actually take IV into account.

Right, I see.

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 'CMakeLists.txt'
2--- CMakeLists.txt 2014-03-03 17:51:33 +0000
3+++ CMakeLists.txt 2014-04-24 08:44:11 +0000
4@@ -1,4 +1,4 @@
5-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
6+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
7 #
8 # This program is free software; you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10@@ -398,14 +398,15 @@
11 SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
12 ENDIF()
13
14-OPTION(TMPDIR
15-"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
16-IF(TMPDIR)
17+SET(TMPDIR "P_tmpdir"
18+ CACHE PATH
19+ "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>")
20+IF(TMPDIR STREQUAL "P_tmpdir")
21+ # Do not quote it, to refer to the P_tmpdir macro.
22+ SET(DEFAULT_TMPDIR "P_tmpdir")
23+ELSE()
24 # Quote it, to make it a const char string.
25 SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
26-ELSE()
27- # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
28- SET(DEFAULT_TMPDIR "P_tmpdir")
29 ENDIF()
30
31 # Run platform tests
32
33=== modified file 'VERSION'
34--- VERSION 2014-03-24 15:57:34 +0000
35+++ VERSION 2014-04-24 08:44:11 +0000
36@@ -1,4 +1,4 @@
37 MYSQL_VERSION_MAJOR=5
38 MYSQL_VERSION_MINOR=6
39-MYSQL_VERSION_PATCH=16
40-MYSQL_VERSION_EXTRA=-64.2
41+MYSQL_VERSION_PATCH=17
42+MYSQL_VERSION_EXTRA=-65.0
43
44=== modified file 'client/mysql.cc'
45--- client/mysql.cc 2013-12-05 17:23:10 +0000
46+++ client/mysql.cc 2014-04-24 08:44:11 +0000
47@@ -1,5 +1,5 @@
48 /*
49- Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
50+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
51
52 This program is free software; you can redistribute it and/or modify
53 it under the terms of the GNU General Public License as published by
54@@ -1311,9 +1311,9 @@
55
56 put_info("Welcome to the MySQL monitor. Commands end with ; or \\g.",
57 INFO_INFO);
58- sprintf((char*) glob_buffer.ptr(),
59- "Your MySQL connection id is %lu\nServer version: %s\n",
60- mysql_thread_id(&mysql), server_version_string(&mysql));
61+ snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
62+ "Your MySQL connection id is %lu\nServer version: %s\n",
63+ mysql_thread_id(&mysql), server_version_string(&mysql));
64 put_info((char*) glob_buffer.ptr(),INFO_INFO);
65
66 put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
67
68=== modified file 'client/mysql_config_editor.cc'
69--- client/mysql_config_editor.cc 2013-01-23 11:16:25 +0000
70+++ client/mysql_config_editor.cc 2014-04-24 08:44:11 +0000
71@@ -1,5 +1,5 @@
72 /*
73- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
74+ Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
75
76 This program is free software; you can redistribute it and/or modify
77 it under the terms of the GNU General Public License as published by
78@@ -776,7 +776,7 @@
79 {
80 verbose_msg("File exists.\n");
81
82- file_size= stat_info.st_size;
83+ file_size= (size_t) stat_info.st_size;
84
85 #ifdef _WIN32
86 if (1)
87@@ -943,7 +943,7 @@
88 static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name)
89 {
90 /* If nope of the options are specified remove the entire path. */
91- if (!opt_remove_host && !opt_remove_pass && !opt_remove_user
92+ if (!opt_remove_host && !opt_remove_pass && !opt_remove_user
93 && !opt_remove_socket && !opt_remove_port)
94 {
95 remove_login_path(file_buf, path_name);
96@@ -1295,7 +1295,7 @@
97
98 @param plain [in] Plain text to be encrypted.
99 @param plain_len [in] Length of the plain text.
100- @param cipher [in] Encrypted cipher text.
101+ @param cipher [out] Encrypted cipher text.
102
103 @return -1 if error encountered,
104 length encrypted, otherwise.
105@@ -1306,9 +1306,12 @@
106 DBUG_ENTER("encrypt_buffer");
107 int aes_len;
108
109- aes_len= my_aes_get_size(plain_len);
110+ aes_len= my_aes_get_size(plain_len, my_aes_128_ecb);
111
112- if (my_aes_encrypt(plain, plain_len, cipher, my_key, LOGIN_KEY_LEN) == aes_len)
113+ if (my_aes_encrypt((const unsigned char *) plain, plain_len,
114+ (unsigned char *) cipher,
115+ (const unsigned char *) my_key, LOGIN_KEY_LEN,
116+ my_aes_128_ecb, NULL) == aes_len)
117 DBUG_RETURN(aes_len);
118
119 verbose_msg("Error! Couldn't encrypt the buffer.\n");
120@@ -1321,7 +1324,7 @@
121
122 @param cipher [in] Cipher text to be decrypted.
123 @param cipher_len [in] Length of the cipher text.
124- @param plain [in] Decrypted plain text.
125+ @param plain [out] Decrypted plain text.
126
127 @return -1 if error encountered,
128 length decrypted, otherwise.
129@@ -1332,8 +1335,11 @@
130 DBUG_ENTER("decrypt_buffer");
131 int aes_length;
132
133- if ((aes_length= my_aes_decrypt(cipher, cipher_len, (char *) plain,
134- my_key, LOGIN_KEY_LEN)) > 0)
135+ if ((aes_length= my_aes_decrypt((const unsigned char *) cipher, cipher_len,
136+ (unsigned char *) plain,
137+ (const unsigned char *) my_key,
138+ LOGIN_KEY_LEN,
139+ my_aes_128_ecb, NULL)) > 0)
140 DBUG_RETURN(aes_length);
141
142 verbose_msg("Error! Couldn't decrypt the buffer.\n");
143
144=== modified file 'client/mysql_upgrade.c'
145--- client/mysql_upgrade.c 2013-06-20 15:16:00 +0000
146+++ client/mysql_upgrade.c 2014-04-24 08:44:11 +0000
147@@ -476,6 +476,7 @@
148 */
149 if (run_tool(tool_executable_name,
150 &ds_tmp, /* Get output from command, discard*/
151+ "--no-defaults",
152 "--help",
153 "2>&1",
154 IF_WIN("> NUL", "> /dev/null"),
155
156=== modified file 'client/mysqladmin.cc'
157--- client/mysqladmin.cc 2013-06-20 15:16:00 +0000
158+++ client/mysqladmin.cc 2014-04-24 08:44:11 +0000
159@@ -1,5 +1,5 @@
160 /*
161- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
162+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
163
164 This program is free software; you can redistribute it and/or modify
165 it under the terms of the GNU General Public License as published by
166@@ -40,7 +40,7 @@
167 static int interval=0;
168 static my_bool option_force=0,interrupted=0,new_line=0,
169 opt_compress=0, opt_relative=0, opt_verbose=0, opt_vertical=0,
170- tty_password= 0, opt_nobeep;
171+ tty_password= 0, opt_nobeep, opt_secure_auth= TRUE;
172 static my_bool debug_info_flag= 0, debug_check_flag= 0;
173 static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations;
174 static uint opt_count_iterations= 0, my_end_arg;
175@@ -181,6 +181,9 @@
176 "Currently only works with extended-status.",
177 &opt_relative, &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
178 0, 0, 0},
179+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
180+ " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
181+ &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
182 #ifdef HAVE_SMEM
183 {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
184 "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
185@@ -349,6 +352,8 @@
186
187 if (opt_bind_addr)
188 mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
189+ if (!opt_secure_auth)
190+ mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
191 if (opt_compress)
192 mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
193 if (opt_connect_timeout)
194
195=== modified file 'client/mysqlbinlog.cc'
196--- client/mysqlbinlog.cc 2014-02-15 00:23:41 +0000
197+++ client/mysqlbinlog.cc 2014-04-24 08:44:11 +0000
198@@ -1,5 +1,5 @@
199 /*
200- Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
201+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
202
203 This program is free software; you can redistribute it and/or modify
204 it under the terms of the GNU General Public License as published by
205@@ -144,6 +144,7 @@
206 static uint my_end_arg;
207 static const char* sock= 0;
208 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
209+static my_bool opt_secure_auth= TRUE;
210
211 #ifdef HAVE_SMEM
212 static char *shared_memory_base_name= 0;
213@@ -1549,6 +1550,9 @@
214 "prefix for the file names.",
215 &output_file, &output_file, 0, GET_STR, REQUIRED_ARG,
216 0, 0, 0, 0, 0, 0},
217+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
218+ " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
219+ &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
220 {"server-id", OPT_SERVER_ID,
221 "Extract only binlog entries created by the server having the given id.",
222 &server_id, &server_id, 0, GET_ULONG,
223@@ -2011,6 +2015,8 @@
224 mysql_options(mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
225 if (opt_bind_addr)
226 mysql_options(mysql, MYSQL_OPT_BIND, opt_bind_addr);
227+ if (!opt_secure_auth)
228+ mysql_options(mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
229 #ifdef HAVE_SMEM
230 if (shared_memory_base_name)
231 mysql_options(mysql, MYSQL_SHARED_MEMORY_BASE_NAME,
232
233=== modified file 'client/mysqlcheck.c'
234--- client/mysqlcheck.c 2014-02-17 11:12:40 +0000
235+++ client/mysqlcheck.c 2014-04-24 08:44:11 +0000
236@@ -1,5 +1,5 @@
237 /*
238- Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
239+ Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
240
241 This program is free software; you can redistribute it and/or modify
242 it under the terms of the GNU General Public License as published by
243@@ -41,7 +41,7 @@
244 opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0,
245 tty_password= 0, opt_frm= 0, debug_info_flag= 0, debug_check_flag= 0,
246 opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0,
247- opt_write_binlog= 1;
248+ opt_write_binlog= 1, opt_secure_auth=TRUE;
249 static uint verbose = 0, opt_mysql_port=0;
250 static int my_end_arg;
251 static char * opt_mysql_unix_port = 0;
252@@ -144,6 +144,9 @@
253 "when commands should not be sent to replication slaves.",
254 &opt_write_binlog, &opt_write_binlog, 0, GET_BOOL, NO_ARG,
255 1, 0, 0, 0, 0, 0},
256+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
257+ " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
258+ &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
259 {"optimize", 'o', "Optimize table.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,
260 0, 0},
261 {"password", 'p',
262@@ -891,6 +894,8 @@
263 mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
264 if (opt_bind_addr)
265 mysql_options(&mysql_connection, MYSQL_OPT_BIND, opt_bind_addr);
266+ if (!opt_secure_auth)
267+ mysql_options(&mysql_connection, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
268 #ifdef HAVE_SMEM
269 if (shared_memory_base_name)
270 mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
271
272=== modified file 'client/mysqldump.c'
273--- client/mysqldump.c 2014-03-03 17:51:33 +0000
274+++ client/mysqldump.c 2014-04-24 08:44:11 +0000
275@@ -1,5 +1,5 @@
276 /*
277- Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
278+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
279
280 This program is free software; you can redistribute it and/or modify
281 it under the terms of the GNU General Public License as published by
282@@ -116,7 +116,8 @@
283 opt_slave_apply= 0, opt_ignore_show_create_table_error=0,
284 opt_include_master_host_port= 0,
285 opt_events= 0, opt_comments_used= 0,
286- opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0;
287+ opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0,
288+ opt_secure_auth= 1;
289 static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0;
290 static ulong opt_max_allowed_packet, opt_net_buffer_length;
291 static MYSQL mysql_connection,*mysql=0;
292@@ -533,6 +534,9 @@
293 {"socket", 'S', "The socket file to use for connection.",
294 &opt_mysql_unix_port, &opt_mysql_unix_port, 0,
295 GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
296+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
297+ " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
298+ &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
299 #include <sslopt-longopts.h>
300 {"tab",'T',
301 "Create tab-separated textfile for each table to given path. (Create .sql "
302@@ -1561,6 +1565,8 @@
303 mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
304 if (opt_bind_addr)
305 mysql_options(&mysql_connection,MYSQL_OPT_BIND,opt_bind_addr);
306+ if (!opt_secure_auth)
307+ mysql_options(&mysql_connection,MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
308 #ifdef HAVE_SMEM
309 if (shared_memory_base_name)
310 mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
311
312=== modified file 'client/mysqlimport.c'
313--- client/mysqlimport.c 2012-10-16 06:21:51 +0000
314+++ client/mysqlimport.c 2014-04-24 08:44:11 +0000
315@@ -1,5 +1,5 @@
316 /*
317- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
318+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
319
320 This program is free software; you can redistribute it and/or modify
321 it under the terms of the GNU General Public License as published by
322@@ -47,7 +47,7 @@
323
324 static my_bool verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0,
325 replace=0,silent=0,ignore=0,opt_compress=0,
326- opt_low_priority= 0, tty_password= 0;
327+ opt_low_priority= 0, tty_password= 0, opt_secure_auth= 1;
328 static my_bool debug_info_flag= 0, debug_check_flag= 0;
329 static uint opt_use_threads=0, opt_local_file=0, my_end_arg= 0;
330 static char *opt_password=0, *current_user=0,
331@@ -161,6 +161,9 @@
332 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
333 {"replace", 'r', "If duplicate unique key was found, replace old row.",
334 &replace, &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
335+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
336+ " uses old (pre-4.1.1) protocol.",
337+ &opt_secure_auth, &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
338 #ifdef HAVE_SMEM
339 {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
340 "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
341@@ -440,6 +443,8 @@
342 mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
343 if (opt_bind_addr)
344 mysql_options(mysql,MYSQL_OPT_BIND,opt_bind_addr);
345+ if (!opt_secure_auth)
346+ mysql_options(mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
347 #ifdef HAVE_SMEM
348 if (shared_memory_base_name)
349 mysql_options(mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
350
351=== modified file 'client/mysqlshow.c'
352--- client/mysqlshow.c 2012-10-16 06:21:51 +0000
353+++ client/mysqlshow.c 2014-04-24 08:44:11 +0000
354@@ -1,5 +1,5 @@
355 /*
356- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
357+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
358
359 This program is free software; you can redistribute it and/or modify
360 it under the terms of the GNU General Public License as published by
361@@ -38,6 +38,7 @@
362 static uint opt_verbose=0;
363 static char *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME;
364 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
365+static my_bool opt_secure_auth= TRUE;
366
367 #ifdef HAVE_SMEM
368 static char *shared_memory_base_name=0;
369@@ -132,6 +133,8 @@
370 mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
371 if (opt_bind_addr)
372 mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
373+ if (!opt_secure_auth)
374+ mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
375 #ifdef HAVE_SMEM
376 if (shared_memory_base_name)
377 mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
378@@ -244,6 +247,9 @@
379 {"protocol", OPT_MYSQL_PROTOCOL,
380 "The protocol to use for connection (tcp, socket, pipe, memory).",
381 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
382+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
383+ " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
384+ &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
385 #ifdef HAVE_SMEM
386 {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
387 "Base name of shared memory.", &shared_memory_base_name,
388
389=== modified file 'client/mysqlslap.c'
390--- client/mysqlslap.c 2012-10-16 06:21:51 +0000
391+++ client/mysqlslap.c 2014-04-24 08:44:11 +0000
392@@ -1,5 +1,5 @@
393 /*
394- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
395+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
396
397 This program is free software; you can redistribute it and/or modify
398 it under the terms of the GNU General Public License as published by
399@@ -126,6 +126,7 @@
400 *post_system= NULL,
401 *opt_mysql_unix_port= NULL;
402 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
403+static my_bool opt_secure_auth= TRUE;
404 static uint opt_enable_cleartext_plugin= 0;
405 static my_bool using_opt_enable_cleartext_plugin= 0;
406
407@@ -346,6 +347,8 @@
408 #endif
409 if (opt_protocol)
410 mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
411+ if (!opt_secure_auth && slap_connect(&mysql))
412+ mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
413 #ifdef HAVE_SMEM
414 if (shared_memory_base_name)
415 mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
416@@ -684,6 +687,9 @@
417 {"query", 'q', "Query to run or file containing query to run.",
418 &user_supplied_query, &user_supplied_query,
419 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
420+ {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
421+ " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
422+ &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
423 #ifdef HAVE_SMEM
424 {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
425 "Base name of shared memory.", &shared_memory_base_name,
426
427=== modified file 'cmake/libutils.cmake'
428--- cmake/libutils.cmake 2014-02-17 11:12:40 +0000
429+++ cmake/libutils.cmake 2014-04-24 08:44:11 +0000
430@@ -1,4 +1,4 @@
431-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
432+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
433 #
434 # This program is free software; you can redistribute it and/or modify
435 # it under the terms of the GNU General Public License as published by
436
437=== modified file 'extra/yassl/README'
438--- extra/yassl/README 2013-02-12 07:47:19 +0000
439+++ extra/yassl/README 2014-04-24 08:44:11 +0000
440@@ -12,7 +12,36 @@
441
442 *** end Note ***
443
444-yaSSL Release notes, version 2.2.2 (7/5/2012)
445+yaSSL Release notes, version 2.3.0 (12/5/2013)
446+
447+ This release of yaSSL updates asm for newer GCC versions.
448+
449+See normal build instructions below under 1.0.6.
450+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
451+
452+
453+*****************yaSSL Release notes, version 2.2.3b (4/23/2013)
454+
455+ This release of yaSSL updates the test certificates as they were expired
456+
457+See normal build instructions below under 1.0.6.
458+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
459+
460+
461+*****************yaSSL Release notes, version 2.2.2d (2/5/2013)
462+
463+ This release of yaSSL contains countermeasuers for the Lucky 13 TLS 1.1
464+ CBC timing padding attack identified by Nadhem AlFardan and Kenneth Paterson
465+ see: http://www.isg.rhul.ac.uk/tls/
466+
467+ It also adds SHA2 certificate verification and better checks for malicious
468+ input.
469+
470+See normal build instructions below under 1.0.6.
471+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
472+
473+
474+*****************yaSSL Release notes, version 2.2.2 (7/5/2012)
475
476 This release of yaSSL contains bug fixes and more security checks around
477 malicious certificates.
478
479=== modified file 'extra/yassl/certs/ca-cert.pem'
480--- extra/yassl/certs/ca-cert.pem 2012-08-22 01:40:20 +0000
481+++ extra/yassl/certs/ca-cert.pem 2014-04-24 08:44:11 +0000
482@@ -1,56 +1,87 @@
483+-----BEGIN CERTIFICATE-----
484+MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
485+VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
486+A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
487+dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
488+MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
489+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
490+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
491+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
492+A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
493+8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
494+EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
495+dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
496+mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
497+CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
498+BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
499+P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
500+dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
501+BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
502+9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
503+BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
504+PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
505+Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
506+G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
507+ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
508+rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
509+-----END CERTIFICATE-----
510 Certificate:
511 Data:
512 Version: 3 (0x2)
513 Serial Number:
514- 8a:37:22:65:73:f5:aa:e8
515- Signature Algorithm: md5WithRSAEncryption
516- Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
517+ e9:d0:a7:5f:79:25:f4:3c
518+ Signature Algorithm: sha1WithRSAEncryption
519+ Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
520 Validity
521- Not Before: Jun 30 18:47:10 2010 GMT
522- Not After : Mar 26 18:47:10 2013 GMT
523- Subject: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
524+ Not Before: Oct 24 18:18:15 2011 GMT
525+ Not After : Jul 20 18:18:15 2014 GMT
526+ Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
527 Subject Public Key Info:
528 Public Key Algorithm: rsaEncryption
529- RSA Public Key: (512 bit)
530- Modulus (512 bit):
531- 00:97:30:b9:1a:92:ef:25:4f:ca:4c:11:31:95:1a:
532- e1:c0:10:19:0a:20:b9:37:80:1a:57:38:02:4e:1b:
533- c5:0f:28:4f:da:e3:c9:16:aa:50:bd:4a:fb:b7:71:
534- c7:35:cc:63:81:c1:dd:9d:33:f9:38:16:88:32:a0:
535- aa:56:23:03:a3
536+ RSA Public Key: (2048 bit)
537+ Modulus (2048 bit):
538+ 00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
539+ f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
540+ de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
541+ 21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
542+ 32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
543+ 8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
544+ a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
545+ a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
546+ 82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
547+ 3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
548+ 76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
549+ 73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
550+ de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
551+ cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
552+ b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
553+ 13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
554+ ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
555+ 36:79
556 Exponent: 65537 (0x10001)
557 X509v3 extensions:
558 X509v3 Subject Key Identifier:
559- 3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
560+ 27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
561 X509v3 Authority Key Identifier:
562- keyid:3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
563- DirName:/C=US/ST=Montana/L=Bozeman/O=sawtooth/OU=consulting/CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
564- serial:8A:37:22:65:73:F5:AA:E8
565+ keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
566+ DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
567+ serial:E9:D0:A7:5F:79:25:F4:3C
568
569 X509v3 Basic Constraints:
570 CA:TRUE
571- Signature Algorithm: md5WithRSAEncryption
572- 32:65:a2:b1:dc:6d:e0:8d:8b:c8:58:29:8e:b8:18:4b:62:88:
573- 13:67:f8:6c:75:46:75:8f:8a:19:a6:a3:d5:3c:fc:57:4e:7a:
574- 68:a9:fc:93:dc:ae:29:7d:bb:4e:ec:ea:55:fa:a4:e3:00:61:
575- f4:b0:34:6d:d1:d5:a4:64:24:f8
576------BEGIN CERTIFICATE-----
577-MIIDQDCCAuqgAwIBAgIJAIo3ImVz9aroMA0GCSqGSIb3DQEBBAUAMIGeMQswCQYD
578-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
579-A1UEChMIc2F3dG9vdGgxEzARBgNVBAsTCmNvbnN1bHRpbmcxJDAiBgNVBAMTG3d3
580-dy5zYXd0b290aC1jb25zdWx0aW5nLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5
581-YXNzbC5jb20wHhcNMTAwNjMwMTg0NzEwWhcNMTMwMzI2MTg0NzEwWjCBnjELMAkG
582-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
583-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
584-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
585-eWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJcwuRqS7yVPykwRMZUa
586-4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaqUL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYj
587-A6MCAwEAAaOCAQcwggEDMB0GA1UdDgQWBBQ7Zv2gQMb04nDPIRoMT2f+t0tCCTCB
588-0wYDVR0jBIHLMIHIgBQ7Zv2gQMb04nDPIRoMT2f+t0tCCaGBpKSBoTCBnjELMAkG
589-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
590-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
591-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
592-eWFzc2wuY29tggkAijciZXP1qugwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQF
593-AANBADJlorHcbeCNi8hYKY64GEtiiBNn+Gx1RnWPihmmo9U8/FdOemip/JPcril9
594-u07s6lX6pOMAYfSwNG3R1aRkJPg=
595------END CERTIFICATE-----
596+ Signature Algorithm: sha1WithRSAEncryption
597+ 5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
598+ 4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
599+ e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
600+ f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
601+ af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
602+ 98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
603+ 8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
604+ 1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
605+ 61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
606+ 1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
607+ 60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
608+ 18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
609+ f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
610+ b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
611+ 5a:1f:7f:ca
612
613=== modified file 'extra/yassl/certs/ca-key.pem'
614--- extra/yassl/certs/ca-key.pem 2012-07-24 13:24:00 +0000
615+++ extra/yassl/certs/ca-key.pem 2014-04-24 08:44:11 +0000
616@@ -1,9 +1,27 @@
617 -----BEGIN RSA PRIVATE KEY-----
618-MIIBOQIBAAJBAJcwuRqS7yVPykwRMZUa4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaq
619-UL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYjA6MCAwEAAQJAEQ9TY7c+uuQU/J5YDO4a
620-mRR37tegbq3Kyxqrz+p8QuhqLDtVh13GaF7rVU70vyNHm+cgihUyzho/PViAkPBo
621-qQIhAMU8/RDhDLgL5BxID4sxKIVBtg+imFSbyKVyg7oQLUcXAiEAxDu94O45Cf4a
622-np9R0thumY/QqWpCkycWAB7fFEuaf1UCIEH+bg4/vqm2ENUFp23DPPOZUPlaRe3J
623-UhFJh5mx3/RxAiBq++8vfHFYg1Lb/BxOCXVy/zdRxf753ytdcXdJx1Y56QIgVgpN
624-FNfYJofQfWaP96sjlc0usrT28uceHx0QmHqolVc=
625+MIIEpAIBAAKCAQEAvwzKLRSyHoRCW804H0ryTXUQ8bY1n9/KfQOY06zeA2buKvHY
626+sH1uB1QLEJghTYDLEiDnzE/eRX3Jcncy6sqQu2lSEAMvqPOVxfGLYlYb72dvpBBB
627+la0Km+OlwLDScHZQMFuo6AgsfO2nonqNOCkcrMft8nyVsJWCfUlcOM13Je+9gHVT
628+lDw9ymNbnxW10x0TLxnRPNt2Osy4fcnlwtfaQG/YIdxzG0ItU5z+Gvx9q3o2P5je
629+hHwFZ85qFDiHqfGMtWjLaH9xICv1oGP1Vi+jJtK3b7FaF9c4mQj+k1hv/sMTSQgW
630+C6dNZwBSMWcjTpjtUUUduQTZC+zYKLNLve02eQIDAQABAoIBAD1uTmAahH+dhXzh
631+Swd84NaZKt6d+TY0DncOPgjqT+UGJtT2OPffDQ8cLgai9CponGNy4zXmBJGRtcGx
632+pFSs18b7QaDWdW+9C06/sVLoX0kmmFZHx97p6jxgAb8o3DG/SV+TSYd6gVuWS03K
633+XDhPt+Gy08ch2jwShwfkG9xD7OjsVGHn9u2mCy7134J/xh9hGZykgznfIYWJb3ev
634+hhUyCKJaCyZh+3AMypw4fbwi7uujqBYA+YqAHgCEqEpB+IQDZy8jWy+baybDBzSU
635+owM7ctWfcuCtzDSrvcfV9SYwhQ8wIzlS/zzLmSFNiKWr7mK5x+C7R4fBac9z8zC+
636+zjkEnOUCgYEA4XZFgFm200nfCu8S1g/wt8sqN7+n+LVN9TE1reSjlKHb8ZattQVk
637+hYP8G1spqr74Jj92fq0c8MvXJrQbBY5Whn4IYiHBhtZHeT63XaTGOtexdCD2UJdB
638+BFPtPybWb5H6aCbsKtya8efc+3PweUMbIaNZBGNSB8nX5tEbXV6W+lMCgYEA2O1O
639+ZGFrkQxhAbUPu0RnUx7cB8Qkfp5shCORDOQSBBZNeJjMlj0gTg9Fmrb4s5MNsqIb
640+KfImecjF0nh+XnPy13Bhu0DOYQX+aR6CKeYUuKHnltAjPwWTAPLhTX7tt5Zs9/Dk
641+0c8BmE/cdFSqbV5aQTH+/5q2oAXdqRBU+GvQqoMCgYAh0wSKROtQt3xmv4cr5ihO
642+6oPi6TXh8hFH/6H1/J8t5TqB/AEDb1OtVCe2Uu7lVtETq+GzD3WQCoS0ocCMDNae
643+RrorPrUx7WO7pNUNj3LN0R4mNeu+G3L9mzm0h7cT9eqDRZOYuo/kSsy0TKh/CLpB
644+SahJKD1ePcHONwDL+SzdUQKBgQChV58+udavg22DP4/70NyozgMJI7GhG2PKxElW
645+NSvRLmVglQVVmRE1/dXfRMeliHJfsoJRqHFFkzbPXB9hUQwFgOivxXu6XiLjPHXD
646+hAVVbdY6LYSJkzPLONqqMQXNzmwt3VXTVwvwpTVqsK4xukOWygDHS+MZEkPTQvpv
647+6oDA0QKBgQC524kgNCdwYjTqXyViEvOdgb9I7poOwY0Q/2WanS0aipRayMClpYRh
648+ntQkue+pncl3C8dwZj26yFTf0jPh9X/5J2G+V0Xdt0UXJPUj5DgOkSfu4yDYFMiU
649+R3dAd0UYng3OeT9XMVYJSWe+lFhP9sSr4onj44rABVUsJMBKlwQnmg==
650 -----END RSA PRIVATE KEY-----
651
652=== modified file 'extra/yassl/certs/client-cert.pem'
653--- extra/yassl/certs/client-cert.pem 2012-08-22 01:40:20 +0000
654+++ extra/yassl/certs/client-cert.pem 2014-04-24 08:44:11 +0000
655@@ -2,54 +2,86 @@
656 Data:
657 Version: 3 (0x2)
658 Serial Number:
659- c5:d7:6c:11:36:f0:35:e1
660- Signature Algorithm: md5WithRSAEncryption
661- Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=info@yassl.com
662+ 87:4a:75:be:91:66:d8:3d
663+ Signature Algorithm: sha1WithRSAEncryption
664+ Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=info@yassl.com
665 Validity
666- Not Before: Jun 30 18:39:39 2010 GMT
667- Not After : Mar 26 18:39:40 2013 GMT
668- Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=info@yassl.com
669+ Not Before: Oct 24 18:21:55 2011 GMT
670+ Not After : Jul 20 18:21:55 2014 GMT
671+ Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=info@yassl.com
672 Subject Public Key Info:
673 Public Key Algorithm: rsaEncryption
674- RSA Public Key: (512 bit)
675- Modulus (512 bit):
676- 00:bd:51:4a:14:fd:6a:19:84:0c:33:38:fc:27:32:
677- 9c:97:0b:fc:a4:18:60:69:4e:d9:d8:78:50:0b:e9:
678- 20:5d:d6:1d:70:1c:0c:24:9f:23:82:cc:3a:01:d5:
679- 97:17:b2:73:6c:86:cf:b5:f1:e5:ce:68:0c:d9:a2:
680- 12:39:7c:f2:53
681+ RSA Public Key: (2048 bit)
682+ Modulus (2048 bit):
683+ 00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
684+ 2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
685+ 32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
686+ 68:a2:8b:67:bb:a1:75:c8:36:2c:4a:d2:1b:f7:8b:
687+ ba:cf:0d:f9:ef:ec:f1:81:1e:7b:9b:03:47:9a:bf:
688+ 65:cc:7f:65:24:69:a6:e8:14:89:5b:e4:34:f7:c5:
689+ b0:14:93:f5:67:7b:3a:7a:78:e1:01:56:56:91:a6:
690+ 13:42:8d:d2:3c:40:9c:4c:ef:d1:86:df:37:51:1b:
691+ 0c:a1:3b:f5:f1:a3:4a:35:e4:e1:ce:96:df:1b:7e:
692+ bf:4e:97:d0:10:e8:a8:08:30:81:af:20:0b:43:14:
693+ c5:74:67:b4:32:82:6f:8d:86:c2:88:40:99:36:83:
694+ ba:1e:40:72:22:17:d7:52:65:24:73:b0:ce:ef:19:
695+ cd:ae:ff:78:6c:7b:c0:12:03:d4:4e:72:0d:50:6d:
696+ 3b:a3:3b:a3:99:5e:9d:c8:d9:0c:85:b3:d9:8a:d9:
697+ 54:26:db:6d:fa:ac:bb:ff:25:4c:c4:d1:79:f4:71:
698+ d3:86:40:18:13:b0:63:b5:72:4e:30:c4:97:84:86:
699+ 2d:56:2f:d7:15:f7:7f:c0:ae:f5:fc:5b:e5:fb:a1:
700+ ba:d3
701 Exponent: 65537 (0x10001)
702 X509v3 extensions:
703 X509v3 Subject Key Identifier:
704- 5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
705+ 33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
706 X509v3 Authority Key Identifier:
707- keyid:5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
708- DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=programming/CN=www.yassl.com/emailAddress=info@yassl.com
709- serial:C5:D7:6C:11:36:F0:35:E1
710+ keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
711+ DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=Programming/CN=www.yassl.com/emailAddress=info@yassl.com
712+ serial:87:4A:75:BE:91:66:D8:3D
713
714 X509v3 Basic Constraints:
715 CA:TRUE
716- Signature Algorithm: md5WithRSAEncryption
717- b4:a5:f1:71:26:4d:b9:ff:54:f3:09:1f:ac:e1:19:59:e5:ec:
718- 57:e3:f1:0b:b2:8f:f3:29:eb:6b:c6:fa:27:33:3e:91:d0:77:
719- 43:c9:ce:1e:0f:71:07:a9:f7:26:e0:7e:ff:30:7d:52:0a:e1:
720- 80:48:46:bb:99:e9:d9:77:ce:75
721+ Signature Algorithm: sha1WithRSAEncryption
722+ 1c:7c:42:81:29:9e:21:cf:d0:d8:c1:54:6f:cc:ae:14:09:38:
723+ ff:68:98:9a:95:53:76:18:7b:e6:30:76:ec:28:0d:75:a7:de:
724+ e0:cd:8e:d5:55:23:6a:47:2b:4e:8d:fc:7d:06:a3:d8:0f:ad:
725+ 5e:d6:04:c9:00:33:fb:77:27:d3:b5:03:b3:7b:21:74:31:0b:
726+ 4a:af:2d:1a:b3:93:8e:cc:f3:5f:3d:90:3f:cc:e3:55:19:91:
727+ 7b:78:24:2e:4a:09:bb:18:4e:61:2d:9c:c6:0a:a0:34:91:88:
728+ 70:6b:3b:48:47:bc:79:94:a2:a0:4d:32:47:54:c2:a3:dc:2e:
729+ d2:51:4c:29:39:11:ff:e2:15:5e:58:97:36:f6:e9:06:06:86:
730+ 0e:8d:9d:95:03:72:b2:8b:19:7c:e9:14:6e:a1:88:73:68:58:
731+ 6d:71:5e:c2:d5:d3:13:d2:5f:de:ea:03:be:e2:00:40:e5:ce:
732+ fd:e6:92:31:57:c3:eb:bb:66:ac:cb:2f:1a:fa:e0:62:a2:47:
733+ f4:93:43:2a:4b:6c:5e:0a:2f:f9:e7:e6:4a:63:86:b0:ac:2a:
734+ a1:eb:b4:5b:67:cd:32:e4:b6:11:4b:9a:72:66:0d:a2:4a:76:
735+ 8f:fe:22:bc:83:fd:db:b7:d5:a9:ee:05:c9:b1:71:7e:1b:2b:
736+ e1:e3:af:c0
737 -----BEGIN CERTIFICATE-----
738-MIIDDjCCArigAwIBAgIJAMXXbBE28DXhMA0GCSqGSIb3DQEBBAUAMIGOMQswCQYD
739+MIIEmDCCA4CgAwIBAgIJAIdKdb6RZtg9MA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
740 VQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwG
741-A1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
742-eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMDA2
743-MzAxODM5MzlaFw0xMzAzMjYxODM5NDBaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
744+A1UEChMFeWFTU0wxFDASBgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
745+eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMTEw
746+MjQxODIxNTVaFw0xNDA3MjAxODIxNTVaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
747 CBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDAS
748-BgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
749-KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
750-QQC9UUoU/WoZhAwzOPwnMpyXC/ykGGBpTtnYeFAL6SBd1h1wHAwknyOCzDoB1ZcX
751-snNshs+18eXOaAzZohI5fPJTAgMBAAGjgfYwgfMwHQYDVR0OBBYEFFz3KSFpegl4
752-nnvNU0IC7M4pDRHfMIHDBgNVHSMEgbswgbiAFFz3KSFpegl4nnvNU0IC7M4pDRHf
753-oYGUpIGRMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQH
754-EwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5n
755-MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlh
756-c3NsLmNvbYIJAMXXbBE28DXhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
757-QQC0pfFxJk25/1TzCR+s4RlZ5exX4/ELso/zKetrxvonMz6R0HdDyc4eD3EHqfcm
758-4H7/MH1SCuGASEa7menZd851
759+BgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
760+KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
761+ADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9amNrIHMo7Quml7xsNE
762+ntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/Zcx/ZSRppugUiVvk
763+NPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE79fGjSjXk4c6W3xt+
764+v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX11JlJHOwzu8Zza7/
765+eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8lTMTRefRx04ZAGBOw
766+Y7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
767+M9hFZtdohxh+VA1wJ5HHJteFZcAwgcMGA1UdIwSBuzCBuIAUM9hFZtdohxh+VA1w
768+J5HHJteFZcChgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24x
769+ETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQKEwV5YVNTTDEUMBIGA1UECxMLUHJv
770+Z3JhbW1pbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEW
771+DmluZm9AeWFzc2wuY29tggkAh0p1vpFm2D0wDAYDVR0TBAUwAwEB/zANBgkqhkiG
772+9w0BAQUFAAOCAQEAHHxCgSmeIc/Q2MFUb8yuFAk4/2iYmpVTdhh75jB27CgNdafe
773+4M2O1VUjakcrTo38fQaj2A+tXtYEyQAz+3cn07UDs3shdDELSq8tGrOTjszzXz2Q
774+P8zjVRmRe3gkLkoJuxhOYS2cxgqgNJGIcGs7SEe8eZSioE0yR1TCo9wu0lFMKTkR
775+/+IVXliXNvbpBgaGDo2dlQNysosZfOkUbqGIc2hYbXFewtXTE9Jf3uoDvuIAQOXO
776+/eaSMVfD67tmrMsvGvrgYqJH9JNDKktsXgov+efmSmOGsKwqoeu0W2fNMuS2EUua
777+cmYNokp2j/4ivIP927fVqe4FybFxfhsr4eOvwA==
778 -----END CERTIFICATE-----
779
780=== modified file 'extra/yassl/certs/client-key.pem'
781--- extra/yassl/certs/client-key.pem 2012-08-22 01:40:20 +0000
782+++ extra/yassl/certs/client-key.pem 2014-04-24 08:44:11 +0000
783@@ -1,9 +1,27 @@
784 -----BEGIN RSA PRIVATE KEY-----
785-MIIBPAIBAAJBAL1RShT9ahmEDDM4/CcynJcL/KQYYGlO2dh4UAvpIF3WHXAcDCSf
786-I4LMOgHVlxeyc2yGz7Xx5c5oDNmiEjl88lMCAwEAAQJAVGHWLlLhpqvXsEEXCvWh
787-HCYono+K8YVGzhiaPSTU212fCoQryIxsXQKGBjhFdZm96DZWp+Vd/t/u+B4ZeaqY
788-+QIhAOBEfbFtdZqk5OmbbRsRVPI7+YYmubgY1TVIPqmxHQ4NAiEA2BrTQkjOb3ul
789-A/SZO04fJUZsm7Ng92FWHDJsRancSd8CIQCmGbQqZBK1TamJZ6dAY+7RViAx/p6Q
790-vjuzMeXPUrFdRQIhAMkfBhg9bCqjFyt8PBPOm/vz8+ZgZlE0/JAXeV7IPCVfAiEA
791-gZwCFm1ghGxmaoB424YC4DHeDeN/g9xwJHT7EuM9Mvc=
792+MIIEpAIBAAKCAQEAwwPRK/45pDJFO1PIhCsqfHSavaoqUgdH1qY2sgcyjtC6aXvG
793+w0Se1IFI/S1oootnu6F1yDYsStIb94u6zw357+zxgR57mwNHmr9lzH9lJGmm6BSJ
794+W+Q098WwFJP1Z3s6enjhAVZWkaYTQo3SPECcTO/Rht83URsMoTv18aNKNeThzpbf
795+G36/TpfQEOioCDCBryALQxTFdGe0MoJvjYbCiECZNoO6HkByIhfXUmUkc7DO7xnN
796+rv94bHvAEgPUTnINUG07ozujmV6dyNkMhbPZitlUJttt+qy7/yVMxNF59HHThkAY
797+E7BjtXJOMMSXhIYtVi/XFfd/wK71/Fvl+6G60wIDAQABAoIBAQCi5thfEHFkCJ4u
798+bdFtHoXSCrGMR84sUWqgEp5T3pFMHW3qWXvyd6rZxtmKq9jhFuRjJv+1bBNZuOOl
799+yHIXLgyfb+VZP3ZvSbERwlouFikN3reO3EDVou7gHqH0vpfbhmOWFM2YCWAtMHac
800+PM3miO5HknkLWgDiXl8RfH35CLcgBokqXf0AqyLh8LO8JKleJg4fAC3+IZpTW23T
801+K6uUgmhDNtj2L8Yi/LVBXQ0zYOqkfX7oS1WRVtNcV48flBcvqt7pnqj0z4pMjqDk
802+VnOyz0+GxWk88yQgi1yWDPprEjuaZ8HfxpaypdWSDZsJQmgkEEXUUOQXOUjQNYuU
803+bRHej8pZAoGBAOokp/lpM+lx3FJ9iCEoL0neunIW6cxHeogNlFeEWBY6gbA/os+m
804+bB6wBikAj+d3dqzbysfZXps/JpBSrvw4kAAUu7QPWJTnL2p+HE9BIdQxWR9OihqN
805+p1dsItjl9H4yphDLZKVVA4emJwWMw9e2J7JNujDaR49U0z2LhI2UmFilAoGBANU4
806+G8OPxZMMRwtvNZLFsI1GyJIYj/WACvfvof6AubUqusoYsF2lB9CTjdicBBzUYo6m
807+JoEB/86KKmM0NUCqbYDeiSNqV02ebq2TTlaQC22dc4sMric93k7wqsVseGdslFKc
808+N2dsLe+7r9+mkDzER8+Nlp6YqbSfxaZQ3LPw+3QXAoGAXoMJYr26fKK/QnT1fBzS
809+ackEDYV+Pj0kEsMYe/Mp818OdmxZdeRBhGmdMvPNIquwNbpKsjzl2Vi2Yk9d3uWe
810+CspTsiz3nrNrClt5ZexukU6SIPb8/Bbt03YM4ux/smkTa3gOWkZktF63JaBadTpL
811+78c8Pvf9JrggxJkKmnO+wxkCgYEAukSTFKw0GTtfkWCs97TWgQU2UVM96GXcry7c
812+YT7Jfbh/h/A7mwOCKTfOck4R1bHBDAegmZFKjX/sec/xObXphexi99p9vGRNIjwO
813+8tZR9YfYmcARIF0PKf1b4q7ZHNkhVm38hNBf7RAVHBgh58Q9S9fQnmqVzyLJA3ue
814+42AB/C8CgYAR0EvPG2e5nxB1R4ZlrjHCxjCsWQZQ2Q+1cAb38NPIYnyo2m72IT/T
815+f1/qiqs/2Spe81HSwjA34y2jdQ0eTSE01VdwXIm/cuxKbmjVzRh0M06MOkWP5pZA
816+62P5GYY6Ud2JS7Dz+Z9dKJU4vjWrylznk1M0oUVdEzllQkahn831vw==
817 -----END RSA PRIVATE KEY-----
818
819=== modified file 'extra/yassl/certs/client-keyEnc.pem'
820--- extra/yassl/certs/client-keyEnc.pem 2012-07-24 13:24:00 +0000
821+++ extra/yassl/certs/client-keyEnc.pem 2014-04-24 08:44:11 +0000
822@@ -2,11 +2,29 @@
823 Proc-Type: 4,ENCRYPTED
824 DEK-Info: DES-CBC,B9D8FB94E38635AB
825
826-e7bVyzL1RF6p7hl8GDaOrRTcgB4ip+pWWUcnNf6y2tsuAQx/c/Bd5c9ZDc3L5AXC
827-oOAzWYB+ay1vWkmAQB4ivFS5QzGDf8870d4FbOejwmgPhiHdZNw5xNwscAN6ps0v
828-dFaUrR9nzWmbycsQCjXZGIZtGFCtXkA8Gdl5OMO4o+rzM0muNPS5fb++x7oNl1YG
829-gjReu2sQ85dPfMlnoHhr8Pz9LBcxVyOmcqtmT0SOSuPcoj6aDtcZ+EY9MQf6SR9E
830-ysmrJKMtp+ABgXglAj5hbT0dMpoJ2KpJYk62JAh/A6DDyv5YYUI0W57xY5+QzaV+
831-YXnIvqwLjJ3cXEV4YH7ozLHAESgnAAUoQsin42rrRKt7GxjSdBoFhWjH69V2nl65
832-LYRNjE1O5BBEX+rz0S+fe2ZZgT17kUr7eLZCq15J+L5xWQ7R4ERc0w==
833+3OTcffWLy2Ddlu2oUwnMWkvIb3e9wLL1jrKOpC0aeb//uiawgw50+KuU4pewB5fN
834+lfEJwpX4NjfPL+Nk+B1VAVrv5gwk5/SY9SwIJluutzmGS4TfVOhqi2SVd0mc9kOD
835+cSWQ9ltAohFu67jdx36j2u+eghDTOjls1lM8EpzL5cu3Bp4G+ST0nXAdnGtSZdV6
836+eToLWjIHiC/JqeRSsKAlG0M5verw14sbb5MO4ZQF4Tdu0fCFgFvDSUM2V4ZLtS1N
837+VysLEkHoF56YKZ5H2FYLxOVDpn5lSiLnOgRbteEzsysyJ1zLxXWFFwJPCpLVNL0e
838+P7OoEoCR+oAdzGkkPF+EdMoULtQP+n6U7jGx3oFVS17NORIFvyxyP0hD4pGTGLnl
839+qAEk30lhKGAE5GgvA2itxZIno/sxPKr5T5Sc2yWh9RdQuLWYNrOb8Kz8J1iXV5l6
840+/5TLGu5XVWIlBnUtjMFUe5M54tqGQ6SuDUlL2ud5YeLVN0T+RU/bqV2fXGoBUqKb
841+Oe8PECm62Ls0wjv27BIOXXV32WSXwsywSzBqq2YXZ5zc9Q0+Mf1Zl6jKwcr8rXhv
842+rA2kcpicONryggsPZnn/us1bVuWKndsCbm7A5om6HowpamNMPuxhISigzzE59L6X
843+X6Sl2F0N0zhrfUVlAAlfYTrwcQVtyBDj1xp2nzJFocurJt9EylLaT0Sw3nxWtuOg
844+yQuF05UPCzxqow/7dMVqtQKng0ptpsn/E+Kr/Egk1YaTpUUxref6mD3R1S+qWML8
845+uqTa3y1CWd4u+aJZH2oZU3gmEd8GvuWnmhsw8iTyq1bzYIga1rQZqh4W5Ok9V+jR
846+GioT/x3mTIhtuEZ1Cmhne5qM3gWYgM3rC3D4+RnUFeThOC5lHtOYHtIEpg66cs7g
847+QYAn75ghEkyfG7ZvdxAU9Ngn6hckux9tFu3GmeEtdqhVOHaOMaYi60uGSk6uBnTv
848+P1sUqi70kMrIBWU7TgldKlTqVdReM87Nkb2O5v1xqtoswLWIi65hFWTqt/H65c1H
849+aEBG1cBqnqBMYuFk8b4TzZbuU9o1UKj0/6N5mpm//BmW65B0htEDP7IYpGF0mt0H
850+LkU+4ISmuLfPfQeviYio6/yASaFkHpxfK7N8CQvmyAG9U8FHRio2QCGSb2EO+BnT
851+Bti6L9oMiQbAsCLWTbvBhCVxdncFw1ncq8gkPMXjEEVUsqAo5Kg+903pRHUyHLzS
852+R6R3C6tTJnNtucJ0zqQMF3K1FHS1m8GrOm+hskJLTHgZLdz6tFTYkXfZBSCwIl7s
853+plg0wq9CrNC2B8MczWn/j3/h7qSI3wBNqADHMdoiOHECffCeyGEYjW3+0iMoj1m1
854+wY0DIym4DDRzk6wsEesxVi8iiCVpYwWnjJAvWYECEO+hWuwCez+eGVkhCT/5g3xW
855+hPSRhivNuJT05tdR5o+yqONHn1eAQH7Ar3cj+neY5WC0iS5FK9axTqbHXotofD1e
856+pJX17ZVWsmIIpRvAWGD+LOcfTMZsaB9DJbkrPSWlMW3lC2S5JOq8OgfMNWIDDUN1
857+guwpK5Z/lWV1qMMnaWeDVgPH/G0FssECXlCU5+/Ol654h8tm2bRXYAYHPM+OoW67
858 -----END RSA PRIVATE KEY-----
859
860=== modified file 'extra/yassl/certs/dsa-cert.pem'
861--- extra/yassl/certs/dsa-cert.pem 2012-08-22 01:40:20 +0000
862+++ extra/yassl/certs/dsa-cert.pem 2014-04-24 08:44:11 +0000
863@@ -1,70 +1,22 @@
864-Certificate:
865- Data:
866- Version: 3 (0x2)
867- Serial Number:
868- ce:df:23:31:64:b4:13:da
869- Signature Algorithm: dsaWithSHA1
870- Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=info@yassl.com
871- Validity
872- Not Before: Jun 30 18:56:38 2010 GMT
873- Not After : Mar 26 18:56:39 2013 GMT
874- Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=info@yassl.com
875- Subject Public Key Info:
876- Public Key Algorithm: dsaEncryption
877- DSA Public Key:
878- pub:
879- 04:84:a0:26:31:72:0c:e8:4f:5d:53:17:62:b1:80:
880- ca:c0:16:5f:c3:1e:ea:c5:d9:98:38:f9:be:56:53:
881- 47:68:ce:08:22:57:1c:bb:0d:77:91:cf:5b:36:ed:
882- f3:24:82:90:8a:cd:90:7c:db:77:f9:17:2d:73:73:
883- ef:bb:b9:82
884- P:
885- 00:99:29:69:80:c9:3c:98:68:45:a9:82:fe:67:eb:
886- 95:88:c5:b4:0c:d6:26:45:95:19:2c:a0:20:5b:7e:
887- df:69:e9:dc:c3:0f:f3:61:0a:25:9b:f2:21:01:6a:
888- cd:aa:8c:37:e7:ca:66:db:56:f4:0f:7d:7a:d1:18:
889- b9:42:fd:1b:11
890- Q:
891- 00:ad:25:29:ab:0a:9f:09:1c:c1:ad:03:20:76:7f:
892- a6:b7:dd:4d:03:09
893- G:
894- 12:88:99:da:e7:d0:0b:93:9b:e6:ee:3c:21:7f:9c:
895- b3:b4:8d:a5:8c:e2:37:80:3f:17:d1:81:4f:bd:f0:
896- 71:b6:32:08:54:dd:bf:01:e2:b3:77:06:64:75:8a:
897- 04:d6:79:39:b1:02:03:03:c6:06:74:e5:90:05:0a:
898- 10:46:19:31
899- X509v3 extensions:
900- X509v3 Subject Key Identifier:
901- BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
902- X509v3 Authority Key Identifier:
903- keyid:BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
904- DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=testing/CN=www.yassl.com/emailAddress=info@yassl.com
905- serial:CE:DF:23:31:64:B4:13:DA
906-
907- X509v3 Basic Constraints:
908- CA:TRUE
909- Signature Algorithm: dsaWithSHA1
910- 30:2d:02:14:00:a3:21:20:34:6a:2c:f9:fb:76:d7:20:c9:c0:
911- 35:1b:64:9a:c2:83:02:15:00:a4:59:ac:6d:da:85:48:ff:f5:
912- 0d:49:72:c8:cd:91:fc:ec:2f:5c:63
913 -----BEGIN CERTIFICATE-----
914-MIIDfjCCAz2gAwIBAgIJAM7fIzFktBPaMAkGByqGSM44BAMwgYoxCzAJBgNVBAYT
915-AlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQK
916-EwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNv
917-bTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTAwNjMwMTg1NjM4
918-WhcNMTMwMzI2MTg1NjM5WjCBijELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdv
919-bjERMA8GA1UEBxMIUG9ydGxhbmQxDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwd0
920-ZXN0aW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5p
921-bmZvQHlhc3NsLmNvbTCB8DCBqAYHKoZIzjgEATCBnAJBAJkpaYDJPJhoRamC/mfr
922-lYjFtAzWJkWVGSygIFt+32np3MMP82EKJZvyIQFqzaqMN+fKZttW9A99etEYuUL9
923-GxECFQCtJSmrCp8JHMGtAyB2f6a33U0DCQJAEoiZ2ufQC5Ob5u48IX+cs7SNpYzi
924-N4A/F9GBT73wcbYyCFTdvwHis3cGZHWKBNZ5ObECAwPGBnTlkAUKEEYZMQNDAAJA
925-BISgJjFyDOhPXVMXYrGAysAWX8Me6sXZmDj5vlZTR2jOCCJXHLsNd5HPWzbt8ySC
926-kIrNkHzbd/kXLXNz77u5gqOB8jCB7zAdBgNVHQ4EFgQUvvmMXdYctO6B3TZWCiHk
927-YURz6eIwgb8GA1UdIwSBtzCBtIAUvvmMXdYctO6B3TZWCiHkYURz6eKhgZCkgY0w
928-gYoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRs
929-YW5kMQ4wDAYDVQQKEwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMN
930-d3d3Lnlhc3NsLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb22CCQDO
931-3yMxZLQT2jAMBgNVHRMEBTADAQH/MAkGByqGSM44BAMDMAAwLQIUAKMhIDRqLPn7
932-dtcgycA1G2SawoMCFQCkWaxt2oVI//UNSXLIzZH87C9cYw==
933+MIIDqzCCA2ugAwIBAgIJAMGqrgDU6DyhMAkGByqGSM44BAMwgY4xCzAJBgNVBAYT
934+AlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQK
935+DAd3b2xmU1NMMRAwDgYDVQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wu
936+Y29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTEzMDQyMjIw
937+MDk0NFoXDTE2MDExNzIwMDk0NFowgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZP
938+cmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQKDAd3b2xmU1NMMRAwDgYD
939+VQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wuY29tMR8wHQYJKoZIhvcN
940+AQkBFhBpbmZvQHdvbGZzc2wuY29tMIIBuDCCASwGByqGSM44BAEwggEfAoGBAL1R
941+7koy4IrH6sbh6nDEUUPPKgfhxxLCWCVexF2+qzANEr+hC9M002haJXFOfeS9DyoO
942+WFbL0qMZOuqv+22CaHnoUWl7q3PjJOAI3JH0P54ZyUPuU1909RzgTdIDp5+ikbr7
943+KYjnltL73FQVMbjTZQKthIpPn3MjYcF+4jp2W2zFAhUAkcntYND6MGf+eYzIJDN2
944+L7SonHUCgYEAklpxErfqznIZjVvqqHFaq+mgAL5J8QrKVmdhYZh/Y8z4jCjoCA8o
945+TDoFKxf7s2ZzgaPKvglaEKiYqLqic9qY78DYJswzQMLFvjsF4sFZ+pYCBdWPQI4N
946+PgxCiznK6Ce+JH9ikSBvMvG+tevjr2UpawDIHX3+AWYaZBZwKADAaboDgYUAAoGB
947+AJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caaDDa0XJ7ak6A7
948+TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WXS0kk3m/DHaC0
949+3ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVo1AwTjAdBgNVHQ4EFgQU
950+IJjk416o4v8qpH9LBtXlR9v8gccwHwYDVR0jBBgwFoAUIJjk416o4v8qpH9LBtXl
951+R9v8gccwDAYDVR0TBAUwAwEB/zAJBgcqhkjOOAQDAy8AMCwCFCjGKIdOSV12LcTu
952+k08owGM6YkO1AhQe+K173VuaO/OsDNsxZlKpyH8+1g==
953 -----END CERTIFICATE-----
954
955=== modified file 'extra/yassl/certs/server-cert.pem'
956--- extra/yassl/certs/server-cert.pem 2012-08-22 01:40:20 +0000
957+++ extra/yassl/certs/server-cert.pem 2014-04-24 08:44:11 +0000
958@@ -1,39 +1,157 @@
959 Certificate:
960 Data:
961 Version: 1 (0x0)
962- Serial Number: 1 (0x1)
963- Signature Algorithm: md5WithRSAEncryption
964- Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
965+ Serial Number: 2 (0x2)
966+ Signature Algorithm: sha1WithRSAEncryption
967+ Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
968 Validity
969- Not Before: Jun 30 18:52:17 2010 GMT
970- Not After : Mar 26 18:52:17 2013 GMT
971- Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=support, CN=www.yassl.com/emailAddress=info@yassl.com
972+ Not Before: Oct 24 18:27:13 2011 GMT
973+ Not After : Jul 20 18:27:13 2014 GMT
974+ Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=Support, CN=www.yassl.com/emailAddress=info@yassl.com
975 Subject Public Key Info:
976 Public Key Algorithm: rsaEncryption
977- RSA Public Key: (512 bit)
978- Modulus (512 bit):
979- 00:c6:7b:c0:68:81:2f:de:82:3f:f9:ac:c3:86:4a:
980- 66:b7:ec:d4:f1:f6:64:21:ff:f5:a2:34:42:d0:38:
981- 9f:c6:dd:3b:6e:26:65:6a:54:96:dd:d2:7b:eb:36:
982- a2:ae:7e:2a:9e:7e:56:a5:b6:87:9f:15:c7:18:66:
983- 7e:16:77:e2:a7
984+ RSA Public Key: (2048 bit)
985+ Modulus (2048 bit):
986+ 00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
987+ 01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
988+ f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
989+ f7:8a:ca:07:e7:35:2f:8f:e1:bd:7b:c0:2f:7c:ab:
990+ 64:a8:17:fc:ca:5d:7b:ba:e0:21:e5:72:2e:6f:2e:
991+ 86:d8:95:73:da:ac:1b:53:b9:5f:3f:d7:19:0d:25:
992+ 4f:e1:63:63:51:8b:0b:64:3f:ad:43:b8:a5:1c:5c:
993+ 34:b3:ae:00:a0:63:c5:f6:7f:0b:59:68:78:73:a6:
994+ 8c:18:a9:02:6d:af:c3:19:01:2e:b8:10:e3:c6:cc:
995+ 40:b4:69:a3:46:33:69:87:6e:c4:bb:17:a6:f3:e8:
996+ dd:ad:73:bc:7b:2f:21:b5:fd:66:51:0c:bd:54:b3:
997+ e1:6d:5f:1c:bc:23:73:d1:09:03:89:14:d2:10:b9:
998+ 64:c3:2a:d0:a1:96:4a:bc:e1:d4:1a:5b:c7:a0:c0:
999+ c1:63:78:0f:44:37:30:32:96:80:32:23:95:a1:77:
1000+ ba:13:d2:97:73:e2:5d:25:c9:6a:0d:c3:39:60:a4:
1001+ b4:b0:69:42:42:09:e9:d8:08:bc:33:20:b3:58:22:
1002+ a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
1003+ ad:d7
1004 Exponent: 65537 (0x10001)
1005- Signature Algorithm: md5WithRSAEncryption
1006- 58:a9:98:e7:16:52:4c:40:e7:e1:47:92:19:1b:3a:8f:97:6c:
1007- 7b:b7:b0:cb:20:6d:ad:b5:d3:47:58:d8:e4:f2:3e:32:e9:ef:
1008- 87:77:e5:54:36:f4:8d:50:8d:07:b4:77:45:ea:9d:a4:33:36:
1009- 9b:0b:e0:74:58:11:c5:01:7b:4d
1010+ Signature Algorithm: sha1WithRSAEncryption
1011+ 71:4e:d3:62:df:cc:4c:f7:cd:b7:6e:52:0b:6c:6e:e0:bd:c2:
1012+ 2d:07:d7:c0:b0:6e:43:1e:35:bc:30:01:50:f0:ff:99:23:6c:
1013+ 18:1a:41:b6:11:d6:d4:19:61:fd:e4:77:97:1c:39:e1:57:ab:
1014+ c5:15:63:77:11:36:5e:74:e2:24:0b:1f:41:78:ad:b7:81:e7:
1015+ b4:40:66:80:f0:4b:91:a0:6d:a8:6e:3d:53:d9:8b:ce:2a:e1:
1016+ 0b:45:65:87:a1:96:ae:ee:3e:88:d5:12:1f:78:17:ae:2c:c5:
1017+ 73:44:d8:dc:f4:af:d8:cc:ae:4c:e1:0c:be:55:a4:99:f7:6e:
1018+ 96:c0:c8:45:87:bf:dc:51:57:ff:9e:73:37:6a:18:9c:c3:f9:
1019+ 22:7a:f4:b0:52:bd:fc:21:30:f8:c5:ff:1e:87:7d:ad:a2:5a:
1020+ 35:f5:22:a8:b4:0a:76:38:e6:76:b0:98:af:1b:ec:8a:0a:43:
1021+ 74:d2:85:34:37:84:07:e1:f6:23:b2:29:de:a6:b6:b7:4c:57:
1022+ 7e:96:06:cb:a9:16:25:29:3a:03:2d:55:7d:a6:8c:a4:f7:9e:
1023+ 81:c9:95:b6:7c:c1:4a:ce:94:66:0c:ca:88:eb:d2:09:f5:5b:
1024+ 19:58:82:df:27:fd:67:95:78:b7:02:06:d5:a7:61:bd:ef:3a:
1025+ fc:b2:61:cd
1026 -----BEGIN CERTIFICATE-----
1027-MIICFDCCAb4CAQEwDQYJKoZIhvcNAQEEBQAwgZ4xCzAJBgNVBAYTAlVTMRAwDgYD
1028-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhzYXd0b290
1029-aDETMBEGA1UECxMKY29uc3VsdGluZzEkMCIGA1UEAxMbd3d3LnNhd3Rvb3RoLWNv
1030-bnN1bHRpbmcuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0x
1031-MDA2MzAxODUyMTdaFw0xMzAzMjYxODUyMTdaMIGKMQswCQYDVQQGEwJVUzEQMA4G
1032-A1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjEOMAwGA1UEChMFeWFTU0wx
1033-EDAOBgNVBAsTB3N1cHBvcnQxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkq
1034-hkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
1035-AMZ7wGiBL96CP/msw4ZKZrfs1PH2ZCH/9aI0QtA4n8bdO24mZWpUlt3Se+s2oq5+
1036-Kp5+VqW2h58VxxhmfhZ34qcCAwEAATANBgkqhkiG9w0BAQQFAANBAFipmOcWUkxA
1037-5+FHkhkbOo+XbHu3sMsgba2100dY2OTyPjLp74d35VQ29I1QjQe0d0XqnaQzNpsL
1038-4HRYEcUBe00=
1039+MIIDkDCCAngCAQIwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVTMRAwDgYD
1040+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
1041+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
1042+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTExMDI0MTgyNzEzWhcN
1043+MTQwNzIwMTgyNzEzWjCBijELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmEx
1044+EDAOBgNVBAcTB0JvemVtYW4xDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwdTdXBw
1045+b3J0MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZv
1046+QHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFX
1047+QfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/h
1048+vXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4
1049+pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo
1050+3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4
1051+D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHm
1052+YYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU7TYt/MTPfNt25S
1053+C2xu4L3CLQfXwLBuQx41vDABUPD/mSNsGBpBthHW1Blh/eR3lxw54VerxRVjdxE2
1054+XnTiJAsfQXitt4HntEBmgPBLkaBtqG49U9mLzirhC0Vlh6GWru4+iNUSH3gXrizF
1055+c0TY3PSv2MyuTOEMvlWkmfdulsDIRYe/3FFX/55zN2oYnMP5Inr0sFK9/CEw+MX/
1056+Hod9raJaNfUiqLQKdjjmdrCYrxvsigpDdNKFNDeEB+H2I7Ip3qa2t0xXfpYGy6kW
1057+JSk6Ay1VfaaMpPeegcmVtnzBSs6UZgzKiOvSCfVbGViC3yf9Z5V4twIG1adhve86
1058+/LJhzQ==
1059 -----END CERTIFICATE-----
1060+Certificate:
1061+ Data:
1062+ Version: 3 (0x2)
1063+ Serial Number:
1064+ e9:d0:a7:5f:79:25:f4:3c
1065+ Signature Algorithm: sha1WithRSAEncryption
1066+ Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
1067+ Validity
1068+ Not Before: Oct 24 18:18:15 2011 GMT
1069+ Not After : Jul 20 18:18:15 2014 GMT
1070+ Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
1071+ Subject Public Key Info:
1072+ Public Key Algorithm: rsaEncryption
1073+ RSA Public Key: (2048 bit)
1074+ Modulus (2048 bit):
1075+ 00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
1076+ f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
1077+ de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
1078+ 21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
1079+ 32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
1080+ 8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
1081+ a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
1082+ a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
1083+ 82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
1084+ 3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
1085+ 76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
1086+ 73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
1087+ de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
1088+ cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
1089+ b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
1090+ 13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
1091+ ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
1092+ 36:79
1093+ Exponent: 65537 (0x10001)
1094+ X509v3 extensions:
1095+ X509v3 Subject Key Identifier:
1096+ 27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
1097+ X509v3 Authority Key Identifier:
1098+ keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
1099+ DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
1100+ serial:E9:D0:A7:5F:79:25:F4:3C
1101+
1102+ X509v3 Basic Constraints:
1103+ CA:TRUE
1104+ Signature Algorithm: sha1WithRSAEncryption
1105+ 5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
1106+ 4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
1107+ e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
1108+ f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
1109+ af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
1110+ 98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
1111+ 8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
1112+ 1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
1113+ 61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
1114+ 1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
1115+ 60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
1116+ 18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
1117+ f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
1118+ b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
1119+ 5a:1f:7f:ca
1120+-----BEGIN CERTIFICATE-----
1121+MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
1122+VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
1123+A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
1124+dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
1125+MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
1126+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
1127+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
1128+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
1129+A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
1130+8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
1131+EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
1132+dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
1133+mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
1134+CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
1135+BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
1136+P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
1137+dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
1138+BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
1139+9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
1140+BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
1141+PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
1142+Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
1143+G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
1144+ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
1145+rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
1146
1147=== modified file 'extra/yassl/certs/server-key.pem'
1148--- extra/yassl/certs/server-key.pem 2012-08-22 01:40:20 +0000
1149+++ extra/yassl/certs/server-key.pem 2014-04-24 08:44:11 +0000
1150@@ -1,9 +1,27 @@
1151 -----BEGIN RSA PRIVATE KEY-----
1152-MIIBOwIBAAJBAMZ7wGiBL96CP/msw4ZKZrfs1PH2ZCH/9aI0QtA4n8bdO24mZWpU
1153-lt3Se+s2oq5+Kp5+VqW2h58VxxhmfhZ34qcCAwEAAQJBAJSbGxgjgV+rTZL2Ev58
1154-viN/IoB25cm/Bn4Heu7DNn2A2kpdGX2cCaf7rEQoIKCiHxvopvxOcd/7nLS/gNli
1155-dCECIQD/cX/9fvB1Uajw0fmvwNON9+3P9uJSqpig90zL32pwjQIhAMbqee9TBMN4
1156-TxXbgWqA92PrCXe8WDZ3PwoJqdR6MRUDAiEAny+TDF1z6hiWiGTCDgXDkKBlwgjf
1157-p5aKgR077XzwLu0CICVpWEGg1ZaF/CnaPP7w/pZ2UDOK4vRrfRnAM4bY7H5NAiBS
1158-1eXJ/MCZ2uPfpl7XK2BU9P69KdKUk5WHxdRchVvcDg==
1159+MIIEpQIBAAKCAQEAwJUI4VdB8nFtt9JFQScBZcZFrvK8JDC4lc4vTtb2HIi8fJ/7
1160+qGd//lycUXX3isoH5zUvj+G9e8AvfKtkqBf8yl17uuAh5XIuby6G2JVz2qwbU7lf
1161+P9cZDSVP4WNjUYsLZD+tQ7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDj
1162+xsxAtGmjRjNph27Euxem8+jdrXO8ey8htf1mUQy9VLPhbV8cvCNz0QkDiRTSELlk
1163+wyrQoZZKvOHUGlvHoMDBY3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlC
1164+Qgnp2Ai8MyCzWCKnquvE4eZhg8XSlt/Z0E+t1wIDAQABAoIBAQCa0DQPUmIFUAHv
1165+n+1kbsLE2hryhNeSEEiSxOlq64t1bMZ5OPLJckqGZFSVd8vDmp231B2kAMieTuTd
1166+x7pnFsF0vKnWlI8rMBr77d8hBSPZSjm9mGtlmrjcxH3upkMVLj2+HSJgKnMw1T7Y
1167+oqyGQy7E9WReP4l1DxHYUSVOn9iqo85gs+KK2X4b8GTKmlsFC1uqy+XjP24yIgXz
1168+0PrvdFKB4l90073/MYNFdfpjepcu1rYZxpIm5CgGUFAOeC6peA0Ul7QS2DFAq6EB
1169+QcIw+AdfFuRhd9Jg8p+N6PS662PeKpeB70xs5lU0USsoNPRTHMRYCj+7r7X3SoVD
1170+LTzxWFiBAoGBAPIsVHY5I2PJEDK3k62vvhl1loFk5rW4iUJB0W3QHBv4G6xpyzY8
1171+ZH3c9Bm4w2CxV0hfUk9ZOlV/MsAZQ1A/rs5vF/MOn0DKTq0VO8l56cBZOHNwnAp8
1172+yTpIMqfYSXUKhcLC/RVz2pkJKmmanwpxv7AEpox6Wm9IWlQ7xrFTF9/nAoGBAMuT
1173+3ncVXbdcXHzYkKmYLdZpDmOzo9ymzItqpKISjI57SCyySzfcBhh96v52odSh6T8N
1174+zRtfr1+elltbD6F8r7ObkNtXczrtsCNErkFPHwdCEyNMy/r0FKTV9542fFufqDzB
1175+hV900jkt/9CE3/uzIHoumxeu5roLrl9TpFLtG8SRAoGBAOyY2rvV/vlSSn0CVUlv
1176+VW5SL4SjK7OGYrNU0mNS2uOIdqDvixWl0xgUcndex6MEH54ZYrUbG57D8rUy+UzB
1177+qusMJn3UX0pRXKRFBnBEp1bA1CIUdp7YY1CJkNPiv4GVkjFBhzkaQwsYpVMfORpf
1178+H0O8h2rfbtMiAP4imHBOGhkpAoGBAIpBVihRnl/Ungs7mKNU8mxW1KrpaTOFJAza
1179+1AwtxL9PAmk4fNTm3Ezt1xYRwz4A58MmwFEC3rt1nG9WnHrzju/PisUr0toGakTJ
1180+c/5umYf4W77xfOZltU9s8MnF/xbKixsX4lg9ojerAby/QM5TjI7t7+5ZneBj5nxe
1181+9Y5L8TvBAoGATUX5QIzFW/QqGoq08hysa+kMVja3TnKW1eWK0uL/8fEYEz2GCbjY
1182+dqfJHHFSlDBD4PF4dP1hG0wJzOZoKnGtHN9DvFbbpaS+NXCkXs9P/ABVmTo9I89n
1183+WvUi+LUp0EQR6zUuRr79jhiyX6i/GTKh9dwD5nyaHwx8qbAOITc78bA=
1184 -----END RSA PRIVATE KEY-----
1185
1186=== modified file 'extra/yassl/certs/server-keyEnc.pem'
1187--- extra/yassl/certs/server-keyEnc.pem 2012-07-24 13:24:00 +0000
1188+++ extra/yassl/certs/server-keyEnc.pem 2014-04-24 08:44:11 +0000
1189@@ -2,11 +2,29 @@
1190 Proc-Type: 4,ENCRYPTED
1191 DEK-Info: DES-CBC,08132C1FFF5BC8CC
1192
1193-gsvuAsGmB8AkR23M25w4E6wuywfBey1Jqh3g71gJcnsUYwynex9dvfAU0lTowOXh
1194-sb7ld1KNjEMzrht9AC1IC0iE1rLqvRQZOdJ7h3n7aHZQ4a/HjcwAhqJq0ZW45m6Q
1195-mpoO5fRISjx2VbKFRUz6Xj2x0/do3IjQhpuUDVrTFFe1sEySM6APZ6CVpcnTOyPR
1196-ADyLDKzOi2E+sj1UXs58pct56FaqTIZPUEflICU3k6q9FPU6gsYANRLfzegclkv4
1197-JAx6mKVSJuYnjCCppx8WBwGJa1J1GcYRJ3qFfdbUzL4bcXTvoFkJEnDkHsXgDUS6
1198-xmT0XGT3IMaW8cwQ8KD8m5YYI/L26Mas/w3eA2ekyMR8pYICjXp/YZtcKxxkQSVE
1199-Uv/+D+20KbNAHIW5Mrxf61cX/CggGEbVP8ZhDY1flh8=
1200+W+krChiFlNU+koE0Bep+U45OG4V4IFZv67ex6yJHgcsPd+HQ692A/h+5dYc8rdlW
1201+2LDgSODHHIMTt6RVJDxXxXs3qFmJQbnVXeXxV209X8EfaRarh+yiMKeUP6K8hIvj
1202++IYRma6iKOs+d4KlcZZudGs2f/x8nhxXbmQtrLhGd4h91mnJk2sKmiz7UkUy6Qng
1203+gOHnT2dfF4Qk2ZYsjisRHjpWZiqh40GO1LuTgUjZoH+LGhMwMwOAE6+ss5xa+yE+
1204+Xd9Yljm0/QW68JILkCJQjLDRvPGxDJyvYq6TT/kSElsRlI/AuRrZH1YVD3hn/xjx
1205+tDoEB+JEbH6iu9ne2srxnGSKLzoUbb4XPaCjLIW9BJf7oANmmFQpZZQiRTyIUVWi
1206+IE5hJciqF7ra7IwfZAW/PeWGXpzNOVN9QAvyAMsmvUCzJdxd1ySUatjhZ+mSFYGk
1207+rDVtyrgt4ZQgV0EdJV0Yn1ZWMOk1qEKXT0JAnI+9S6Y+QEdwXmdz3xlVuq61Jvub
1208+iJUVepnD/1QeFfWy8JwlscWpWFrkr569f3SNG+FGb6fufnUP7K6sX3urj+pj1QET
1209+f9NmmvLBsVsbj1Egg3wnxbVHIUPky64LY04wtNJaAwhuG6mKCvaClKYMTmTCyrzP
1210+aRwghhMQ3yHUbo2A1ZppYsXXg8lX30eW+5O77N9Q3xfP0phODHXsnXhBH09ml1JQ
1211+MmiCaL5n6sIVcjtFmN/kyaEuz/1VrBSaDCPeW88n61UXUidXrGOZN/2c/2xFir8B
1212+2rdE82lQLl07SJxzQQ6aJVvrc5tnbV/ENDySS5dG6Yl/w89/nuu0RFHmAweKqfGC
1213+8m0XOkmonIk6h3YT7XrkE0b/2jkf1mMaMKrGGfRmxqNt1nGxMCJHAO/Sn9v+I9rU
1214+W7HCZ04RTnRp1BXcqDxdwlveDKJRVfiKOSSEOpEXXlexS5R1vikmxrCwK5YVUTkT
1215+3tgahVtHJkFHnBHBzXyHUDwWahxZaU9TO43z0JFxs0zINWUWppldf0oyWjP1FSrI
1216+a9tXBs7aoykUY9Av9K0p4UJJU005qzD/tuegZFX34wRETJO0BJnlZHTTZSqLSVX+
1217+KZg4nPq8Xii1VHta3tgw7up2z1tpepsBerTsRQ1+IDpxLaIxgt9am0hXVTiMLex/
1218+DD9UvQC/eBUmpmWraK/Mqeq/UrPl+lmeoXsG6LWIvEp9d19rJ/3OhIJf2pDh9dC8
1219+NzJoNP9qOrDajAwzeeF5dbQxCaG+X8am9s4wryC0p+NrQ0tzv8efey0zBodDIOgo
1220+F1G7+ADgHy+V565q8sdL52xx0xB9Ty5p9IOfOUbxa3K65TJf/I/QAQjl4LyTbkfr
1221+kzpYAG2uF55EB3Eq3aMrj47pzZy0ELXXN2qYJ9Oelgl+h6MzYbmd+Wm+A2Cofv3u
1222+7ANAyjAYN7/Lo3lTFAt7sXAXGKnqw62JNSSMkIqZVrG5dn7Jxj5AJCVyYxTrm6Y+
1223+DDcblX47XrWxVoVJN/dLJZ8FzWs4o/8w9Yn8U54Ci7F0g+j2f+OpDy9PGFYT9pKw
1224+xWG8chkYE6QPilEYvdi26ZnZ3u236q9PMtyRP87NmBN2sLkj/rbBTzBxWIaGS+Mt
1225 -----END RSA PRIVATE KEY-----
1226
1227=== modified file 'extra/yassl/include/cert_wrapper.hpp'
1228--- extra/yassl/include/cert_wrapper.hpp 2013-05-12 06:24:46 +0000
1229+++ extra/yassl/include/cert_wrapper.hpp 2014-04-24 08:44:11 +0000
1230@@ -1,5 +1,5 @@
1231 /*
1232- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1233+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1234
1235 This program is free software; you can redistribute it and/or modify
1236 it under the terms of the GNU General Public License as published by
1237@@ -89,6 +89,7 @@
1238 bool verifyNone_; // no error if verify fails
1239 bool failNoCert_;
1240 bool sendVerify_;
1241+ bool sendBlankCert_;
1242 VerifyCallback verifyCallback_; // user verify callback
1243 public:
1244 CertManager();
1245@@ -116,16 +117,18 @@
1246 bool verifyNone() const;
1247 bool failNoCert() const;
1248 bool sendVerify() const;
1249+ bool sendBlankCert() const;
1250
1251 void setVerifyPeer();
1252 void setVerifyNone();
1253 void setFailNoCert();
1254 void setSendVerify();
1255+ void setSendBlankCert();
1256 void setPeerX509(X509*);
1257 void setVerifyCallback(VerifyCallback);
1258 private:
1259 CertManager(const CertManager&); // hide copy
1260- CertManager& operator=(const CertManager&); // and assign
1261+ CertManager& operator=(const CertManager&); // and assigin
1262 };
1263
1264
1265
1266=== modified file 'extra/yassl/include/openssl/crypto.h'
1267--- extra/yassl/include/openssl/crypto.h 2010-12-28 23:47:05 +0000
1268+++ extra/yassl/include/openssl/crypto.h 2014-04-24 08:44:11 +0000
1269@@ -1,5 +1,6 @@
1270 /*
1271 Copyright (C) 2005, 2007 MySQL AB
1272+ Use is subject to license terms
1273
1274 This program is free software; you can redistribute it and/or modify
1275 it under the terms of the GNU General Public License as published by
1276
1277=== modified file 'extra/yassl/include/openssl/des.h'
1278--- extra/yassl/include/openssl/des.h 2010-12-28 18:57:23 +0000
1279+++ extra/yassl/include/openssl/des.h 2014-04-24 08:44:11 +0000
1280@@ -1,5 +1,6 @@
1281 /*
1282 Copyright (C) 2005 MySQL AB
1283+ Use is subject to license terms
1284
1285 This program is free software; you can redistribute it and/or modify
1286 it under the terms of the GNU General Public License as published by
1287
1288=== modified file 'extra/yassl/include/openssl/des_old.h'
1289--- extra/yassl/include/openssl/des_old.h 2010-12-28 18:57:23 +0000
1290+++ extra/yassl/include/openssl/des_old.h 2014-04-24 08:44:11 +0000
1291@@ -1,5 +1,6 @@
1292 /*
1293 Copyright (C) 2007 MySQL AB
1294+ Use is subject to license terms
1295
1296 This program is free software; you can redistribute it and/or modify
1297 it under the terms of the GNU General Public License as published by
1298
1299=== modified file 'extra/yassl/include/openssl/engine.h'
1300--- extra/yassl/include/openssl/engine.h 2010-12-28 18:57:23 +0000
1301+++ extra/yassl/include/openssl/engine.h 2014-04-24 08:44:11 +0000
1302@@ -1,5 +1,6 @@
1303 /*
1304 Copyright (C) 2006 MySQL AB
1305+ Use is subject to license terms
1306
1307 This program is free software; you can redistribute it and/or modify
1308 it under the terms of the GNU General Public License as published by
1309
1310=== modified file 'extra/yassl/include/openssl/err.h'
1311--- extra/yassl/include/openssl/err.h 2010-12-28 18:57:23 +0000
1312+++ extra/yassl/include/openssl/err.h 2014-04-24 08:44:11 +0000
1313@@ -1,5 +1,6 @@
1314 /*
1315 Copyright (C) 2005, 2006 MySQL AB
1316+ Use is subject to license terms
1317
1318 This program is free software; you can redistribute it and/or modify
1319 it under the terms of the GNU General Public License as published by
1320
1321=== modified file 'extra/yassl/include/openssl/evp.h'
1322--- extra/yassl/include/openssl/evp.h 2010-12-28 18:57:23 +0000
1323+++ extra/yassl/include/openssl/evp.h 2014-04-24 08:44:11 +0000
1324@@ -1,5 +1,6 @@
1325 /*
1326 Copyright (C) 2007 MySQL AB
1327+ Use is subject to license terms
1328
1329 This program is free software; you can redistribute it and/or modify
1330 it under the terms of the GNU General Public License as published by
1331
1332=== modified file 'extra/yassl/include/openssl/generate_prefix_files.pl'
1333--- extra/yassl/include/openssl/generate_prefix_files.pl 2013-03-20 16:54:31 +0000
1334+++ extra/yassl/include/openssl/generate_prefix_files.pl 2014-04-24 08:44:11 +0000
1335@@ -1,6 +1,7 @@
1336 #!/usr/bin/perl
1337
1338 # Copyright (C) 2006 MySQL AB
1339+# Use is subject to license terms
1340 #
1341 # This program is free software; you can redistribute it and/or modify
1342 # it under the terms of the GNU General Public License as published by
1343
1344=== modified file 'extra/yassl/include/openssl/hmac.h'
1345--- extra/yassl/include/openssl/hmac.h 2010-12-28 18:57:23 +0000
1346+++ extra/yassl/include/openssl/hmac.h 2014-04-24 08:44:11 +0000
1347@@ -1,5 +1,6 @@
1348 /*
1349 Copyright (C) 2007 MySQL AB
1350+ Use is subject to license terms
1351
1352 This program is free software; you can redistribute it and/or modify
1353 it under the terms of the GNU General Public License as published by
1354
1355=== modified file 'extra/yassl/include/openssl/lhash.h'
1356--- extra/yassl/include/openssl/lhash.h 2010-12-28 18:57:23 +0000
1357+++ extra/yassl/include/openssl/lhash.h 2014-04-24 08:44:11 +0000
1358@@ -1,5 +1,6 @@
1359 /*
1360 Copyright (C) 2005 MySQL AB
1361+ Use is subject to license terms
1362
1363 This program is free software; you can redistribute it and/or modify
1364 it under the terms of the GNU General Public License as published by
1365
1366=== modified file 'extra/yassl/include/openssl/md4.h'
1367--- extra/yassl/include/openssl/md4.h 2010-12-28 18:57:23 +0000
1368+++ extra/yassl/include/openssl/md4.h 2014-04-24 08:44:11 +0000
1369@@ -1,5 +1,6 @@
1370 /*
1371 Copyright (C) 2006 MySQL AB
1372+ Use is subject to license terms
1373
1374 This program is free software; you can redistribute it and/or modify
1375 it under the terms of the GNU General Public License as published by
1376
1377=== modified file 'extra/yassl/include/openssl/md5.h'
1378--- extra/yassl/include/openssl/md5.h 2010-12-28 18:57:23 +0000
1379+++ extra/yassl/include/openssl/md5.h 2014-04-24 08:44:11 +0000
1380@@ -1,5 +1,6 @@
1381 /*
1382 Copyright (C) 2005, 2006 MySQL AB
1383+ Use is subject to license terms
1384
1385 This program is free software; you can redistribute it and/or modify
1386 it under the terms of the GNU General Public License as published by
1387
1388=== modified file 'extra/yassl/include/openssl/objects.h'
1389--- extra/yassl/include/openssl/objects.h 2010-12-28 18:57:23 +0000
1390+++ extra/yassl/include/openssl/objects.h 2014-04-24 08:44:11 +0000
1391@@ -1,5 +1,6 @@
1392 /*
1393 Copyright (C) 2007 MySQL AB
1394+ Use is subject to license terms
1395
1396 This program is free software; you can redistribute it and/or modify
1397 it under the terms of the GNU General Public License as published by
1398
1399=== modified file 'extra/yassl/include/openssl/opensslv.h'
1400--- extra/yassl/include/openssl/opensslv.h 2010-12-28 18:57:23 +0000
1401+++ extra/yassl/include/openssl/opensslv.h 2014-04-24 08:44:11 +0000
1402@@ -1,5 +1,6 @@
1403 /*
1404 Copyright (C) 2005 MySQL AB
1405+ Use is subject to license terms
1406
1407 This program is free software; you can redistribute it and/or modify
1408 it under the terms of the GNU General Public License as published by
1409
1410=== modified file 'extra/yassl/include/openssl/pem.h'
1411--- extra/yassl/include/openssl/pem.h 2010-12-28 18:57:23 +0000
1412+++ extra/yassl/include/openssl/pem.h 2014-04-24 08:44:11 +0000
1413@@ -1,5 +1,6 @@
1414 /*
1415 Copyright (C) 2006 MySQL AB
1416+ Use is subject to license terms
1417
1418 This program is free software; you can redistribute it and/or modify
1419 it under the terms of the GNU General Public License as published by
1420
1421=== modified file 'extra/yassl/include/openssl/pkcs12.h'
1422--- extra/yassl/include/openssl/pkcs12.h 2010-12-28 18:57:23 +0000
1423+++ extra/yassl/include/openssl/pkcs12.h 2014-04-24 08:44:11 +0000
1424@@ -1,5 +1,6 @@
1425 /*
1426 Copyright (C) 2006 MySQL AB
1427+ Use is subject to license terms
1428
1429 This program is free software; you can redistribute it and/or modify
1430 it under the terms of the GNU General Public License as published by
1431
1432=== modified file 'extra/yassl/include/openssl/prefix_crypto.h'
1433--- extra/yassl/include/openssl/prefix_crypto.h 2010-12-28 18:57:23 +0000
1434+++ extra/yassl/include/openssl/prefix_crypto.h 2014-04-24 08:44:11 +0000
1435@@ -1,5 +1,6 @@
1436 /*
1437 Copyright (C) 2006 MySQL AB
1438+ Use is subject to license terms
1439
1440 This program is free software; you can redistribute it and/or modify
1441 it under the terms of the GNU General Public License as published by
1442
1443=== modified file 'extra/yassl/include/openssl/rand.h'
1444--- extra/yassl/include/openssl/rand.h 2010-12-28 18:57:23 +0000
1445+++ extra/yassl/include/openssl/rand.h 2014-04-24 08:44:11 +0000
1446@@ -1,5 +1,6 @@
1447 /*
1448 Copyright (C) 2005 MySQL AB
1449+ Use is subject to license terms
1450
1451 This program is free software; you can redistribute it and/or modify
1452 it under the terms of the GNU General Public License as published by
1453
1454=== modified file 'extra/yassl/include/openssl/rsa.h'
1455--- extra/yassl/include/openssl/rsa.h 2010-12-28 18:57:23 +0000
1456+++ extra/yassl/include/openssl/rsa.h 2014-04-24 08:44:11 +0000
1457@@ -1,5 +1,6 @@
1458 /*
1459 Copyright (C) 2005, 2006 MySQL AB
1460+ Use is subject to license terms
1461
1462 This program is free software; you can redistribute it and/or modify
1463 it under the terms of the GNU General Public License as published by
1464
1465=== modified file 'extra/yassl/include/openssl/sha.h'
1466--- extra/yassl/include/openssl/sha.h 2010-12-28 18:57:23 +0000
1467+++ extra/yassl/include/openssl/sha.h 2014-04-24 08:44:11 +0000
1468@@ -1,5 +1,6 @@
1469 /*
1470 Copyright (C) 2007 MySQL AB
1471+ Use is subject to license terms
1472
1473 This program is free software; you can redistribute it and/or modify
1474 it under the terms of the GNU General Public License as published by
1475
1476=== modified file 'extra/yassl/include/openssl/ssl.h'
1477--- extra/yassl/include/openssl/ssl.h 2013-05-12 06:24:46 +0000
1478+++ extra/yassl/include/openssl/ssl.h 2014-04-24 08:44:11 +0000
1479@@ -1,5 +1,5 @@
1480 /*
1481- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1482+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1483
1484 This program is free software; you can redistribute it and/or modify
1485 it under the terms of the GNU General Public License as published by
1486@@ -34,7 +34,7 @@
1487 #include "rsa.h"
1488
1489
1490-#define YASSL_VERSION "2.2.2"
1491+#define YASSL_VERSION "2.3.0"
1492
1493
1494 #if defined(__cplusplus)
1495
1496=== modified file 'extra/yassl/include/openssl/x509.h'
1497--- extra/yassl/include/openssl/x509.h 2010-12-28 18:57:23 +0000
1498+++ extra/yassl/include/openssl/x509.h 2014-04-24 08:44:11 +0000
1499@@ -1,5 +1,6 @@
1500 /*
1501 Copyright (C) 2006 MySQL AB
1502+ Use is subject to license terms
1503
1504 This program is free software; you can redistribute it and/or modify
1505 it under the terms of the GNU General Public License as published by
1506
1507=== modified file 'extra/yassl/include/openssl/x509v3.h'
1508--- extra/yassl/include/openssl/x509v3.h 2010-12-28 18:57:23 +0000
1509+++ extra/yassl/include/openssl/x509v3.h 2014-04-24 08:44:11 +0000
1510@@ -1,5 +1,6 @@
1511 /*
1512 Copyright (C) 2006 MySQL AB
1513+ Use is subject to license terms
1514
1515 This program is free software; you can redistribute it and/or modify
1516 it under the terms of the GNU General Public License as published by
1517
1518=== modified file 'extra/yassl/src/cert_wrapper.cpp'
1519--- extra/yassl/src/cert_wrapper.cpp 2013-05-12 06:24:46 +0000
1520+++ extra/yassl/src/cert_wrapper.cpp 2014-04-24 08:44:11 +0000
1521@@ -1,5 +1,5 @@
1522 /*
1523- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1524+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1525
1526 This program is free software; you can redistribute it and/or modify
1527 it under the terms of the GNU General Public License as published by
1528@@ -91,7 +91,7 @@
1529 //CertManager
1530 CertManager::CertManager()
1531 : peerX509_(0), selfX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false),
1532- sendVerify_(false), verifyCallback_(0)
1533+ sendVerify_(false), sendBlankCert_(false), verifyCallback_(0)
1534 {}
1535
1536
1537@@ -143,6 +143,11 @@
1538 verifyNone_ = true;
1539 }
1540
1541+bool CertManager::sendBlankCert() const
1542+{
1543+ return sendBlankCert_;
1544+}
1545+
1546
1547 void CertManager::setFailNoCert()
1548 {
1549@@ -155,6 +160,11 @@
1550 sendVerify_ = true;
1551 }
1552
1553+void CertManager::setSendBlankCert()
1554+{
1555+ sendBlankCert_ = true;
1556+}
1557+
1558
1559 void CertManager::setVerifyCallback(VerifyCallback vc)
1560 {
1561
1562=== modified file 'extra/yassl/src/crypto_wrapper.cpp'
1563--- extra/yassl/src/crypto_wrapper.cpp 2013-06-20 15:16:00 +0000
1564+++ extra/yassl/src/crypto_wrapper.cpp 2014-04-24 08:44:11 +0000
1565@@ -950,9 +950,9 @@
1566 info->set = true;
1567 }
1568 }
1569- // get blank line
1570- if (fgets(line, sizeof(line), file))
1571 begin = ftell(file);
1572+ if (fgets(line,sizeof(line), file)) // get blank line
1573+ begin = ftell(file);
1574 }
1575
1576 }
1577
1578=== modified file 'extra/yassl/src/handshake.cpp'
1579--- extra/yassl/src/handshake.cpp 2014-02-17 11:12:40 +0000
1580+++ extra/yassl/src/handshake.cpp 2014-04-24 08:44:11 +0000
1581@@ -1,5 +1,5 @@
1582 /*
1583- Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
1584+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1585
1586 This program is free software; you can redistribute it and/or modify
1587 it under the terms of the GNU General Public License as published by
1588@@ -1155,6 +1155,8 @@
1589 {
1590 if (ssl.GetError()) return;
1591
1592+ if(ssl.getCrypto().get_certManager().sendBlankCert()) return;
1593+
1594 CertificateVerify verify;
1595 verify.Build(ssl);
1596 RecordLayerHeader rlHeader;
1597
1598=== modified file 'extra/yassl/src/yassl_imp.cpp'
1599--- extra/yassl/src/yassl_imp.cpp 2014-02-17 11:12:40 +0000
1600+++ extra/yassl/src/yassl_imp.cpp 2014-04-24 08:44:11 +0000
1601@@ -1,5 +1,5 @@
1602 /*
1603- Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
1604+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1605
1606 This program is free software; you can redistribute it and/or modify
1607 it under the terms of the GNU General Public License as published by
1608@@ -1199,22 +1199,38 @@
1609
1610 Certificate::Certificate(const x509* cert) : cert_(cert)
1611 {
1612- set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
1613+ if (cert)
1614+ set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
1615+ else
1616+ set_length(CERT_HEADER); // total blank cert size, just list header
1617 }
1618
1619
1620 const opaque* Certificate::get_buffer() const
1621 {
1622- return cert_->get_buffer();
1623+ if (cert_)
1624+ return cert_->get_buffer();
1625+
1626+ return NULL;
1627 }
1628
1629
1630 // output operator for Certificate
1631 output_buffer& operator<<(output_buffer& output, const Certificate& cert)
1632 {
1633- uint sz = cert.get_length() - 2 * CERT_HEADER;
1634+ uint sz = cert.get_length();
1635 opaque tmp[CERT_HEADER];
1636
1637+ if ((int)sz > CERT_HEADER)
1638+ sz -= 2 * CERT_HEADER; // actual cert, not including headers
1639+ else {
1640+ sz = 0; // blank cert case
1641+ c32to24(sz, tmp);
1642+ output.write(tmp, CERT_HEADER);
1643+
1644+ return output;
1645+ }
1646+
1647 c32to24(sz + CERT_HEADER, tmp);
1648 output.write(tmp, CERT_HEADER);
1649 c32to24(sz, tmp);
1650@@ -1264,9 +1280,11 @@
1651 ssl.SetError(YasslError(bad_input));
1652 return;
1653 }
1654- x509* myCert;
1655- cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
1656- input.read(myCert->use_buffer(), myCert->get_length());
1657+ if (cert_sz) {
1658+ x509* myCert;
1659+ cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
1660+ input.read(myCert->use_buffer(), myCert->get_length());
1661+ }
1662
1663 list_sz -= cert_sz + CERT_HEADER;
1664 }
1665@@ -1969,9 +1987,9 @@
1666 {
1667 CertManager& cm = ssl.useCrypto().use_certManager();
1668
1669- // make sure user provided cert and key before sending and using
1670- if (cm.get_cert() && cm.get_privateKey())
1671- cm.setSendVerify();
1672+ cm.setSendVerify();
1673+ if (cm.get_cert() == NULL || cm.get_privateKey() == NULL)
1674+ cm.setSendBlankCert(); // send blank cert, OpenSSL requires now
1675 }
1676
1677
1678
1679=== modified file 'extra/yassl/taocrypt/include/integer.hpp'
1680--- extra/yassl/taocrypt/include/integer.hpp 2013-05-12 06:24:46 +0000
1681+++ extra/yassl/taocrypt/include/integer.hpp 2014-04-24 08:44:11 +0000
1682@@ -46,6 +46,14 @@
1683
1684
1685 #ifdef TAOCRYPT_X86ASM_AVAILABLE
1686+ #if defined(__GNUC__) && (__GNUC__ >= 4)
1687+ // GCC 4 or greater optimizes too much inline on recursive for bigint,
1688+ // -O3 just as fast without asm here anyway
1689+ #undef TAOCRYPT_X86ASM_AVAILABLE
1690+ #endif
1691+#endif
1692+
1693+#ifdef TAOCRYPT_X86ASM_AVAILABLE
1694
1695 #ifdef _M_IX86
1696 #if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || \
1697
1698=== modified file 'extra/yassl/taocrypt/include/misc.hpp'
1699--- extra/yassl/taocrypt/include/misc.hpp 2013-05-12 06:24:46 +0000
1700+++ extra/yassl/taocrypt/include/misc.hpp 2014-04-24 08:44:11 +0000
1701@@ -124,15 +124,22 @@
1702
1703
1704 // no gas on these systems ?, disable for now
1705-#if defined(__sun__) || defined (__APPLE__)
1706+#if defined(__sun__)
1707+ #undef TAOCRYPT_DISABLE_X86ASM
1708 #define TAOCRYPT_DISABLE_X86ASM
1709 #endif
1710
1711 // icc problem with -03 and integer, disable for now
1712 #if defined(__INTEL_COMPILER)
1713+ #undef TAOCRYPT_DISABLE_X86ASM
1714 #define TAOCRYPT_DISABLE_X86ASM
1715 #endif
1716
1717+// indpedent of build system, unless ia32 asm is enabled disable it
1718+#if !defined(TAOCRYPT_ENABLE_X86ASM)
1719+ #undef TAOCRYPT_DISABLE_X86ASM
1720+ #define TAOCRYPT_DISABLE_X86ASM
1721+#endif
1722
1723 // Turn on ia32 ASM for Big Integer
1724 // CodeWarrior defines _MSC_VER
1725
1726=== modified file 'extra/yassl/taocrypt/src/aes.cpp'
1727--- extra/yassl/taocrypt/src/aes.cpp 2013-05-12 06:24:46 +0000
1728+++ extra/yassl/taocrypt/src/aes.cpp 2014-04-24 08:44:11 +0000
1729@@ -52,7 +52,7 @@
1730 in += BLOCK_SIZE;
1731 }
1732 else if (mode_ == CBC) {
1733- if (dir_ == ENCRYPTION)
1734+ if (dir_ == ENCRYPTION) {
1735 while (blocks--) {
1736 r_[0] ^= *(word32*)in;
1737 r_[1] ^= *(word32*)(in + 4);
1738@@ -65,7 +65,8 @@
1739 out += BLOCK_SIZE;
1740 in += BLOCK_SIZE;
1741 }
1742- else
1743+ }
1744+ else {
1745 while (blocks--) {
1746 AsmDecrypt(in, out, (void*)Td0);
1747
1748@@ -78,6 +79,7 @@
1749 out += BLOCK_SIZE;
1750 in += BLOCK_SIZE;
1751 }
1752+ }
1753 }
1754 }
1755
1756@@ -452,27 +454,31 @@
1757
1758 #if defined(DO_AES_ASM)
1759 #ifdef __GNUC__
1760- #define AS1(x) asm(#x);
1761- #define AS2(x, y) asm(#x ", " #y);
1762+ #define AS1(x) #x ";"
1763+ #define AS2(x, y) #x ", " #y ";"
1764
1765 #define PROLOG() \
1766- asm(".intel_syntax noprefix"); \
1767- AS2( movd mm3, edi ) \
1768- AS2( movd mm4, ebx ) \
1769- AS2( sub esp, 4 ) \
1770- AS2( movd mm7, ebp ) \
1771- AS2( mov [ebp - 4], esi ) \
1772- AS2( mov ecx, DWORD PTR [ebp + 8] ) \
1773- AS2( mov esi, DWORD PTR [ebp + 12] ) \
1774- AS2( mov ebp, DWORD PTR [ebp + 20] )
1775+ __asm__ __volatile__ \
1776+ ( \
1777+ ".intel_syntax noprefix;" \
1778+ "push ebx;" \
1779+ "push ebp;" \
1780+ "movd mm7, ebp;" \
1781+ "movd mm4, eax;" \
1782+ "mov ebp, edx;" \
1783+ "sub esp, 4;"
1784
1785 #define EPILOG() \
1786- AS2( mov esi, [ebp - 4] ) \
1787- AS2( mov esp, ebp ) \
1788- AS2( movd ebx, mm4 ) \
1789- AS2( movd edi, mm3 ) \
1790- AS1( emms ) \
1791- asm(".att_syntax");
1792+ "add esp, 4;" \
1793+ "pop ebp;" \
1794+ "pop ebx;" \
1795+ "emms;" \
1796+ ".att_syntax;" \
1797+ : \
1798+ : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
1799+ : "%edi", "memory", "cc" \
1800+ );
1801+
1802 #else
1803 #define AS1(x) __asm x
1804 #define AS2(x, y) __asm x, y
1805@@ -504,6 +510,8 @@
1806
1807 #ifdef _MSC_VER
1808 __declspec(naked)
1809+#else
1810+ __attribute__ ((noinline))
1811 #endif
1812 void AES::AsmEncrypt(const byte* inBlock, byte* outBlock, void* boxes) const
1813 {
1814@@ -537,7 +545,11 @@
1815 AS2( xor ecx, DWORD PTR [edi + 8] ) // s2
1816 AS2( xor edx, DWORD PTR [edi + 12] ) // s3
1817
1818- AS1(loop1: )
1819+#ifdef _MSC_VER
1820+ AS1( loop1: ) // loop1
1821+#else
1822+ AS1(1: ) // loop1
1823+#endif
1824 /* Put0 (mm0) =
1825 Te0[get0,rs 24] ^
1826 Te1[get1,rs 16] ^
1827@@ -652,7 +664,11 @@
1828 AS1( dec edi )
1829 AS2( movd mm5, edi )
1830
1831- AS1( jnz loop1 )
1832+#ifdef _MSC_VER
1833+ AS1( jnz loop1) // loop1
1834+#else
1835+ AS1( jnz 1b ) // loop1
1836+#endif
1837
1838 // last round
1839 /*
1840@@ -799,9 +815,9 @@
1841
1842 // store
1843 #ifdef __GNUC__
1844- AS2( mov esi, DWORD PTR [ebp + 16] ) // outBlock
1845+ AS2( movd esi, mm4 ) // outBlock
1846 #else
1847- AS2( mov esi, DWORD PTR [ebp + 12] ) // outBlock
1848+ AS2( mov esi, DWORD PTR [ebp + 12] ) // outBlock
1849 #endif
1850
1851 AS1( bswap ecx )
1852@@ -818,7 +834,9 @@
1853
1854
1855 #ifdef _MSC_VER
1856- __declspec(naked)
1857+ __declspec(naked)
1858+#else
1859+ __attribute__ ((noinline))
1860 #endif
1861 void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
1862 {
1863@@ -853,7 +871,11 @@
1864 AS2( xor edx, DWORD PTR [edi + 12] ) // s3
1865
1866
1867- AS1(loop2: )
1868+#ifdef _MSC_VER
1869+ AS1( loop2: ) // loop2
1870+#else
1871+ AS1(2: ) // loop2
1872+#endif
1873 /* Put0 (mm0) =
1874 Td0[GETBYTE(get0, rs24)] ^
1875 Td1[GETBYTE(get3, rs16)] ^
1876@@ -964,7 +986,11 @@
1877 AS1( dec edi )
1878 AS2( movd mm5, edi )
1879
1880- AS1( jnz loop2 )
1881+#ifdef _MSC_VER
1882+ AS1( jnz loop2) // loop2
1883+#else
1884+ AS1( jnz 2b ) // loop2
1885+#endif
1886
1887 // last round
1888 /*
1889@@ -1114,9 +1140,9 @@
1890
1891 // store
1892 #ifdef __GNUC__
1893- AS2( mov esi, DWORD PTR [ebp + 16] ) // outBlock
1894+ AS2( movd esi, mm4 ) // outBlock
1895 #else
1896- AS2( mov esi, DWORD PTR [ebp + 12] ) // outBlock
1897+ AS2( mov esi, DWORD PTR [ebp + 12] ) // outBlock
1898 #endif
1899 AS2( mov DWORD PTR [esi], eax )
1900 AS2( mov DWORD PTR [esi + 4], ebx )
1901
1902=== modified file 'extra/yassl/taocrypt/src/arc4.cpp'
1903--- extra/yassl/taocrypt/src/arc4.cpp 2013-05-12 06:24:46 +0000
1904+++ extra/yassl/taocrypt/src/arc4.cpp 2014-04-24 08:44:11 +0000
1905@@ -111,28 +111,27 @@
1906 void ARC4::AsmProcess(byte* out, const byte* in, word32 length)
1907 {
1908 #ifdef __GNUC__
1909- #define AS1(x) asm(#x);
1910- #define AS2(x, y) asm(#x ", " #y);
1911+ #define AS1(x) #x ";"
1912+ #define AS2(x, y) #x ", " #y ";"
1913
1914 #define PROLOG() \
1915- asm(".intel_syntax noprefix"); \
1916- AS2( movd mm3, edi ) \
1917- AS2( movd mm4, ebx ) \
1918- AS2( movd mm5, esi ) \
1919- AS2( movd mm6, ebp ) \
1920- AS2( mov ecx, DWORD PTR [ebp + 8] ) \
1921- AS2( mov edi, DWORD PTR [ebp + 12] ) \
1922- AS2( mov esi, DWORD PTR [ebp + 16] ) \
1923- AS2( mov ebp, DWORD PTR [ebp + 20] )
1924+ __asm__ __volatile__ \
1925+ ( \
1926+ ".intel_syntax noprefix;" \
1927+ "push ebx;" \
1928+ "push ebp;" \
1929+ "mov ebp, eax;"
1930
1931 #define EPILOG() \
1932- AS2( movd ebp, mm6 ) \
1933- AS2( movd esi, mm5 ) \
1934- AS2( movd ebx, mm4 ) \
1935- AS2( mov esp, ebp ) \
1936- AS2( movd edi, mm3 ) \
1937- AS1( emms ) \
1938- asm(".att_syntax");
1939+ "pop ebp;" \
1940+ "pop ebx;" \
1941+ "emms;" \
1942+ ".att_syntax;" \
1943+ : \
1944+ : "c" (this), "D" (out), "S" (in), "a" (length) \
1945+ : "%edx", "memory", "cc" \
1946+ );
1947+
1948 #else
1949 #define AS1(x) __asm x
1950 #define AS2(x, y) __asm x, y
1951@@ -178,7 +177,11 @@
1952 AS2( movzx eax, BYTE PTR [ebp + ecx] )
1953
1954
1955-AS1( begin: )
1956+#ifdef _MSC_VER
1957+ AS1( loopStart: ) // loopStart
1958+#else
1959+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
1960+#endif
1961
1962 // y = (y+a) & 0xff;
1963 AS2( add edx, eax )
1964@@ -215,7 +218,11 @@
1965 AS1( inc edi )
1966
1967 AS1( dec DWORD PTR [esp] )
1968- AS1( jnz begin )
1969+#ifdef _MSC_VER
1970+ AS1( jnz loopStart ) // loopStart
1971+#else
1972+ AS1( jnz 0b ) // loopStart
1973+#endif
1974
1975
1976 // write back to x_ and y_
1977@@ -225,6 +232,8 @@
1978
1979 AS1( nothing: )
1980
1981+ // inline adjust
1982+ AS2( add esp, 4 ) // fix room on stack
1983
1984 EPILOG()
1985 }
1986
1987=== modified file 'extra/yassl/taocrypt/src/blowfish.cpp'
1988--- extra/yassl/taocrypt/src/blowfish.cpp 2013-05-12 06:24:46 +0000
1989+++ extra/yassl/taocrypt/src/blowfish.cpp 2014-04-24 08:44:11 +0000
1990@@ -54,7 +54,7 @@
1991 in += BLOCK_SIZE;
1992 }
1993 else if (mode_ == CBC) {
1994- if (dir_ == ENCRYPTION)
1995+ if (dir_ == ENCRYPTION) {
1996 while (blocks--) {
1997 r_[0] ^= *(word32*)in;
1998 r_[1] ^= *(word32*)(in + 4);
1999@@ -66,7 +66,8 @@
2000 out += BLOCK_SIZE;
2001 in += BLOCK_SIZE;
2002 }
2003- else
2004+ }
2005+ else {
2006 while (blocks--) {
2007 AsmProcess(in, out);
2008
2009@@ -78,6 +79,7 @@
2010 out += BLOCK_SIZE;
2011 in += BLOCK_SIZE;
2012 }
2013+ }
2014 }
2015 }
2016
2017@@ -222,23 +224,26 @@
2018
2019 #if defined(DO_BLOWFISH_ASM)
2020 #ifdef __GNUC__
2021- #define AS1(x) asm(#x);
2022- #define AS2(x, y) asm(#x ", " #y);
2023+ #define AS1(x) #x ";"
2024+ #define AS2(x, y) #x ", " #y ";"
2025
2026 #define PROLOG() \
2027- asm(".intel_syntax noprefix"); \
2028- AS2( movd mm3, edi ) \
2029- AS2( movd mm4, ebx ) \
2030- AS2( movd mm5, esi ) \
2031- AS2( mov ecx, DWORD PTR [ebp + 8] ) \
2032- AS2( mov esi, DWORD PTR [ebp + 12] )
2033+ __asm__ __volatile__ \
2034+ ( \
2035+ ".intel_syntax noprefix;" \
2036+ "push ebx;" \
2037+ "push ebp;" \
2038+ "movd mm3, eax;"
2039+ #define EPILOG() \
2040+ "pop ebp;" \
2041+ "pop ebx;" \
2042+ "emms;" \
2043+ ".att_syntax;" \
2044+ : \
2045+ : "c" (this), "S" (inBlock), "a" (outBlock) \
2046+ : "%edi", "%edx", "memory", "cc" \
2047+ );
2048
2049- #define EPILOG() \
2050- AS2( movd esi, mm5 ) \
2051- AS2( movd ebx, mm4 ) \
2052- AS2( movd edi, mm3 ) \
2053- AS1( emms ) \
2054- asm(".att_syntax");
2055 #else
2056 #define AS1(x) __asm x
2057 #define AS2(x, y) __asm x, y
2058@@ -286,7 +291,9 @@
2059
2060
2061 #ifdef _MSC_VER
2062- __declspec(naked)
2063+ __declspec(naked)
2064+#else
2065+ __attribute__ ((noinline))
2066 #endif
2067 void Blowfish::AsmProcess(const byte* inBlock, byte* outBlock) const
2068 {
2069@@ -335,7 +342,7 @@
2070 #endif
2071
2072 #ifdef __GNUC__
2073- AS2( mov edi, [ebp + 16] ) // outBlock
2074+ AS2( movd edi, mm3 ) // outBlock
2075 #else
2076 AS2( mov edi, [ebp + 12] ) // outBlock
2077 #endif
2078
2079=== modified file 'extra/yassl/taocrypt/src/des.cpp'
2080--- extra/yassl/taocrypt/src/des.cpp 2013-05-12 06:24:46 +0000
2081+++ extra/yassl/taocrypt/src/des.cpp 2014-04-24 08:44:11 +0000
2082@@ -473,7 +473,7 @@
2083
2084 uses ecx
2085 */
2086-#define AsmIPERM() {\
2087+#define AsmIPERM() \
2088 AS2( rol ebx, 4 ) \
2089 AS2( mov ecx, eax ) \
2090 AS2( xor ecx, ebx ) \
2091@@ -504,7 +504,7 @@
2092 AS2( and ecx, 0xaaaaaaaa ) \
2093 AS2( xor eax, ecx ) \
2094 AS2( rol eax, 1 ) \
2095- AS2( xor ebx, ecx ) }
2096+ AS2( xor ebx, ecx )
2097
2098
2099 /* Uses FPERM algorithm from above
2100@@ -514,7 +514,7 @@
2101
2102 uses ecx
2103 */
2104-#define AsmFPERM() {\
2105+#define AsmFPERM() \
2106 AS2( ror ebx, 1 ) \
2107 AS2( mov ecx, eax ) \
2108 AS2( xor ecx, ebx ) \
2109@@ -545,7 +545,7 @@
2110 AS2( and ecx, 0xf0f0f0f0 ) \
2111 AS2( xor eax, ecx ) \
2112 AS2( xor ebx, ecx ) \
2113- AS2( ror eax, 4 ) }
2114+ AS2( ror eax, 4 )
2115
2116
2117
2118@@ -641,32 +641,34 @@
2119
2120
2121 #ifdef _MSC_VER
2122- __declspec(naked)
2123+ __declspec(naked)
2124+#else
2125+ __attribute__ ((noinline))
2126 #endif
2127 void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
2128 {
2129 #ifdef __GNUC__
2130- #define AS1(x) asm(#x);
2131- #define AS2(x, y) asm(#x ", " #y);
2132-
2133- asm(".intel_syntax noprefix");
2134+ #define AS1(x) #x ";"
2135+ #define AS2(x, y) #x ", " #y ";"
2136
2137 #define PROLOG() \
2138- AS2( movd mm3, edi ) \
2139- AS2( movd mm4, ebx ) \
2140- AS2( movd mm5, esi ) \
2141- AS2( movd mm6, ebp ) \
2142- AS2( mov edx, DWORD PTR [ebp + 8] ) \
2143- AS2( mov esi, DWORD PTR [ebp + 12] ) \
2144- AS2( mov ebp, DWORD PTR [ebp + 20] )
2145-
2146- // ebp restored at end
2147- #define EPILOG() \
2148- AS2( movd edi, mm3 ) \
2149- AS2( movd ebx, mm4 ) \
2150- AS2( movd esi, mm5 ) \
2151- AS1( emms ) \
2152- asm(".att_syntax");
2153+ __asm__ __volatile__ \
2154+ ( \
2155+ ".intel_syntax noprefix;" \
2156+ "push ebx;" \
2157+ "push ebp;" \
2158+ "movd mm6, ebp;" \
2159+ "movd mm7, ecx;" \
2160+ "mov ebp, eax;"
2161+ #define EPILOG() \
2162+ "pop ebp;" \
2163+ "pop ebx;" \
2164+ "emms;" \
2165+ ".att_syntax;" \
2166+ : \
2167+ : "d" (this), "S" (in), "a" (box), "c" (out) \
2168+ : "%edi", "memory", "cc" \
2169+ );
2170
2171 #else
2172 #define AS1(x) __asm x
2173@@ -756,7 +758,7 @@
2174 AS1( bswap eax )
2175
2176 #ifdef __GNUC__
2177- AS2( mov esi, DWORD PTR [ebp + 16] ) // outBlock
2178+ AS2( movd esi, mm7 ) // outBlock
2179 #else
2180 AS2( mov esi, DWORD PTR [ebp + 12] ) // outBlock
2181 #endif
2182
2183=== modified file 'extra/yassl/taocrypt/src/integer.cpp'
2184--- extra/yassl/taocrypt/src/integer.cpp 2013-06-20 15:16:00 +0000
2185+++ extra/yassl/taocrypt/src/integer.cpp 2014-04-24 08:44:11 +0000
2186@@ -50,7 +50,9 @@
2187 #include <emmintrin.h>
2188 #endif
2189 #elif defined(_MSC_VER) && defined(_M_IX86)
2190- #pragma message("You do not seem to have the Visual C++ Processor Pack ")
2191+/* #pragma message("You do not seem to have the Visual C++ Processor Pack ")
2192+ #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
2193+*/
2194 #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
2195 #elif defined(__GNUC__) && defined(__i386__)
2196 /* #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
2197@@ -68,7 +70,7 @@
2198 CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
2199 size_type n, const void *)
2200 {
2201- if (n > max_size())
2202+ if (n > this->max_size())
2203 return 0;
2204 if (n == 0)
2205 return 0;
2206
2207=== modified file 'extra/yassl/taocrypt/src/md5.cpp'
2208--- extra/yassl/taocrypt/src/md5.cpp 2013-05-12 06:24:46 +0000
2209+++ extra/yassl/taocrypt/src/md5.cpp 2014-04-24 08:44:11 +0000
2210@@ -223,32 +223,32 @@
2211
2212
2213 #ifdef _MSC_VER
2214- __declspec(naked)
2215+ __declspec(naked)
2216+#else
2217+ __attribute__ ((noinline))
2218 #endif
2219 void MD5::AsmTransform(const byte* data, word32 times)
2220 {
2221 #ifdef __GNUC__
2222- #define AS1(x) asm(#x);
2223- #define AS2(x, y) asm(#x ", " #y);
2224+ #define AS1(x) #x ";"
2225+ #define AS2(x, y) #x ", " #y ";"
2226
2227 #define PROLOG() \
2228- asm(".intel_syntax noprefix"); \
2229- AS2( movd mm3, edi ) \
2230- AS2( movd mm4, ebx ) \
2231- AS2( movd mm5, esi ) \
2232- AS2( movd mm6, ebp ) \
2233- AS2( mov ecx, DWORD PTR [ebp + 8] ) \
2234- AS2( mov edi, DWORD PTR [ebp + 12] ) \
2235- AS2( mov eax, DWORD PTR [ebp + 16] )
2236-
2237+ __asm__ __volatile__ \
2238+ ( \
2239+ ".intel_syntax noprefix;" \
2240+ "push ebx;" \
2241+ "push ebp;"
2242 #define EPILOG() \
2243- AS2( movd ebp, mm6 ) \
2244- AS2( movd esi, mm5 ) \
2245- AS2( movd ebx, mm4 ) \
2246- AS2( mov esp, ebp ) \
2247- AS2( movd edi, mm3 ) \
2248- AS1( emms ) \
2249- asm(".att_syntax");
2250+ "pop ebp;" \
2251+ "pop ebx;" \
2252+ "emms;" \
2253+ ".att_syntax;" \
2254+ : \
2255+ : "c" (this), "D" (data), "a" (times) \
2256+ : "%esi", "%edx", "memory", "cc" \
2257+ );
2258+
2259 #else
2260 #define AS1(x) __asm x
2261 #define AS2(x, y) __asm x, y
2262@@ -294,7 +294,11 @@
2263 AS2( mov ecx, [esi + 8] ) // c
2264 AS2( mov edx, [esi + 12] ) // d
2265
2266-AS1(loopStart:)
2267+#ifdef _MSC_VER
2268+ AS1( loopStart: ) // loopStart
2269+#else
2270+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
2271+#endif
2272
2273 // set up
2274 AS2( mov esi, ecx )
2275@@ -389,7 +393,11 @@
2276 AS2( movd ebp, mm2 ) // times
2277 AS1( dec ebp )
2278 AS2( movd mm2, ebp )
2279- AS1( jnz loopStart )
2280+#ifdef _MSC_VER
2281+ AS1( jnz loopStart ) // loopStart
2282+#else
2283+ AS1( jnz 0b ) // loopStart
2284+#endif
2285
2286
2287 EPILOG()
2288
2289=== modified file 'extra/yassl/taocrypt/src/rabbit.cpp'
2290--- extra/yassl/taocrypt/src/rabbit.cpp 2013-02-26 05:45:28 +0000
2291+++ extra/yassl/taocrypt/src/rabbit.cpp 2014-04-24 08:44:11 +0000
2292@@ -198,7 +198,6 @@
2293 {
2294 /* Temporary variables */
2295 word32 i;
2296- byte buffer[16];
2297
2298 /* Encrypt/decrypt all full blocks */
2299 while (msglen >= 16) {
2300@@ -227,17 +226,23 @@
2301
2302 /* Encrypt/decrypt remaining data */
2303 if (msglen) {
2304+
2305+ word32 tmp[4];
2306+ byte* buffer = (byte*)tmp;
2307+
2308+ memset(tmp, 0, sizeof(tmp)); /* help static analysis */
2309+
2310 /* Iterate the system */
2311 NextState(Work);
2312
2313 /* Generate 16 bytes of pseudo-random data */
2314- *(word32*)(buffer+ 0) = LITTLE32(workCtx_.x[0] ^
2315+ tmp[0] = LITTLE32(workCtx_.x[0] ^
2316 (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
2317- *(word32*)(buffer+ 4) = LITTLE32(workCtx_.x[2] ^
2318+ tmp[1] = LITTLE32(workCtx_.x[2] ^
2319 (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
2320- *(word32*)(buffer+ 8) = LITTLE32(workCtx_.x[4] ^
2321+ tmp[2] = LITTLE32(workCtx_.x[4] ^
2322 (workCtx_.x[1]>>16) ^ U32V(workCtx_.x[7]<<16));
2323- *(word32*)(buffer+12) = LITTLE32(workCtx_.x[6] ^
2324+ tmp[3] = LITTLE32(workCtx_.x[6] ^
2325 (workCtx_.x[3]>>16) ^ U32V(workCtx_.x[1]<<16));
2326
2327 /* Encrypt/decrypt the data */
2328
2329=== modified file 'extra/yassl/taocrypt/src/ripemd.cpp'
2330--- extra/yassl/taocrypt/src/ripemd.cpp 2013-05-12 06:24:46 +0000
2331+++ extra/yassl/taocrypt/src/ripemd.cpp 2014-04-24 08:44:11 +0000
2332@@ -511,27 +511,26 @@
2333 void RIPEMD160::AsmTransform(const byte* data, word32 times)
2334 {
2335 #ifdef __GNUC__
2336- #define AS1(x) asm(#x);
2337- #define AS2(x, y) asm(#x ", " #y);
2338+ #define AS1(x) #x ";"
2339+ #define AS2(x, y) #x ", " #y ";"
2340
2341 #define PROLOG() \
2342- asm(".intel_syntax noprefix"); \
2343- AS2( movd mm3, edi ) \
2344- AS2( movd mm4, ebx ) \
2345- AS2( movd mm5, esi ) \
2346- AS2( movd mm6, ebp ) \
2347- AS2( mov ecx, DWORD PTR [ebp + 8] ) \
2348- AS2( mov edi, DWORD PTR [ebp + 12] ) \
2349- AS2( mov edx, DWORD PTR [ebp + 16] )
2350+ __asm__ __volatile__ \
2351+ ( \
2352+ ".intel_syntax noprefix;" \
2353+ "push ebx;" \
2354+ "push ebp;"
2355
2356 #define EPILOG() \
2357- AS2( movd ebp, mm6 ) \
2358- AS2( movd esi, mm5 ) \
2359- AS2( movd ebx, mm4 ) \
2360- AS2( mov esp, ebp ) \
2361- AS2( movd edi, mm3 ) \
2362- AS1( emms ) \
2363- asm(".att_syntax");
2364+ "pop ebp;" \
2365+ "pop ebx;" \
2366+ "emms;" \
2367+ ".att_syntax;" \
2368+ : \
2369+ : "c" (this), "D" (data), "d" (times) \
2370+ : "%esi", "%eax", "memory", "cc" \
2371+ );
2372+
2373 #else
2374 #define AS1(x) __asm x
2375 #define AS2(x, y) __asm x, y
2376@@ -569,7 +568,11 @@
2377 AS2( sub esp, 24 ) // make room for tmp a1 - e1
2378 AS2( movd mm1, esi ) // store digest_
2379
2380-AS1( loopStart: )
2381+#ifdef _MSC_VER
2382+ AS1( loopStart: ) // loopStart
2383+#else
2384+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
2385+#endif
2386
2387 AS2( movd mm2, edx ) // store times_
2388
2389@@ -821,8 +824,14 @@
2390 AS2( movd edx, mm2 ) // times
2391 AS2( movd edi, mm0 ) // data, already advanced
2392 AS1( dec edx )
2393- AS1( jnz loopStart )
2394+#ifdef _MSC_VER
2395+ AS1( jnz loopStart ) // loopStart
2396+#else
2397+ AS1( jnz 0b ) // loopStart
2398+#endif
2399
2400+ // inline adjust
2401+ AS2( add esp, 24 ) // fix room on stack
2402
2403 EPILOG()
2404 }
2405
2406=== modified file 'extra/yassl/taocrypt/src/sha.cpp'
2407--- extra/yassl/taocrypt/src/sha.cpp 2013-05-12 06:24:46 +0000
2408+++ extra/yassl/taocrypt/src/sha.cpp 2014-04-24 08:44:11 +0000
2409@@ -760,32 +760,33 @@
2410
2411
2412 #ifdef _MSC_VER
2413- __declspec(naked)
2414+ __declspec(naked)
2415+#else
2416+ __attribute__ ((noinline))
2417 #endif
2418 void SHA::AsmTransform(const byte* data, word32 times)
2419 {
2420 #ifdef __GNUC__
2421- #define AS1(x) asm(#x);
2422- #define AS2(x, y) asm(#x ", " #y);
2423+ #define AS1(x) #x ";"
2424+ #define AS2(x, y) #x ", " #y ";"
2425
2426 #define PROLOG() \
2427- asm(".intel_syntax noprefix"); \
2428- AS2( movd mm3, edi ) \
2429- AS2( movd mm4, ebx ) \
2430- AS2( movd mm5, esi ) \
2431- AS2( movd mm6, ebp ) \
2432- AS2( mov ecx, DWORD PTR [ebp + 8] ) \
2433- AS2( mov edi, DWORD PTR [ebp + 12] ) \
2434- AS2( mov eax, DWORD PTR [ebp + 16] )
2435+ __asm__ __volatile__ \
2436+ ( \
2437+ ".intel_syntax noprefix;" \
2438+ "push ebx;" \
2439+ "push ebp;"
2440
2441 #define EPILOG() \
2442- AS2( movd ebp, mm6 ) \
2443- AS2( movd esi, mm5 ) \
2444- AS2( movd ebx, mm4 ) \
2445- AS2( mov esp, ebp ) \
2446- AS2( movd edi, mm3 ) \
2447- AS1( emms ) \
2448- asm(".att_syntax");
2449+ "pop ebp;" \
2450+ "pop ebx;" \
2451+ "emms;" \
2452+ ".att_syntax;" \
2453+ : \
2454+ : "c" (this), "D" (data), "a" (times) \
2455+ : "%esi", "%edx", "memory", "cc" \
2456+ );
2457+
2458 #else
2459 #define AS1(x) __asm x
2460 #define AS2(x, y) __asm x, y
2461@@ -826,7 +827,11 @@
2462
2463 AS2( sub esp, 68 ) // make room on stack
2464
2465-AS1( loopStart: )
2466+#ifdef _MSC_VER
2467+ AS1( loopStart: ) // loopStart
2468+#else
2469+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
2470+#endif
2471
2472 // byte reverse 16 words of input, 4 at a time, put on stack for W[]
2473
2474@@ -1011,8 +1016,14 @@
2475
2476 AS1( dec ebp )
2477 AS2( movd mm2, ebp )
2478- AS1( jnz loopStart )
2479+#ifdef _MSC_VER
2480+ AS1( jnz loopStart ) // loopStart
2481+#else
2482+ AS1( jnz 0b ) // loopStart
2483+#endif
2484
2485+ // inline adjust
2486+ AS2( add esp, 68 ) // fix room on stack
2487
2488 EPILOG()
2489 }
2490
2491=== modified file 'extra/yassl/taocrypt/src/twofish.cpp'
2492--- extra/yassl/taocrypt/src/twofish.cpp 2013-05-12 06:24:46 +0000
2493+++ extra/yassl/taocrypt/src/twofish.cpp 2014-04-24 08:44:11 +0000
2494@@ -55,7 +55,7 @@
2495 in += BLOCK_SIZE;
2496 }
2497 else if (mode_ == CBC) {
2498- if (dir_ == ENCRYPTION)
2499+ if (dir_ == ENCRYPTION) {
2500 while (blocks--) {
2501 r_[0] ^= *(word32*)in;
2502 r_[1] ^= *(word32*)(in + 4);
2503@@ -68,7 +68,8 @@
2504 out += BLOCK_SIZE;
2505 in += BLOCK_SIZE;
2506 }
2507- else
2508+ }
2509+ else {
2510 while (blocks--) {
2511 AsmDecrypt(in, out);
2512
2513@@ -82,6 +83,7 @@
2514 out += BLOCK_SIZE;
2515 in += BLOCK_SIZE;
2516 }
2517+ }
2518 }
2519 }
2520
2521@@ -272,25 +274,28 @@
2522
2523 #if defined(DO_TWOFISH_ASM)
2524 #ifdef __GNUC__
2525- #define AS1(x) asm(#x);
2526- #define AS2(x, y) asm(#x ", " #y);
2527+ #define AS1(x) #x ";"
2528+ #define AS2(x, y) #x ", " #y ";"
2529
2530 #define PROLOG() \
2531- asm(".intel_syntax noprefix"); \
2532- AS2( movd mm3, edi ) \
2533- AS2( movd mm4, ebx ) \
2534- AS2( movd mm5, esi ) \
2535- AS2( movd mm6, ebp ) \
2536- AS2( mov edi, DWORD PTR [ebp + 8] ) \
2537- AS2( mov esi, DWORD PTR [ebp + 12] )
2538+ __asm__ __volatile__ \
2539+ ( \
2540+ ".intel_syntax noprefix;" \
2541+ "push ebx;" \
2542+ "push ebp;" \
2543+ "movd mm3, eax;" \
2544+ "movd mm6, ebp;"
2545
2546 #define EPILOG() \
2547- AS2( movd esp, mm6 ) \
2548- AS2( movd esi, mm5 ) \
2549- AS2( movd ebx, mm4 ) \
2550- AS2( movd edi, mm3 ) \
2551- AS1( emms ) \
2552- asm(".att_syntax");
2553+ "pop ebp;" \
2554+ "pop ebx;" \
2555+ "emms;" \
2556+ ".att_syntax;" \
2557+ : \
2558+ : "D" (this), "S" (inBlock), "a" (outBlock) \
2559+ : "%ecx", "%edx", "memory", "cc" \
2560+ );
2561+
2562 #else
2563 #define AS1(x) __asm x
2564 #define AS2(x, y) __asm x, y
2565@@ -424,6 +429,8 @@
2566
2567 #ifdef _MSC_VER
2568 __declspec(naked)
2569+#else
2570+ __attribute__ ((noinline))
2571 #endif
2572 void Twofish::AsmEncrypt(const byte* inBlock, byte* outBlock) const
2573 {
2574@@ -472,7 +479,7 @@
2575 AS2( movd ebp, mm6 )
2576 AS2( movd esi, mm0 ) // k_
2577 #ifdef __GNUC__
2578- AS2( mov edi, [ebp + 16] ) // outBlock
2579+ AS2( movd edi, mm3 ) // outBlock
2580 #else
2581 AS2( mov edi, [ebp + 12] ) // outBlock
2582 #endif
2583@@ -493,7 +500,9 @@
2584
2585
2586 #ifdef _MSC_VER
2587- __declspec(naked)
2588+ __declspec(naked)
2589+#else
2590+ __attribute__ ((noinline))
2591 #endif
2592 void Twofish::AsmDecrypt(const byte* inBlock, byte* outBlock) const
2593 {
2594@@ -542,7 +551,7 @@
2595 AS2( movd ebp, mm6 )
2596 AS2( movd esi, mm0 ) // k_
2597 #ifdef __GNUC__
2598- AS2( mov edi, [ebp + 16] ) // outBlock
2599+ AS2( movd edi, mm3 ) // outBlock
2600 #else
2601 AS2( mov edi, [ebp + 12] ) // outBlock
2602 #endif
2603
2604=== modified file 'extra/yassl/taocrypt/test/test.cpp'
2605--- extra/yassl/taocrypt/test/test.cpp 2013-05-12 06:24:46 +0000
2606+++ extra/yassl/taocrypt/test/test.cpp 2014-04-24 08:44:11 +0000
2607@@ -1,5 +1,5 @@
2608 /*
2609- Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
2610+ Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
2611
2612 This program is free software; you can redistribute it and/or modify
2613 it under the terms of the GNU General Public License as published by
2614@@ -1165,12 +1165,12 @@
2615 RSAES_Encryptor enc(priv);
2616 byte message[] = "Everyone gets Friday off.";
2617 const word32 len = (word32)strlen((char*)message);
2618- byte cipher[64];
2619+ byte cipher[512];
2620 enc.Encrypt(message, len, cipher, rng);
2621
2622 RSAES_Decryptor dec(priv);
2623- byte plain[64];
2624- dec.Decrypt(cipher, sizeof(plain), plain, rng);
2625+ byte plain[512];
2626+ dec.Decrypt(cipher, priv.FixedCiphertextLength(), plain, rng);
2627
2628 if (memcmp(plain, message, len))
2629 return -70;
2630@@ -1242,11 +1242,11 @@
2631 int dsa_test()
2632 {
2633 Source source;
2634- FileSource("../certs/dsa512.der", source);
2635+ FileSource("../certs/dsa1024.der", source);
2636 if (source.size() == 0) {
2637- FileSource("../../certs/dsa512.der", source); // for testsuite
2638+ FileSource("../../certs/dsa1024.der", source); // for testsuite
2639 if (source.size() == 0) {
2640- FileSource("../../../certs/dsa512.der", source); // win32 Debug dir
2641+ FileSource("../../../certs/dsa1024.der", source); // win32 Debug dir
2642 if (source.size() == 0)
2643 err_sys("where's your certs dir?", -89);
2644 }
2645
2646=== modified file 'include/atomic/nolock.h'
2647--- include/atomic/nolock.h 2014-01-06 05:23:19 +0000
2648+++ include/atomic/nolock.h 2014-04-24 08:44:11 +0000
2649@@ -1,7 +1,7 @@
2650 #ifndef ATOMIC_NOLOCK_INCLUDED
2651 #define ATOMIC_NOLOCK_INCLUDED
2652
2653-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
2654+/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. reserved.
2655 reserved.
2656
2657 This program is free software; you can redistribute it and/or modify
2658@@ -27,7 +27,7 @@
2659 neither Visual C++ or gcc we still choose the Solaris
2660 implementation on Solaris (mainly for SunStudio compilers).
2661 */
2662-# if defined(_MSV_VER)
2663+# if defined(_MSC_VER)
2664 # include "generic-msvc.h"
2665 # elif __GNUC__
2666 # if defined(HAVE_SOLARIS_ATOMIC)
2667
2668=== modified file 'include/my_aes.h'
2669--- include/my_aes.h 2013-06-20 15:16:00 +0000
2670+++ include/my_aes.h 2014-04-24 08:44:11 +0000
2671@@ -1,7 +1,7 @@
2672 #ifndef MY_AES_INCLUDED
2673 #define MY_AES_INCLUDED
2674
2675-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
2676+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2677
2678 This program is free software; you can redistribute it and/or modify
2679 it under the terms of the GNU General Public License as published by
2680@@ -22,46 +22,108 @@
2681
2682 C_MODE_START
2683
2684-#define AES_KEY_LENGTH 128 /* Must be 128 192 or 256 */
2685-
2686-/*
2687- my_aes_encrypt - Crypt buffer with AES encryption algorithm.
2688- source - Pointer to data for encryption
2689- source_length - size of encryption data
2690- dest - buffer to place encrypted data (must be large enough)
2691- key - Key to be used for encryption
2692- kel_length - Length of the key. Will handle keys of any length
2693-
2694- returns - size of encrypted data, or negative in case of error.
2695-*/
2696-
2697-int my_aes_encrypt(const char *source, int source_length, char *dest,
2698- const char *key, int key_length);
2699-
2700-/*
2701- my_aes_decrypt - DeCrypt buffer with AES encryption algorithm.
2702- source - Pointer to data for decryption
2703- source_length - size of encrypted data
2704- dest - buffer to place decrypted data (must be large enough)
2705- key - Key to be used for decryption
2706- kel_length - Length of the key. Will handle keys of any length
2707-
2708- returns - size of original data, or negative in case of error.
2709-*/
2710-
2711-
2712-int my_aes_decrypt(const char *source, int source_length, char *dest,
2713- const char *key, int key_length);
2714-
2715-/*
2716- my_aes_get_size - get size of buffer which will be large enough for encrypted
2717- data
2718- source_length - length of data to be encrypted
2719-
2720- returns - size of buffer required to store encrypted data
2721-*/
2722-
2723-int my_aes_get_size(int source_length);
2724+/** AES IV size is 16 bytes for all supported ciphers except ECB */
2725+#define MY_AES_IV_SIZE 16
2726+
2727+
2728+/** Supported AES cipher/block mode combos */
2729+enum my_aes_opmode
2730+{
2731+ my_aes_128_ecb,
2732+ my_aes_192_ecb,
2733+ my_aes_256_ecb,
2734+ my_aes_128_cbc,
2735+ my_aes_192_cbc,
2736+ my_aes_256_cbc,
2737+#ifndef HAVE_YASSL
2738+ my_aes_128_cfb1,
2739+ my_aes_192_cfb1,
2740+ my_aes_256_cfb1,
2741+ my_aes_128_cfb8,
2742+ my_aes_192_cfb8,
2743+ my_aes_256_cfb8,
2744+ my_aes_128_cfb128,
2745+ my_aes_192_cfb128,
2746+ my_aes_256_cfb128,
2747+ my_aes_128_ofb,
2748+ my_aes_192_ofb,
2749+ my_aes_256_ofb,
2750+#endif
2751+};
2752+
2753+#define MY_AES_BEGIN my_aes_128_ecb
2754+#ifdef HAVE_YASSL
2755+#define MY_AES_END my_aes_256_cbc
2756+#else
2757+#define MY_AES_END my_aes_256_ofb
2758+#endif
2759+
2760+/* If bad data discovered during decoding */
2761+#define MY_AES_BAD_DATA -1
2762+
2763+/** String representations of the supported AES modes. Keep in sync with my_aes_opmode */
2764+extern const char *my_aes_opmode_names[];
2765+
2766+/**
2767+ Encrypt a buffer using AES
2768+
2769+ @param source [in] Pointer to data for encryption
2770+ @param source_length [in] Size of encryption data
2771+ @param dest [out] Buffer to place encrypted data (must be large enough)
2772+ @param key [in] Key to be used for encryption
2773+ @param key_length [in] Length of the key. Will handle keys of any length
2774+ @param mode [in] encryption mode
2775+ @param iv [in] 16 bytes initialization vector if needed. Otherwise NULL
2776+ @return size of encrypted data, or negative in case of error
2777+*/
2778+
2779+int my_aes_encrypt(const unsigned char *source, uint32 source_length,
2780+ unsigned char *dest,
2781+ const unsigned char *key, uint32 key_length,
2782+ enum my_aes_opmode mode, const unsigned char *iv);
2783+
2784+/**
2785+ Decrypt an AES encrypted buffer
2786+
2787+ @param source Pointer to data for decryption
2788+ @param source_length size of encrypted data
2789+ @param dest buffer to place decrypted data (must be large enough)
2790+ @param key Key to be used for decryption
2791+ @param key_length Length of the key. Will handle keys of any length
2792+ @param mode encryption mode
2793+ @param iv 16 bytes initialization vector if needed. Otherwise NULL
2794+ @return size of original data.
2795+*/
2796+
2797+
2798+int my_aes_decrypt(const unsigned char *source, uint32 source_length,
2799+ unsigned char *dest,
2800+ const unsigned char *key, uint32 key_length,
2801+ enum my_aes_opmode mode, const unsigned char *iv);
2802+
2803+/**
2804+ Calculate the size of a buffer large enough for encrypted data
2805+
2806+ @param source_length length of data to be encrypted
2807+ @param mode encryption mode
2808+ @return size of buffer required to store encrypted data
2809+*/
2810+
2811+int my_aes_get_size(uint32 source_length, enum my_aes_opmode mode);
2812+
2813+/**
2814+ Return true if the AES cipher and block mode requires an IV
2815+
2816+ SYNOPSIS
2817+ my_aes_needs_iv()
2818+ @param mode encryption mode
2819+
2820+ @retval TRUE IV needed
2821+ @retval FALSE IV not needed
2822+*/
2823+
2824+my_bool my_aes_needs_iv(my_aes_opmode opmode);
2825+
2826
2827 C_MODE_END
2828
2829
2830=== modified file 'include/my_base.h'
2831--- include/my_base.h 2014-03-26 10:11:16 +0000
2832+++ include/my_base.h 2014-04-24 08:44:11 +0000
2833@@ -204,7 +204,9 @@
2834 Prepare table for export
2835 (e.g. quiesce the table and write table metadata).
2836 */
2837- HA_EXTRA_EXPORT
2838+ HA_EXTRA_EXPORT,
2839+ /** Do secondary sort by handler::ref (rowid) after key sort. */
2840+ HA_EXTRA_SECONDARY_SORT_ROWID
2841 };
2842
2843 /* Compatible option, to be deleted in 6.0 */
2844@@ -485,7 +487,8 @@
2845 #define HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT 188 /* FTS query exceeds result cache limit */
2846 #define HA_ERR_TEMP_FILE_WRITE_FAILURE 189 /* Temporary file write failure */
2847 #define HA_ERR_INNODB_FORCED_RECOVERY 190 /* Innodb is in force recovery mode */
2848-#define HA_ERR_LAST 190 /* Copy of last error nr */
2849+#define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */
2850+#define HA_ERR_LAST 191 /* Copy of last error nr */
2851
2852 /* Number of different errors */
2853 #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
2854
2855=== modified file 'include/my_rnd.h'
2856--- include/my_rnd.h 2012-02-15 18:54:54 +0000
2857+++ include/my_rnd.h 2014-04-24 08:44:11 +0000
2858@@ -30,6 +30,7 @@
2859 #endif
2860
2861 double my_rnd_ssl(struct rand_struct *rand_st);
2862+int my_rand_buffer(unsigned char *buffer, size_t buffer_size);
2863
2864 #ifdef __cplusplus
2865 }
2866
2867=== modified file 'include/mysql_version.h.in'
2868--- include/mysql_version.h.in 2013-02-26 05:35:17 +0000
2869+++ include/mysql_version.h.in 2014-04-24 08:44:11 +0000
2870@@ -1,6 +1,7 @@
2871-/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB
2872- Use is subject to license terms
2873- This file is public domain and comes with NO WARRANTY of any kind */
2874+/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB
2875+ & Detron HB, 1996, 1999-2004, 2007 MySQL AB.
2876+ This file is public domain and comes with NO WARRANTY of any kind
2877+*/
2878
2879 /* Version numbers for protocol & mysqld */
2880
2881
2882=== modified file 'include/queues.h'
2883--- include/queues.h 2013-03-19 12:38:59 +0000
2884+++ include/queues.h 2014-04-24 08:44:11 +0000
2885@@ -44,6 +44,7 @@
2886 #define queue_element(queue,index) ((queue)->root[index+1])
2887 #define queue_end(queue) ((queue)->root[(queue)->elements])
2888 #define queue_replaced(queue) _downheap(queue,1)
2889+#define queue_set_compare(queue, cmp) (queue)->compare= cmp
2890 #define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg
2891 #define queue_set_max_at_top(queue, set_arg) \
2892 (queue)->max_at_top= set_arg ? -1 : 1
2893
2894=== modified file 'include/t_ctype.h'
2895--- include/t_ctype.h 2013-03-20 05:56:02 +0000
2896+++ include/t_ctype.h 2014-04-24 08:44:11 +0000
2897@@ -1,4 +1,5 @@
2898 /* Copyright (C) 2000 MySQL AB
2899+ Use is subject to license terms
2900
2901 This program is free software; you can redistribute it and/or modify
2902 it under the terms of the GNU General Public License as published by
2903
2904=== modified file 'libmysql/libmysql.c'
2905--- libmysql/libmysql.c 2014-02-17 11:12:40 +0000
2906+++ libmysql/libmysql.c 2014-04-24 08:44:11 +0000
2907@@ -4332,7 +4332,27 @@
2908 /* end of data */
2909 *prev_ptr= 0;
2910 mysql->warning_count= uint2korr(cp+1);
2911- mysql->server_status= uint2korr(cp+3);
2912+ /*
2913+ OUT parameters result sets has SERVER_PS_OUT_PARAMS and
2914+ SERVER_MORE_RESULTS_EXISTS flags in first EOF_Packet only.
2915+ Last EOF_Packet of OUT parameters result sets have no
2916+ SERVER_MORE_RESULTS_EXISTS flag as described here:
2917+ http://dev.mysql.com/doc/internals/en/stored-procedures.html#out-parameter-set
2918+ Following code reads last EOF_Packet of result set and can clear
2919+ those flags in server_status if we don't preserve them.
2920+ Without SERVER_MORE_RESULTS_EXISTS flag mysql_stmt_next_result fails
2921+ to read OK_Packet after OUT parameters result set.
2922+ So we need to preserve SERVER_MORE_RESULTS_EXISTS flag for OUT
2923+ parameters result set.
2924+ */
2925+ if (mysql->server_status & SERVER_PS_OUT_PARAMS)
2926+ {
2927+ mysql->server_status= uint2korr(cp+3)
2928+ | SERVER_PS_OUT_PARAMS
2929+ | (mysql->server_status & SERVER_MORE_RESULTS_EXISTS);
2930+ }
2931+ else
2932+ mysql->server_status= uint2korr(cp+3);
2933 DBUG_PRINT("info",("status: %u warning_count: %u",
2934 mysql->server_status, mysql->warning_count));
2935 DBUG_RETURN(0);
2936
2937=== modified file 'libmysqld/CMakeLists.txt'
2938--- libmysqld/CMakeLists.txt 2013-09-09 15:24:45 +0000
2939+++ libmysqld/CMakeLists.txt 2014-04-24 08:44:11 +0000
2940@@ -1,4 +1,4 @@
2941-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
2942+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
2943 #
2944 # This program is free software; you can redistribute it and/or modify
2945 # it under the terms of the GNU General Public License as published by
2946@@ -132,3 +132,37 @@
2947 MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}
2948 COMPONENT Embedded)
2949 ENDIF()
2950+
2951+OPTION(WITH_EMBEDDED_SHARED_LIBRARY
2952+ "Generate shared version of embedded library (in addition to the static one)"
2953+ OFF)
2954+IF(WITH_EMBEDDED_SHARED_LIBRARY)
2955+ MERGE_LIBRARIES(libmysqld SHARED
2956+ mysqlserver
2957+ EXPORTS ${CLIENT_API_FUNCTIONS}
2958+ OUTPUT_NAME "mysqld"
2959+ COMPONENT Embedded)
2960+ SET_TARGET_PROPERTIES(libmysqld PROPERTIES
2961+ VERSION "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0"
2962+ SOVERSION "${SHARED_LIB_MAJOR_VERSION}"
2963+ )
2964+
2965+ GET_TARGET_PROPERTY(libmysqld_link_flags libmysqld LINK_FLAGS)
2966+ IF(NOT libmysqld_link_flag)
2967+ SET(libmysqld_link_flags)
2968+ ENDIF()
2969+ SET(libmysqld_link_flags
2970+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${libmysqld_link_flags}")
2971+ SET_TARGET_PROPERTIES(libmysqld
2972+ PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
2973+
2974+ IF(LINK_FLAG_NO_UNDEFINED)
2975+ SET(libmysqld_link_flags
2976+ "${libmysqld_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
2977+ SET_TARGET_PROPERTIES(libmysqld
2978+ PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
2979+ ENDIF()
2980+
2981+ SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
2982+ SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
2983+ENDIF()
2984
2985=== modified file 'libmysqld/examples/test-run'
2986--- libmysqld/examples/test-run 2013-03-20 16:54:31 +0000
2987+++ libmysqld/examples/test-run 2014-04-24 08:44:11 +0000
2988@@ -1,6 +1,7 @@
2989 #! /bin/sh
2990
2991 # Copyright (C) 2001, 2006 MySQL AB
2992+# Use is subject to license terms
2993 #
2994 # This program is free software; you can redistribute it and/or modify
2995 # it under the terms of the GNU General Public License as published by
2996
2997=== modified file 'man/comp_err.1'
2998--- man/comp_err.1 2014-03-03 17:51:33 +0000
2999+++ man/comp_err.1 2014-04-24 08:44:11 +0000
3000@@ -2,12 +2,12 @@
3001 .\" Title: \fBcomp_err\fR
3002 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3003 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3004-.\" Date: 01/14/2014
3005+.\" Date: 03/14/2014
3006 .\" Manual: MySQL Database System
3007 .\" Source: MySQL 5.6
3008 .\" Language: English
3009 .\"
3010-.TH "\FBCOMP_ERR\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3011+.TH "\FBCOMP_ERR\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3012 .\" -----------------------------------------------------------------
3013 .\" * Define some portability stuff
3014 .\" -----------------------------------------------------------------
3015@@ -124,8 +124,8 @@
3016 Write a debugging log\&. A typical
3017 \fIdebug_options\fR
3018 string is
3019-\*(Aqd:t:O,\fIfile_name\fR\*(Aq\&. The default is
3020-\*(Aqd:t:O,/tmp/comp_err\&.trace\*(Aq\&.
3021+d:t:O,\fIfile_name\fR\&. The default is
3022+d:t:O,/tmp/comp_err\&.trace\&.
3023 .RE
3024 .sp
3025 .RS 4
3026
3027=== modified file 'man/innochecksum.1'
3028--- man/innochecksum.1 2014-03-03 17:51:33 +0000
3029+++ man/innochecksum.1 2014-04-24 08:44:11 +0000
3030@@ -2,12 +2,12 @@
3031 .\" Title: \fBinnochecksum\fR
3032 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3033 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3034-.\" Date: 01/14/2014
3035+.\" Date: 03/14/2014
3036 .\" Manual: MySQL Database System
3037 .\" Source: MySQL 5.6
3038 .\" Language: English
3039 .\"
3040-.TH "\FBINNOCHECKSUM\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3041+.TH "\FBINNOCHECKSUM\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3042 .\" -----------------------------------------------------------------
3043 .\" * Define some portability stuff
3044 .\" -----------------------------------------------------------------
3045
3046=== modified file 'man/msql2mysql.1'
3047--- man/msql2mysql.1 2014-03-03 17:51:33 +0000
3048+++ man/msql2mysql.1 2014-04-24 08:44:11 +0000
3049@@ -2,12 +2,12 @@
3050 .\" Title: \fBmsql2mysql\fR
3051 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3052 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3053-.\" Date: 01/14/2014
3054+.\" Date: 03/14/2014
3055 .\" Manual: MySQL Database System
3056 .\" Source: MySQL 5.6
3057 .\" Language: English
3058 .\"
3059-.TH "\FBMSQL2MYSQL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3060+.TH "\FBMSQL2MYSQL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3061 .\" -----------------------------------------------------------------
3062 .\" * Define some portability stuff
3063 .\" -----------------------------------------------------------------
3064@@ -34,6 +34,22 @@
3065 .HP \w'\fBmsql2mysql\fR\fB\fIC\-source\-file\fR\fR\fB\ \&.\&.\&.\fR\ 'u
3066 \fBmsql2mysql\fR\fB\fIC\-source\-file\fR\fR\fB \&.\&.\&.\fR
3067 .SH "DESCRIPTION"
3068+.if n \{\
3069+.sp
3070+.\}
3071+.RS 4
3072+.it 1 an-trap
3073+.nr an-no-space-flag 1
3074+.nr an-break-flag 1
3075+.br
3076+.ps +1
3077+\fBNote\fR
3078+.ps -1
3079+.br
3080+.PP
3081+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
3082+.sp .5v
3083+.RE
3084 .PP
3085 Initially, the MySQL C API was developed to be very similar to that for the mSQL database system\&. Because of this, mSQL programs often can be converted relatively easily for use with MySQL by changing the names of the C API functions\&.
3086 .PP
3087
3088=== modified file 'man/my_print_defaults.1'
3089--- man/my_print_defaults.1 2014-03-03 17:51:33 +0000
3090+++ man/my_print_defaults.1 2014-04-24 08:44:11 +0000
3091@@ -2,12 +2,12 @@
3092 .\" Title: \fBmy_print_defaults\fR
3093 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3094 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3095-.\" Date: 01/14/2014
3096+.\" Date: 03/14/2014
3097 .\" Manual: MySQL Database System
3098 .\" Source: MySQL 5.6
3099 .\" Language: English
3100 .\"
3101-.TH "\FBMY_PRINT_DEFAULTS" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3102+.TH "\FBMY_PRINT_DEFAULTS" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3103 .\" -----------------------------------------------------------------
3104 .\" * Define some portability stuff
3105 .\" -----------------------------------------------------------------
3106@@ -115,8 +115,8 @@
3107 Write a debugging log\&. A typical
3108 \fIdebug_options\fR
3109 string is
3110-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
3111-\*(Aqd:t:o,/tmp/my_print_defaults\&.trace\*(Aq\&.
3112+d:t:o,\fIfile_name\fR\&. The default is
3113+d:t:o,/tmp/my_print_defaults\&.trace\&.
3114 .RE
3115 .sp
3116 .RS 4
3117@@ -168,7 +168,14 @@
3118 .sp
3119 Read options from the named login path in the
3120 \&.mylogin\&.cnf
3121-login file\&. See
3122+login file\&. A
3123+\(lqlogin path\(rq
3124+is an option group that permits only a limited set of options:
3125+\fBhost\fR,
3126+\fBuser\fR, and
3127+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
3128+\fBmysql_config_editor\fR
3129+utility\&. See
3130 \fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
3131 .RE
3132 .sp
3133
3134=== modified file 'man/myisam_ftdump.1'
3135--- man/myisam_ftdump.1 2014-03-03 17:51:33 +0000
3136+++ man/myisam_ftdump.1 2014-04-24 08:44:11 +0000
3137@@ -2,12 +2,12 @@
3138 .\" Title: \fBmyisam_ftdump\fR
3139 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3140 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3141-.\" Date: 01/14/2014
3142+.\" Date: 03/14/2014
3143 .\" Manual: MySQL Database System
3144 .\" Source: MySQL 5.6
3145 .\" Language: English
3146 .\"
3147-.TH "\FBMYISAM_FTDUMP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3148+.TH "\FBMYISAM_FTDUMP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3149 .\" -----------------------------------------------------------------
3150 .\" * Define some portability stuff
3151 .\" -----------------------------------------------------------------
3152
3153=== modified file 'man/myisamchk.1'
3154--- man/myisamchk.1 2014-03-03 17:51:33 +0000
3155+++ man/myisamchk.1 2014-04-24 08:44:11 +0000
3156@@ -2,12 +2,12 @@
3157 .\" Title: \fBmyisamchk\fR
3158 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3159 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3160-.\" Date: 01/14/2014
3161+.\" Date: 03/14/2014
3162 .\" Manual: MySQL Database System
3163 .\" Source: MySQL 5.6
3164 .\" Language: English
3165 .\"
3166-.TH "\FBMYISAMCHK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3167+.TH "\FBMYISAMCHK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3168 .\" -----------------------------------------------------------------
3169 .\" * Define some portability stuff
3170 .\" -----------------------------------------------------------------
3171@@ -308,8 +308,8 @@
3172 Write a debugging log\&. A typical
3173 \fIdebug_options\fR
3174 string is
3175-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
3176-\*(Aqd:t:o,/tmp/myisamchk\&.trace\*(Aq\&.
3177+d:t:o,\fIfile_name\fR\&. The default is
3178+d:t:o,/tmp/myisamchk\&.trace\&.
3179 .RE
3180 .sp
3181 .RS 4
3182
3183=== modified file 'man/myisamlog.1'
3184--- man/myisamlog.1 2014-03-03 17:51:33 +0000
3185+++ man/myisamlog.1 2014-04-24 08:44:11 +0000
3186@@ -2,12 +2,12 @@
3187 .\" Title: \fBmyisamlog\fR
3188 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3189 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3190-.\" Date: 01/14/2014
3191+.\" Date: 03/14/2014
3192 .\" Manual: MySQL Database System
3193 .\" Source: MySQL 5.6
3194 .\" Language: English
3195 .\"
3196-.TH "\FBMYISAMLOG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3197+.TH "\FBMYISAMLOG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3198 .\" -----------------------------------------------------------------
3199 .\" * Define some portability stuff
3200 .\" -----------------------------------------------------------------
3201
3202=== modified file 'man/myisampack.1'
3203--- man/myisampack.1 2014-03-03 17:51:33 +0000
3204+++ man/myisampack.1 2014-04-24 08:44:11 +0000
3205@@ -2,12 +2,12 @@
3206 .\" Title: \fBmyisampack\fR
3207 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3208 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3209-.\" Date: 01/14/2014
3210+.\" Date: 03/14/2014
3211 .\" Manual: MySQL Database System
3212 .\" Source: MySQL 5.6
3213 .\" Language: English
3214 .\"
3215-.TH "\FBMYISAMPACK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3216+.TH "\FBMYISAMPACK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3217 .\" -----------------------------------------------------------------
3218 .\" * Define some portability stuff
3219 .\" -----------------------------------------------------------------
3220@@ -189,8 +189,8 @@
3221 Write a debugging log\&. A typical
3222 \fIdebug_options\fR
3223 string is
3224-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
3225-\*(Aqd:t:o\*(Aq\&.
3226+d:t:o,\fIfile_name\fR\&. The default is
3227+d:t:o\&.
3228 .RE
3229 .sp
3230 .RS 4
3231
3232=== modified file 'man/mysql-stress-test.pl.1'
3233--- man/mysql-stress-test.pl.1 2014-03-03 17:51:33 +0000
3234+++ man/mysql-stress-test.pl.1 2014-04-24 08:44:11 +0000
3235@@ -2,12 +2,12 @@
3236 .\" Title: \fBmysql-stress-test.pl\fR
3237 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3238 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3239-.\" Date: 01/10/2014
3240+.\" Date: 03/10/2014
3241 .\" Manual: MySQL Database System
3242 .\" Source: MySQL
3243 .\" Language: English
3244 .\"
3245-.TH "\FBMYSQL\-STRESS\-TE" "1" "01/10/2014" "MySQL" "MySQL Database System"
3246+.TH "\FBMYSQL\-STRESS\-TE" "1" "03/10/2014" "MySQL" "MySQL Database System"
3247 .\" -----------------------------------------------------------------
3248 .\" * Define some portability stuff
3249 .\" -----------------------------------------------------------------
3250
3251=== modified file 'man/mysql-test-run.pl.1'
3252--- man/mysql-test-run.pl.1 2014-03-03 17:51:33 +0000
3253+++ man/mysql-test-run.pl.1 2014-04-24 08:44:11 +0000
3254@@ -2,12 +2,12 @@
3255 .\" Title: \fBmysql-test-run.pl\fR
3256 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3257 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3258-.\" Date: 01/10/2014
3259+.\" Date: 03/10/2014
3260 .\" Manual: MySQL Database System
3261 .\" Source: MySQL
3262 .\" Language: English
3263 .\"
3264-.TH "\FBMYSQL\-TEST\-RUN\" "1" "01/10/2014" "MySQL" "MySQL Database System"
3265+.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/10/2014" "MySQL" "MySQL Database System"
3266 .\" -----------------------------------------------------------------
3267 .\" * Define some portability stuff
3268 .\" -----------------------------------------------------------------
3269
3270=== modified file 'man/mysql.1'
3271--- man/mysql.1 2014-03-03 17:51:33 +0000
3272+++ man/mysql.1 2014-04-24 08:44:11 +0000
3273@@ -2,12 +2,12 @@
3274 .\" Title: \fBmysql\fR
3275 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3276 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3277-.\" Date: 01/14/2014
3278+.\" Date: 03/14/2014
3279 .\" Manual: MySQL Database System
3280 .\" Source: MySQL 5.6
3281 .\" Language: English
3282 .\"
3283-.TH "\FBMYSQL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3284+.TH "\FBMYSQL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3285 .\" -----------------------------------------------------------------
3286 .\" * Define some portability stuff
3287 .\" -----------------------------------------------------------------
3288@@ -394,8 +394,8 @@
3289 Write a debugging log\&. A typical
3290 \fIdebug_options\fR
3291 string is
3292-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
3293-\*(Aqd:t:o,/tmp/mysql\&.trace\*(Aq\&.
3294+d:t:o,\fIfile_name\fR\&. The default is
3295+d:t:o,/tmp/mysql\&.trace\&.
3296 .RE
3297 .sp
3298 .RS 4
3299@@ -525,7 +525,7 @@
3300 Enable the
3301 mysql_clear_password
3302 cleartext authentication plugin\&. (See
3303-Section\ \&6.3.7.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
3304+Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
3305 .RE
3306 .sp
3307 .RS 4
3308@@ -696,6 +696,31 @@
3309 .sp -1
3310 .IP \(bu 2.3
3311 .\}
3312+.\" mysql: login-path option
3313+.\" login-path option: mysql
3314+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
3315+.sp
3316+Read options from the named login path in the
3317+\&.mylogin\&.cnf
3318+login file\&. A
3319+\(lqlogin path\(rq
3320+is an option group that permits only a limited set of options:
3321+\fBhost\fR,
3322+\fBuser\fR, and
3323+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
3324+\fBmysql_config_editor\fR
3325+utility\&. See
3326+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
3327+.RE
3328+.sp
3329+.RS 4
3330+.ie n \{\
3331+\h'-04'\(bu\h'+03'\c
3332+.\}
3333+.el \{\
3334+.sp -1
3335+.IP \(bu 2.3
3336+.\}
3337 .\" mysql: named-commands option
3338 .\" named-commands option: mysql
3339 \fB\-\-named\-commands\fR,
3340@@ -1130,7 +1155,8 @@
3341 \fBNote\fR
3342 .ps -1
3343 .br
3344-Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&.
3345+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
3346+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
3347 .sp .5v
3348 .RE
3349 .RE
3350@@ -1156,7 +1182,7 @@
3351 For additional discussion regarding use of the
3352 sha256_password
3353 plugin, including how to get the RSA public key, see
3354-Section\ \&6.3.7.4, \(lqThe SHA-256 Authentication Plugin\(rq\&.
3355+Section\ \&6.3.8.4, \(lqThe SHA-256 Authentication Plugin\(rq\&.
3356 .sp
3357 This option is available only if MySQL was built using OpenSSL\&. It was added in MySQL 5\&.6\&.6 under the name
3358 \fB\-\-server\-public\-key\fR
3359@@ -1281,7 +1307,7 @@
3360 Options that begin with
3361 \fB\-\-ssl\fR
3362 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
3363-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
3364+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
3365 .RE
3366 .sp
3367 .RS 4
3368
3369=== modified file 'man/mysql.server.1'
3370--- man/mysql.server.1 2014-03-03 17:51:33 +0000
3371+++ man/mysql.server.1 2014-04-24 08:44:11 +0000
3372@@ -2,12 +2,12 @@
3373 .\" Title: \fBmysql.server\fR
3374 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3375 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3376-.\" Date: 01/14/2014
3377+.\" Date: 03/14/2014
3378 .\" Manual: MySQL Database System
3379 .\" Source: MySQL 5.6
3380 .\" Language: English
3381 .\"
3382-.TH "\FBMYSQL\&.SERVER\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3383+.TH "\FBMYSQL\&.SERVER\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3384 .\" -----------------------------------------------------------------
3385 .\" * Define some portability stuff
3386 .\" -----------------------------------------------------------------
3387@@ -57,7 +57,7 @@
3388 If you install MySQL from a source distribution or using a binary distribution format that does not install
3389 \fBmysql\&.server\fR
3390 automatically, you can install it manually\&. Instructions are provided in
3391-Section\ \&2.10.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
3392+Section\ \&2.9.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
3393 .PP
3394 \fBmysql\&.server\fR
3395 reads options from the
3396
3397=== modified file 'man/mysql_client_test.1'
3398--- man/mysql_client_test.1 2014-03-03 17:51:33 +0000
3399+++ man/mysql_client_test.1 2014-04-24 08:44:11 +0000
3400@@ -2,12 +2,12 @@
3401 .\" Title: \fBmysql_client_test\fR
3402 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3403 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3404-.\" Date: 01/10/2014
3405+.\" Date: 03/10/2014
3406 .\" Manual: MySQL Database System
3407 .\" Source: MySQL
3408 .\" Language: English
3409 .\"
3410-.TH "\FBMYSQL_CLIENT_TEST" "1" "01/10/2014" "MySQL" "MySQL Database System"
3411+.TH "\FBMYSQL_CLIENT_TEST" "1" "03/10/2014" "MySQL" "MySQL Database System"
3412 .\" -----------------------------------------------------------------
3413 .\" * Define some portability stuff
3414 .\" -----------------------------------------------------------------
3415
3416=== modified file 'man/mysql_config.1'
3417--- man/mysql_config.1 2014-03-03 17:51:33 +0000
3418+++ man/mysql_config.1 2014-04-24 08:44:11 +0000
3419@@ -2,12 +2,12 @@
3420 .\" Title: \fBmysql_config\fR
3421 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3422 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3423-.\" Date: 01/14/2014
3424+.\" Date: 03/14/2014
3425 .\" Manual: MySQL Database System
3426 .\" Source: MySQL 5.6
3427 .\" Language: English
3428 .\"
3429-.TH "\FBMYSQL_CONFIG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3430+.TH "\FBMYSQL_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3431 .\" -----------------------------------------------------------------
3432 .\" * Define some portability stuff
3433 .\" -----------------------------------------------------------------
3434
3435=== modified file 'man/mysql_config_editor.1'
3436--- man/mysql_config_editor.1 2014-02-17 11:12:40 +0000
3437+++ man/mysql_config_editor.1 2014-04-24 08:44:11 +0000
3438@@ -2,12 +2,12 @@
3439 .\" Title: \fBmysql_config_editor\fR
3440 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3441 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3442-.\" Date: 01/14/2014
3443+.\" Date: 03/14/2014
3444 .\" Manual: MySQL Database System
3445 .\" Source: MySQL 5.6
3446 .\" Language: English
3447 .\"
3448-.TH "\FBMYSQL_CONFIG_EDIT" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3449+.TH "\FBMYSQL_CONFIG_EDIT" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3450 .\" -----------------------------------------------------------------
3451 .\" * Define some portability stuff
3452 .\" -----------------------------------------------------------------
3453@@ -724,8 +724,8 @@
3454 Write a debugging log\&. A typical
3455 \fIdebug_options\fR
3456 string is
3457-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
3458-\*(Aqd:t:o,/tmp/mysql_config_editor\&.trace\*(Aq\&.
3459+d:t:o,\fIfile_name\fR\&. The default is
3460+d:t:o\&.
3461 .RE
3462 .sp
3463 .RS 4
3464
3465=== modified file 'man/mysql_convert_table_format.1'
3466--- man/mysql_convert_table_format.1 2014-03-03 17:51:33 +0000
3467+++ man/mysql_convert_table_format.1 2014-04-24 08:44:11 +0000
3468@@ -2,12 +2,12 @@
3469 .\" Title: \fBmysql_convert_table_format\fR
3470 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3471 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3472-.\" Date: 01/14/2014
3473+.\" Date: 03/14/2014
3474 .\" Manual: MySQL Database System
3475 .\" Source: MySQL 5.6
3476 .\" Language: English
3477 .\"
3478-.TH "\FBMYSQL_CONVERT_TAB" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3479+.TH "\FBMYSQL_CONVERT_TAB" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3480 .\" -----------------------------------------------------------------
3481 .\" * Define some portability stuff
3482 .\" -----------------------------------------------------------------
3483@@ -34,6 +34,22 @@
3484 .HP \w'\fBmysql_convert_table_format\ [\fR\fB\fIoptions\fR\fR\fB]\ \fR\fB\fIdb_name\fR\fR\ 'u
3485 \fBmysql_convert_table_format [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIdb_name\fR\fR
3486 .SH "DESCRIPTION"
3487+.if n \{\
3488+.sp
3489+.\}
3490+.RS 4
3491+.it 1 an-trap
3492+.nr an-no-space-flag 1
3493+.nr an-break-flag 1
3494+.br
3495+.ps +1
3496+\fBNote\fR
3497+.ps -1
3498+.br
3499+.PP
3500+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
3501+.sp .5v
3502+.RE
3503 .PP
3504 \fBmysql_convert_table_format\fR
3505 converts the tables in a database to use a particular storage engine (MyISAM
3506@@ -44,7 +60,7 @@
3507 and
3508 DBD::mysql
3509 Perl modules be installed (see
3510-Section\ \&2.13, \(lqPerl Installation Notes\(rq)\&.
3511+Section\ \&2.12, \(lqPerl Installation Notes\(rq)\&.
3512 .PP
3513 Invoke
3514 \fBmysql_convert_table_format\fR
3515
3516=== modified file 'man/mysql_find_rows.1'
3517--- man/mysql_find_rows.1 2014-03-03 17:51:33 +0000
3518+++ man/mysql_find_rows.1 2014-04-24 08:44:11 +0000
3519@@ -2,12 +2,12 @@
3520 .\" Title: \fBmysql_find_rows\fR
3521 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3522 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3523-.\" Date: 01/14/2014
3524+.\" Date: 03/14/2014
3525 .\" Manual: MySQL Database System
3526 .\" Source: MySQL 5.6
3527 .\" Language: English
3528 .\"
3529-.TH "\FBMYSQL_FIND_ROWS\F" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3530+.TH "\FBMYSQL_FIND_ROWS\F" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3531 .\" -----------------------------------------------------------------
3532 .\" * Define some portability stuff
3533 .\" -----------------------------------------------------------------
3534@@ -34,6 +34,22 @@
3535 .HP \w'\fBmysql_find_rows\ [\fR\fB\fIoptions\fR\fR\fB]\ [\fR\fB\fIfile_name\fR\fR\fB\ \&.\&.\&.]\fR\ 'u
3536 \fBmysql_find_rows [\fR\fB\fIoptions\fR\fR\fB] [\fR\fB\fIfile_name\fR\fR\fB \&.\&.\&.]\fR
3537 .SH "DESCRIPTION"
3538+.if n \{\
3539+.sp
3540+.\}
3541+.RS 4
3542+.it 1 an-trap
3543+.nr an-no-space-flag 1
3544+.nr an-break-flag 1
3545+.br
3546+.ps +1
3547+\fBNote\fR
3548+.ps -1
3549+.br
3550+.PP
3551+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
3552+.sp .5v
3553+.RE
3554 .PP
3555 \fBmysql_find_rows\fR
3556 reads files containing SQL statements and extracts statements that match a given regular expression or that contain
3557
3558=== modified file 'man/mysql_fix_extensions.1'
3559--- man/mysql_fix_extensions.1 2014-03-03 17:51:33 +0000
3560+++ man/mysql_fix_extensions.1 2014-04-24 08:44:11 +0000
3561@@ -2,12 +2,12 @@
3562 .\" Title: \fBmysql_fix_extensions\fR
3563 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3564 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3565-.\" Date: 01/14/2014
3566+.\" Date: 03/14/2014
3567 .\" Manual: MySQL Database System
3568 .\" Source: MySQL 5.6
3569 .\" Language: English
3570 .\"
3571-.TH "\FBMYSQL_FIX_EXTENSI" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3572+.TH "\FBMYSQL_FIX_EXTENSI" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3573 .\" -----------------------------------------------------------------
3574 .\" * Define some portability stuff
3575 .\" -----------------------------------------------------------------
3576@@ -34,6 +34,22 @@
3577 .HP \w'\fBmysql_fix_extensions\ \fR\fB\fIdata_dir\fR\fR\ 'u
3578 \fBmysql_fix_extensions \fR\fB\fIdata_dir\fR\fR
3579 .SH "DESCRIPTION"
3580+.if n \{\
3581+.sp
3582+.\}
3583+.RS 4
3584+.it 1 an-trap
3585+.nr an-no-space-flag 1
3586+.nr an-break-flag 1
3587+.br
3588+.ps +1
3589+\fBNote\fR
3590+.ps -1
3591+.br
3592+.PP
3593+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
3594+.sp .5v
3595+.RE
3596 .PP
3597 \fBmysql_fix_extensions\fR
3598 converts the extensions for
3599
3600=== modified file 'man/mysql_install_db.1'
3601--- man/mysql_install_db.1 2014-03-03 17:51:33 +0000
3602+++ man/mysql_install_db.1 2014-04-24 08:44:11 +0000
3603@@ -2,12 +2,12 @@
3604 .\" Title: \fBmysql_install_db\fR
3605 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3606 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3607-.\" Date: 01/14/2014
3608+.\" Date: 03/14/2014
3609 .\" Manual: MySQL Database System
3610 .\" Source: MySQL 5.6
3611 .\" Language: English
3612 .\"
3613-.TH "\FBMYSQL_INSTALL_DB\" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3614+.TH "\FBMYSQL_INSTALL_DB\" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3615 .\" -----------------------------------------------------------------
3616 .\" * Define some portability stuff
3617 .\" -----------------------------------------------------------------
3618@@ -295,7 +295,7 @@
3619 .sp -1
3620 .IP \(bu 2.3
3621 .\}
3622-Remove the anonymous\-user MySQL accounts\&.
3623+Not create anonymous\-user MySQL accounts\&.
3624 .RE
3625 .sp
3626 As a result of these actions, it is necessary after installation to start the server, connect as
3627
3628=== modified file 'man/mysql_plugin.1'
3629--- man/mysql_plugin.1 2014-03-03 17:51:33 +0000
3630+++ man/mysql_plugin.1 2014-04-24 08:44:11 +0000
3631@@ -2,12 +2,12 @@
3632 .\" Title: \fBmysql_plugin\fR
3633 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3634 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3635-.\" Date: 01/14/2014
3636+.\" Date: 03/14/2014
3637 .\" Manual: MySQL Database System
3638 .\" Source: MySQL 5.6
3639 .\" Language: English
3640 .\"
3641-.TH "\FBMYSQL_PLUGIN\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3642+.TH "\FBMYSQL_PLUGIN\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3643 .\" -----------------------------------------------------------------
3644 .\" * Define some portability stuff
3645 .\" -----------------------------------------------------------------
3646
3647=== modified file 'man/mysql_secure_installation.1'
3648--- man/mysql_secure_installation.1 2014-03-03 17:51:33 +0000
3649+++ man/mysql_secure_installation.1 2014-04-24 08:44:11 +0000
3650@@ -2,12 +2,12 @@
3651 .\" Title: \fBmysql_secure_installation\fR
3652 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3653 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3654-.\" Date: 01/14/2014
3655+.\" Date: 03/14/2014
3656 .\" Manual: MySQL Database System
3657 .\" Source: MySQL 5.6
3658 .\" Language: English
3659 .\"
3660-.TH "\FBMYSQL_SECURE_INST" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3661+.TH "\FBMYSQL_SECURE_INST" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3662 .\" -----------------------------------------------------------------
3663 .\" * Define some portability stuff
3664 .\" -----------------------------------------------------------------
3665@@ -90,7 +90,7 @@
3666 .PP
3667 \fBmysql_secure_installation\fR
3668 helps you implement security recommendations similar to those described at
3669-Section\ \&2.10.2, \(lqSecuring the Initial MySQL Accounts\(rq\&.
3670+Section\ \&2.9.2, \(lqSecuring the Initial MySQL Accounts\(rq\&.
3671 .PP
3672 Invoke
3673 \fBmysql_secure_installation\fR
3674
3675=== modified file 'man/mysql_setpermission.1'
3676--- man/mysql_setpermission.1 2014-03-03 17:51:33 +0000
3677+++ man/mysql_setpermission.1 2014-04-24 08:44:11 +0000
3678@@ -2,12 +2,12 @@
3679 .\" Title: \fBmysql_setpermission\fR
3680 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3681 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3682-.\" Date: 01/14/2014
3683+.\" Date: 03/14/2014
3684 .\" Manual: MySQL Database System
3685 .\" Source: MySQL 5.6
3686 .\" Language: English
3687 .\"
3688-.TH "\FBMYSQL_SETPERMISSI" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3689+.TH "\FBMYSQL_SETPERMISSI" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3690 .\" -----------------------------------------------------------------
3691 .\" * Define some portability stuff
3692 .\" -----------------------------------------------------------------
3693@@ -34,6 +34,22 @@
3694 .HP \w'\fBmysql_setpermission\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
3695 \fBmysql_setpermission [\fR\fB\fIoptions\fR\fR\fB]\fR
3696 .SH "DESCRIPTION"
3697+.if n \{\
3698+.sp
3699+.\}
3700+.RS 4
3701+.it 1 an-trap
3702+.nr an-no-space-flag 1
3703+.nr an-break-flag 1
3704+.br
3705+.ps +1
3706+\fBNote\fR
3707+.ps -1
3708+.br
3709+.PP
3710+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
3711+.sp .5v
3712+.RE
3713 .PP
3714 \fBmysql_setpermission\fR
3715 is a Perl script that was originally written and contributed by Luuk de Boer\&. It interactively sets permissions in the MySQL grant tables\&.
3716@@ -43,7 +59,7 @@
3717 and
3718 DBD::mysql
3719 Perl modules be installed (see
3720-Section\ \&2.13, \(lqPerl Installation Notes\(rq)\&.
3721+Section\ \&2.12, \(lqPerl Installation Notes\(rq)\&.
3722 .PP
3723 Invoke
3724 \fBmysql_setpermission\fR
3725
3726=== modified file 'man/mysql_tzinfo_to_sql.1'
3727--- man/mysql_tzinfo_to_sql.1 2014-03-03 17:51:33 +0000
3728+++ man/mysql_tzinfo_to_sql.1 2014-04-24 08:44:11 +0000
3729@@ -2,12 +2,12 @@
3730 .\" Title: \fBmysql_tzinfo_to_sql\fR
3731 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3732 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3733-.\" Date: 01/14/2014
3734+.\" Date: 03/14/2014
3735 .\" Manual: MySQL Database System
3736 .\" Source: MySQL 5.6
3737 .\" Language: English
3738 .\"
3739-.TH "\FBMYSQL_TZINFO_TO_S" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3740+.TH "\FBMYSQL_TZINFO_TO_S" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3741 .\" -----------------------------------------------------------------
3742 .\" * Define some portability stuff
3743 .\" -----------------------------------------------------------------
3744
3745=== modified file 'man/mysql_upgrade.1'
3746--- man/mysql_upgrade.1 2014-03-03 17:51:33 +0000
3747+++ man/mysql_upgrade.1 2014-04-24 08:44:11 +0000
3748@@ -2,12 +2,12 @@
3749 .\" Title: \fBmysql_upgrade\fR
3750 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3751 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3752-.\" Date: 01/14/2014
3753+.\" Date: 03/14/2014
3754 .\" Manual: MySQL Database System
3755 .\" Source: MySQL 5.6
3756 .\" Language: English
3757 .\"
3758-.TH "\FBMYSQL_UPGRADE\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3759+.TH "\FBMYSQL_UPGRADE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3760 .\" -----------------------------------------------------------------
3761 .\" * Define some portability stuff
3762 .\" -----------------------------------------------------------------
3763@@ -48,7 +48,7 @@
3764 If
3765 \fBmysql_upgrade\fR
3766 finds that a table has a possible incompatibility, it performs a table check and, if problems are found, attempts a table repair\&. If the table cannot be repaired, see
3767-Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
3768+Section\ \&2.10.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
3769 for manual table repair strategies\&.
3770 .if n \{\
3771 .sp
3772@@ -88,7 +88,7 @@
3773 .PP
3774 Some upgrade incompatibilities may require special handling before you upgrade your MySQL installation and run
3775 \fBmysql_upgrade\fR\&. See
3776-Section\ \&2.11.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
3777+Section\ \&2.10.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
3778 .sp .5v
3779 .RE
3780 .PP
3781@@ -293,6 +293,26 @@
3782 .sp -1
3783 .IP \(bu 2.3
3784 .\}
3785+.\" mysql_upgrade: debug option
3786+.\" debug option: mysql_upgrade
3787+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
3788+\fB\-# \fR\fB\fIdebug_options\fR\fR
3789+.sp
3790+Write a debugging log\&. A typical
3791+\fIdebug_options\fR
3792+string is
3793+d:t:O,\fIfile_name\fR\&. The default is
3794+d:t:O,/tmp/mysql_upgrade\&.trace\&.
3795+.RE
3796+.sp
3797+.RS 4
3798+.ie n \{\
3799+\h'-04'\(bu\h'+03'\c
3800+.\}
3801+.el \{\
3802+.sp -1
3803+.IP \(bu 2.3
3804+.\}
3805 .\" mysql_upgrade: debug-check option
3806 .\" debug-check option: mysql_upgrade
3807 \fB\-\-debug\-check\fR
3808
3809=== modified file 'man/mysql_waitpid.1'
3810--- man/mysql_waitpid.1 2014-03-03 17:51:33 +0000
3811+++ man/mysql_waitpid.1 2014-04-24 08:44:11 +0000
3812@@ -2,12 +2,12 @@
3813 .\" Title: \fBmysql_waitpid\fR
3814 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3815 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3816-.\" Date: 01/14/2014
3817+.\" Date: 03/14/2014
3818 .\" Manual: MySQL Database System
3819 .\" Source: MySQL 5.6
3820 .\" Language: English
3821 .\"
3822-.TH "\FBMYSQL_WAITPID\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3823+.TH "\FBMYSQL_WAITPID\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3824 .\" -----------------------------------------------------------------
3825 .\" * Define some portability stuff
3826 .\" -----------------------------------------------------------------
3827
3828=== modified file 'man/mysql_zap.1'
3829--- man/mysql_zap.1 2014-03-03 17:51:33 +0000
3830+++ man/mysql_zap.1 2014-04-24 08:44:11 +0000
3831@@ -2,12 +2,12 @@
3832 .\" Title: \fBmysql_zap\fR
3833 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3834 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3835-.\" Date: 01/14/2014
3836+.\" Date: 03/14/2014
3837 .\" Manual: MySQL Database System
3838 .\" Source: MySQL 5.6
3839 .\" Language: English
3840 .\"
3841-.TH "\FBMYSQL_ZAP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3842+.TH "\FBMYSQL_ZAP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3843 .\" -----------------------------------------------------------------
3844 .\" * Define some portability stuff
3845 .\" -----------------------------------------------------------------
3846
3847=== modified file 'man/mysqlaccess.1'
3848--- man/mysqlaccess.1 2014-03-03 17:51:33 +0000
3849+++ man/mysqlaccess.1 2014-04-24 08:44:11 +0000
3850@@ -2,12 +2,12 @@
3851 .\" Title: \fBmysqlaccess\fR
3852 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3853 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3854-.\" Date: 01/14/2014
3855+.\" Date: 03/14/2014
3856 .\" Manual: MySQL Database System
3857 .\" Source: MySQL 5.6
3858 .\" Language: English
3859 .\"
3860-.TH "\FBMYSQLACCESS\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3861+.TH "\FBMYSQLACCESS\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3862 .\" -----------------------------------------------------------------
3863 .\" * Define some portability stuff
3864 .\" -----------------------------------------------------------------
3865@@ -34,6 +34,22 @@
3866 .HP \w'\fBmysqlaccess\ [\fR\fB\fIhost_name\fR\fR\fB\ [\fR\fB\fIuser_name\fR\fR\fB\ [\fR\fB\fIdb_name\fR\fR\fB]]]\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
3867 \fBmysqlaccess [\fR\fB\fIhost_name\fR\fR\fB [\fR\fB\fIuser_name\fR\fR\fB [\fR\fB\fIdb_name\fR\fR\fB]]] [\fR\fB\fIoptions\fR\fR\fB]\fR
3868 .SH "DESCRIPTION"
3869+.if n \{\
3870+.sp
3871+.\}
3872+.RS 4
3873+.it 1 an-trap
3874+.nr an-no-space-flag 1
3875+.nr an-break-flag 1
3876+.br
3877+.ps +1
3878+\fBNote\fR
3879+.ps -1
3880+.br
3881+.PP
3882+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
3883+.sp .5v
3884+.RE
3885 .PP
3886 \fBmysqlaccess\fR
3887 is a diagnostic tool that Yves Carlier has provided for the MySQL distribution\&. It checks the access privileges for a host name, user name, and database combination\&. Note that
3888
3889=== modified file 'man/mysqladmin.1'
3890--- man/mysqladmin.1 2014-03-03 17:51:33 +0000
3891+++ man/mysqladmin.1 2014-04-24 08:44:11 +0000
3892@@ -2,12 +2,12 @@
3893 .\" Title: \fBmysqladmin\fR
3894 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3895 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3896-.\" Date: 01/14/2014
3897+.\" Date: 03/14/2014
3898 .\" Manual: MySQL Database System
3899 .\" Source: MySQL 5.6
3900 .\" Language: English
3901 .\"
3902-.TH "\FBMYSQLADMIN\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
3903+.TH "\FBMYSQLADMIN\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
3904 .\" -----------------------------------------------------------------
3905 .\" * Define some portability stuff
3906 .\" -----------------------------------------------------------------
3907@@ -681,8 +681,8 @@
3908 Write a debugging log\&. A typical
3909 \fIdebug_options\fR
3910 string is
3911-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
3912-\*(Aqd:t:o,/tmp/mysqladmin\&.trace\*(Aq\&.
3913+d:t:o,\fIfile_name\fR\&. The default is
3914+d:t:o,/tmp/mysqladmin\&.trace\&.
3915 .RE
3916 .sp
3917 .RS 4
3918@@ -764,7 +764,7 @@
3919 Enable the
3920 mysql_clear_password
3921 cleartext authentication plugin\&. (See
3922-Section\ \&6.3.7.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
3923+Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
3924 .RE
3925 .sp
3926 .RS 4
3927@@ -809,6 +809,31 @@
3928 .sp -1
3929 .IP \(bu 2.3
3930 .\}
3931+.\" mysqladmin: login-path option
3932+.\" login-path option: mysqladmin
3933+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
3934+.sp
3935+Read options from the named login path in the
3936+\&.mylogin\&.cnf
3937+login file\&. A
3938+\(lqlogin path\(rq
3939+is an option group that permits only a limited set of options:
3940+\fBhost\fR,
3941+\fBuser\fR, and
3942+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
3943+\fBmysql_config_editor\fR
3944+utility\&. See
3945+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
3946+.RE
3947+.sp
3948+.RS 4
3949+.ie n \{\
3950+\h'-04'\(bu\h'+03'\c
3951+.\}
3952+.el \{\
3953+.sp -1
3954+.IP \(bu 2.3
3955+.\}
3956 .\" mysqladmin: no-beep option
3957 .\" no-beep option: mysqladmin
3958 \fB\-\-no\-beep\fR,
3959@@ -942,6 +967,39 @@
3960 .sp -1
3961 .IP \(bu 2.3
3962 .\}
3963+.\" mysqladmin: secure-auth option
3964+.\" secure-auth option: mysqladmin
3965+\fB\-\-secure\-auth\fR
3966+.sp
3967+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
3968+\fB\-\-skip\-secure\-auth\fR
3969+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
3970+.if n \{\
3971+.sp
3972+.\}
3973+.RS 4
3974+.it 1 an-trap
3975+.nr an-no-space-flag 1
3976+.nr an-break-flag 1
3977+.br
3978+.ps +1
3979+\fBNote\fR
3980+.ps -1
3981+.br
3982+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
3983+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
3984+.sp .5v
3985+.RE
3986+.RE
3987+.sp
3988+.RS 4
3989+.ie n \{\
3990+\h'-04'\(bu\h'+03'\c
3991+.\}
3992+.el \{\
3993+.sp -1
3994+.IP \(bu 2.3
3995+.\}
3996 .\" mysqladmin: silent option
3997 .\" silent option: mysqladmin
3998 \fB\-\-silent\fR,
3999@@ -1006,7 +1064,7 @@
4000 Options that begin with
4001 \fB\-\-ssl\fR
4002 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
4003-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
4004+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
4005 .RE
4006 .sp
4007 .RS 4
4008
4009=== modified file 'man/mysqlbinlog.1'
4010--- man/mysqlbinlog.1 2014-03-03 17:51:33 +0000
4011+++ man/mysqlbinlog.1 2014-04-24 08:44:11 +0000
4012@@ -2,12 +2,12 @@
4013 .\" Title: \fBmysqlbinlog\fR
4014 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4015 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4016-.\" Date: 01/14/2014
4017+.\" Date: 03/14/2014
4018 .\" Manual: MySQL Database System
4019 .\" Source: MySQL 5.6
4020 .\" Language: English
4021 .\"
4022-.TH "\FBMYSQLBINLOG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4023+.TH "\FBMYSQLBINLOG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4024 .\" -----------------------------------------------------------------
4025 .\" * Define some portability stuff
4026 .\" -----------------------------------------------------------------
4027@@ -517,8 +517,8 @@
4028 Write a debugging log\&. A typical
4029 \fIdebug_options\fR
4030 string is
4031-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
4032-\*(Aqd:t:o,/tmp/mysqlbinlog\&.trace\*(Aq\&.
4033+d:t:o,\fIfile_name\fR\&. The default is
4034+d:t:o,/tmp/mysqlbinlog\&.trace\&.
4035 .RE
4036 .sp
4037 .RS 4
4038@@ -743,6 +743,31 @@
4039 .sp -1
4040 .IP \(bu 2.3
4041 .\}
4042+.\" mysqlbinlog: login-path option
4043+.\" login-path option: mysqlbinlog
4044+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
4045+.sp
4046+Read options from the named login path in the
4047+\&.mylogin\&.cnf
4048+login file\&. A
4049+\(lqlogin path\(rq
4050+is an option group that permits only a limited set of options:
4051+\fBhost\fR,
4052+\fBuser\fR, and
4053+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
4054+\fBmysql_config_editor\fR
4055+utility\&. See
4056+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
4057+.RE
4058+.sp
4059+.RS 4
4060+.ie n \{\
4061+\h'-04'\(bu\h'+03'\c
4062+.\}
4063+.el \{\
4064+.sp -1
4065+.IP \(bu 2.3
4066+.\}
4067 .\" mysqlbinlog: offset option
4068 .\" offset option: mysqlbinlog
4069 \fB\-\-offset=\fR\fB\fIN\fR\fR,
4070@@ -966,6 +991,39 @@
4071 .sp -1
4072 .IP \(bu 2.3
4073 .\}
4074+.\" mysqlbinlog: secure-auth option
4075+.\" secure-auth option: mysqlbinlog
4076+\fB\-\-secure\-auth\fR
4077+.sp
4078+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
4079+\fB\-\-skip\-secure\-auth\fR
4080+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
4081+.if n \{\
4082+.sp
4083+.\}
4084+.RS 4
4085+.it 1 an-trap
4086+.nr an-no-space-flag 1
4087+.nr an-break-flag 1
4088+.br
4089+.ps +1
4090+\fBNote\fR
4091+.ps -1
4092+.br
4093+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
4094+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
4095+.sp .5v
4096+.RE
4097+.RE
4098+.sp
4099+.RS 4
4100+.ie n \{\
4101+\h'-04'\(bu\h'+03'\c
4102+.\}
4103+.el \{\
4104+.sp -1
4105+.IP \(bu 2.3
4106+.\}
4107 .\" mysqlbinlog: server-id option
4108 .\" server-id option: mysqlbinlog
4109 \fB\-\-server\-id=\fR\fB\fIid\fR\fR
4110@@ -1047,7 +1105,23 @@
4111 .\" skip-gtids option: mysqlbinlog
4112 \fB\-\-skip\-gtids[=(true|false)]\fR
4113 .sp
4114-Do not display any GTIDs\&. Not recommended in production\&. Added in MySQL 5\&.6\&.5\&.
4115+Do not display any GTIDs in the output\&. This is needed when writing to a dump file from one or more binary logs containing GTIDs, as shown in this example:
4116+.sp
4117+.if n \{\
4118+.RS 4
4119+.\}
4120+.nf
4121+shell> \fBmysqlbinlog \-\-skip\-gtids binlog\&.000001 > /tmp/dump\&.sql\fR
4122+shell> \fBmysqlbinlog \-\-skip\-gtids binlog\&.000002 >> /tmp/dump\&.sql\fR
4123+shell> \fBmysql \-u root \-p \-e "source /tmp/dump\&.sql"\fR
4124+.fi
4125+.if n \{\
4126+.RE
4127+.\}
4128+.sp
4129+The use of this option is otherwise not normally recommended in production\&.
4130+.sp
4131+This option was added in MySQL 5\&.6\&.5\&.
4132 .RE
4133 .sp
4134 .RS 4
4135
4136=== modified file 'man/mysqlbug.1'
4137--- man/mysqlbug.1 2014-03-03 17:51:33 +0000
4138+++ man/mysqlbug.1 2014-04-24 08:44:11 +0000
4139@@ -2,12 +2,12 @@
4140 .\" Title: \fBmysqlbug\fR
4141 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4142 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4143-.\" Date: 01/14/2014
4144+.\" Date: 03/14/2014
4145 .\" Manual: MySQL Database System
4146 .\" Source: MySQL 5.6
4147 .\" Language: English
4148 .\"
4149-.TH "\FBMYSQLBUG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4150+.TH "\FBMYSQLBUG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4151 .\" -----------------------------------------------------------------
4152 .\" * Define some portability stuff
4153 .\" -----------------------------------------------------------------
4154
4155=== modified file 'man/mysqlcheck.1'
4156--- man/mysqlcheck.1 2014-03-03 17:51:33 +0000
4157+++ man/mysqlcheck.1 2014-04-24 08:44:11 +0000
4158@@ -2,12 +2,12 @@
4159 .\" Title: \fBmysqlcheck\fR
4160 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4161 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4162-.\" Date: 01/14/2014
4163+.\" Date: 03/14/2014
4164 .\" Manual: MySQL Database System
4165 .\" Source: MySQL 5.6
4166 .\" Language: English
4167 .\"
4168-.TH "\FBMYSQLCHECK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4169+.TH "\FBMYSQLCHECK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4170 .\" -----------------------------------------------------------------
4171 .\" * Define some portability stuff
4172 .\" -----------------------------------------------------------------
4173@@ -110,7 +110,7 @@
4174 If
4175 \fBmysqlcheck\fR
4176 is unable to repair a table, see
4177-Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
4178+Section\ \&2.10.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
4179 for manual table repair strategies\&. This will be the case, for example, for
4180 InnoDB
4181 tables, which can be checked with
4182@@ -428,8 +428,8 @@
4183 Write a debugging log\&. A typical
4184 \fIdebug_options\fR
4185 string is
4186-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
4187-\*(Aqd:t:o\*(Aq\&.
4188+d:t:o,\fIfile_name\fR\&. The default is
4189+d:t:o\&.
4190 .RE
4191 .sp
4192 .RS 4
4193@@ -602,6 +602,31 @@
4194 .sp -1
4195 .IP \(bu 2.3
4196 .\}
4197+.\" mysqlcheck: login-path option
4198+.\" login-path option: mysqlcheck
4199+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
4200+.sp
4201+Read options from the named login path in the
4202+\&.mylogin\&.cnf
4203+login file\&. A
4204+\(lqlogin path\(rq
4205+is an option group that permits only a limited set of options:
4206+\fBhost\fR,
4207+\fBuser\fR, and
4208+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
4209+\fBmysql_config_editor\fR
4210+utility\&. See
4211+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
4212+.RE
4213+.sp
4214+.RS 4
4215+.ie n \{\
4216+\h'-04'\(bu\h'+03'\c
4217+.\}
4218+.el \{\
4219+.sp -1
4220+.IP \(bu 2.3
4221+.\}
4222 .\" mysqlcheck: medium-check option
4223 .\" medium-check option: mysqlcheck
4224 \fB\-\-medium\-check\fR,
4225@@ -769,6 +794,39 @@
4226 .sp -1
4227 .IP \(bu 2.3
4228 .\}
4229+.\" mysqlcheck: secure-auth option
4230+.\" secure-auth option: mysqlcheck
4231+\fB\-\-secure\-auth\fR
4232+.sp
4233+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
4234+\fB\-\-skip\-secure\-auth\fR
4235+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
4236+.if n \{\
4237+.sp
4238+.\}
4239+.RS 4
4240+.it 1 an-trap
4241+.nr an-no-space-flag 1
4242+.nr an-break-flag 1
4243+.br
4244+.ps +1
4245+\fBNote\fR
4246+.ps -1
4247+.br
4248+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
4249+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
4250+.sp .5v
4251+.RE
4252+.RE
4253+.sp
4254+.RS 4
4255+.ie n \{\
4256+\h'-04'\(bu\h'+03'\c
4257+.\}
4258+.el \{\
4259+.sp -1
4260+.IP \(bu 2.3
4261+.\}
4262 .\" mysqlcheck: silent option
4263 .\" silent option: mysqlcheck
4264 \fB\-\-silent\fR,
4265@@ -825,7 +883,7 @@
4266 Options that begin with
4267 \fB\-\-ssl\fR
4268 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
4269-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
4270+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
4271 .RE
4272 .sp
4273 .RS 4
4274
4275=== modified file 'man/mysqld.8'
4276--- man/mysqld.8 2014-03-03 17:51:33 +0000
4277+++ man/mysqld.8 2014-04-24 08:44:11 +0000
4278@@ -2,12 +2,12 @@
4279 .\" Title: \fBmysqld\fR
4280 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4281 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4282-.\" Date: 01/14/2014
4283+.\" Date: 03/14/2014
4284 .\" Manual: MySQL Database System
4285 .\" Source: MySQL 5.6
4286 .\" Language: English
4287 .\"
4288-.TH "\FBMYSQLD\FR" "8" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4289+.TH "\FBMYSQLD\FR" "8" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4290 .\" -----------------------------------------------------------------
4291 .\" * Define some portability stuff
4292 .\" -----------------------------------------------------------------
4293
4294=== modified file 'man/mysqld_multi.1'
4295--- man/mysqld_multi.1 2014-03-03 17:51:33 +0000
4296+++ man/mysqld_multi.1 2014-04-24 08:44:11 +0000
4297@@ -2,12 +2,12 @@
4298 .\" Title: \fBmysqld_multi\fR
4299 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4300 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4301-.\" Date: 01/14/2014
4302+.\" Date: 03/14/2014
4303 .\" Manual: MySQL Database System
4304 .\" Source: MySQL 5.6
4305 .\" Language: English
4306 .\"
4307-.TH "\FBMYSQLD_MULTI\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4308+.TH "\FBMYSQLD_MULTI\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4309 .\" -----------------------------------------------------------------
4310 .\" * Define some portability stuff
4311 .\" -----------------------------------------------------------------
4312@@ -59,7 +59,7 @@
4313 [mysqld]
4314 group used for starting
4315 \fBmysqld\fR\&. (See, for example,
4316-Section\ \&2.10.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
4317+Section\ \&2.9.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
4318 Section\ \&5.3, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&.
4319 .PP
4320 To invoke
4321
4322=== modified file 'man/mysqld_safe.1'
4323--- man/mysqld_safe.1 2014-03-03 17:51:33 +0000
4324+++ man/mysqld_safe.1 2014-04-24 08:44:11 +0000
4325@@ -2,12 +2,12 @@
4326 .\" Title: \fBmysqld_safe\fR
4327 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4328 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4329-.\" Date: 01/14/2014
4330+.\" Date: 03/14/2014
4331 .\" Manual: MySQL Database System
4332 .\" Source: MySQL 5.6
4333 .\" Language: English
4334 .\"
4335-.TH "\FBMYSQLD_SAFE\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4336+.TH "\FBMYSQLD_SAFE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4337 .\" -----------------------------------------------------------------
4338 .\" * Define some portability stuff
4339 .\" -----------------------------------------------------------------
4340
4341=== modified file 'man/mysqldump.1'
4342--- man/mysqldump.1 2014-03-03 17:51:33 +0000
4343+++ man/mysqldump.1 2014-04-24 08:44:11 +0000
4344@@ -2,12 +2,12 @@
4345 .\" Title: \fBmysqldump\fR
4346 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4347 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4348-.\" Date: 01/14/2014
4349+.\" Date: 03/14/2014
4350 .\" Manual: MySQL Database System
4351 .\" Source: MySQL 5.6
4352 .\" Language: English
4353 .\"
4354-.TH "\FBMYSQLDUMP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4355+.TH "\FBMYSQLDUMP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4356 .\" -----------------------------------------------------------------
4357 .\" * Define some portability stuff
4358 .\" -----------------------------------------------------------------
4359@@ -263,6 +263,31 @@
4360 .sp -1
4361 .IP \(bu 2.3
4362 .\}
4363+.\" mysqldump: login-path option
4364+.\" login-path option: mysqldump
4365+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
4366+.sp
4367+Read options from the named login path in the
4368+\&.mylogin\&.cnf
4369+login file\&. A
4370+\(lqlogin path\(rq
4371+is an option group that permits only a limited set of options:
4372+\fBhost\fR,
4373+\fBuser\fR, and
4374+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
4375+\fBmysql_config_editor\fR
4376+utility\&. See
4377+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
4378+.RE
4379+.sp
4380+.RS 4
4381+.ie n \{\
4382+\h'-04'\(bu\h'+03'\c
4383+.\}
4384+.el \{\
4385+.sp -1
4386+.IP \(bu 2.3
4387+.\}
4388 .\" mysqldump: password option
4389 .\" password option: mysqldump
4390 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
4391@@ -360,6 +385,39 @@
4392 .sp -1
4393 .IP \(bu 2.3
4394 .\}
4395+.\" mysqldump: secure-auth option
4396+.\" secure-auth option: mysqldump
4397+\fB\-\-secure\-auth\fR
4398+.sp
4399+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
4400+\fB\-\-skip\-secure\-auth\fR
4401+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
4402+.if n \{\
4403+.sp
4404+.\}
4405+.RS 4
4406+.it 1 an-trap
4407+.nr an-no-space-flag 1
4408+.nr an-break-flag 1
4409+.br
4410+.ps +1
4411+\fBNote\fR
4412+.ps -1
4413+.br
4414+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
4415+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
4416+.sp .5v
4417+.RE
4418+.RE
4419+.sp
4420+.RS 4
4421+.ie n \{\
4422+\h'-04'\(bu\h'+03'\c
4423+.\}
4424+.el \{\
4425+.sp -1
4426+.IP \(bu 2.3
4427+.\}
4428 .\" mysqldump: socket option
4429 .\" socket option: mysqldump
4430 \fB\-\-socket=\fR\fB\fIpath\fR\fR,
4431@@ -384,7 +442,7 @@
4432 Options that begin with
4433 \fB\-\-ssl\fR
4434 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
4435-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
4436+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
4437 .RE
4438 .sp
4439 .RS 4
4440@@ -684,8 +742,8 @@
4441 Write a debugging log\&. A typical
4442 \fIdebug_options\fR
4443 string is
4444-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default value is
4445-\*(Aqd:t:o,/tmp/mysqldump\&.trace\*(Aq\&.
4446+d:t:o,\fIfile_name\fR\&. The default value is
4447+d:t:o,/tmp/mysqldump\&.trace\&.
4448 .RE
4449 .sp
4450 .RS 4
4451
4452=== modified file 'man/mysqldumpslow.1'
4453--- man/mysqldumpslow.1 2014-03-03 17:51:33 +0000
4454+++ man/mysqldumpslow.1 2014-04-24 08:44:11 +0000
4455@@ -2,12 +2,12 @@
4456 .\" Title: \fBmysqldumpslow\fR
4457 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4458 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4459-.\" Date: 01/14/2014
4460+.\" Date: 03/14/2014
4461 .\" Manual: MySQL Database System
4462 .\" Source: MySQL 5.6
4463 .\" Language: English
4464 .\"
4465-.TH "\FBMYSQLDUMPSLOW\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4466+.TH "\FBMYSQLDUMPSLOW\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4467 .\" -----------------------------------------------------------------
4468 .\" * Define some portability stuff
4469 .\" -----------------------------------------------------------------
4470
4471=== modified file 'man/mysqlhotcopy.1'
4472--- man/mysqlhotcopy.1 2014-03-03 17:51:33 +0000
4473+++ man/mysqlhotcopy.1 2014-04-24 08:44:11 +0000
4474@@ -2,12 +2,12 @@
4475 .\" Title: \fBmysqlhotcopy\fR
4476 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4477 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4478-.\" Date: 01/14/2014
4479+.\" Date: 03/14/2014
4480 .\" Manual: MySQL Database System
4481 .\" Source: MySQL 5.6
4482 .\" Language: English
4483 .\"
4484-.TH "\FBMYSQLHOTCOPY\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4485+.TH "\FBMYSQLHOTCOPY\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4486 .\" -----------------------------------------------------------------
4487 .\" * Define some portability stuff
4488 .\" -----------------------------------------------------------------
4489
4490=== modified file 'man/mysqlimport.1'
4491--- man/mysqlimport.1 2014-03-03 17:51:33 +0000
4492+++ man/mysqlimport.1 2014-04-24 08:44:11 +0000
4493@@ -2,12 +2,12 @@
4494 .\" Title: \fBmysqlimport\fR
4495 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4496 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4497-.\" Date: 01/14/2014
4498+.\" Date: 03/14/2014
4499 .\" Manual: MySQL Database System
4500 .\" Source: MySQL 5.6
4501 .\" Language: English
4502 .\"
4503-.TH "\FBMYSQLIMPORT\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4504+.TH "\FBMYSQLIMPORT\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4505 .\" -----------------------------------------------------------------
4506 .\" * Define some portability stuff
4507 .\" -----------------------------------------------------------------
4508@@ -180,8 +180,8 @@
4509 Write a debugging log\&. A typical
4510 \fIdebug_options\fR
4511 string is
4512-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
4513-\*(Aqd:t:o\*(Aq\&.
4514+d:t:o,\fIfile_name\fR\&. The default is
4515+d:t:o\&.
4516 .RE
4517 .sp
4518 .RS 4
4519@@ -423,6 +423,31 @@
4520 .sp -1
4521 .IP \(bu 2.3
4522 .\}
4523+.\" mysqlimport: login-path option
4524+.\" login-path option: mysqlimport
4525+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
4526+.sp
4527+Read options from the named login path in the
4528+\&.mylogin\&.cnf
4529+login file\&. A
4530+\(lqlogin path\(rq
4531+is an option group that permits only a limited set of options:
4532+\fBhost\fR,
4533+\fBuser\fR, and
4534+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
4535+\fBmysql_config_editor\fR
4536+utility\&. See
4537+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
4538+.RE
4539+.sp
4540+.RS 4
4541+.ie n \{\
4542+\h'-04'\(bu\h'+03'\c
4543+.\}
4544+.el \{\
4545+.sp -1
4546+.IP \(bu 2.3
4547+.\}
4548 .\" mysqlimport: low-priority option
4549 .\" low-priority option: mysqlimport
4550 \fB\-\-low\-priority\fR
4551@@ -564,6 +589,39 @@
4552 .sp -1
4553 .IP \(bu 2.3
4554 .\}
4555+.\" mysqlimport: secure-auth option
4556+.\" secure-auth option: mysqlimport
4557+\fB\-\-secure\-auth\fR
4558+.sp
4559+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
4560+\fB\-\-skip\-secure\-auth\fR
4561+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
4562+.if n \{\
4563+.sp
4564+.\}
4565+.RS 4
4566+.it 1 an-trap
4567+.nr an-no-space-flag 1
4568+.nr an-break-flag 1
4569+.br
4570+.ps +1
4571+\fBNote\fR
4572+.ps -1
4573+.br
4574+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
4575+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
4576+.sp .5v
4577+.RE
4578+.RE
4579+.sp
4580+.RS 4
4581+.ie n \{\
4582+\h'-04'\(bu\h'+03'\c
4583+.\}
4584+.el \{\
4585+.sp -1
4586+.IP \(bu 2.3
4587+.\}
4588 .\" mysqlimport: silent option
4589 .\" silent option: mysqlimport
4590 \fB\-\-silent\fR,
4591@@ -604,7 +662,7 @@
4592 Options that begin with
4593 \fB\-\-ssl\fR
4594 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
4595-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
4596+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
4597 .RE
4598 .sp
4599 .RS 4
4600
4601=== modified file 'man/mysqlshow.1'
4602--- man/mysqlshow.1 2014-03-03 17:51:33 +0000
4603+++ man/mysqlshow.1 2014-04-24 08:44:11 +0000
4604@@ -2,12 +2,12 @@
4605 .\" Title: \fBmysqlshow\fR
4606 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4607 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4608-.\" Date: 01/14/2014
4609+.\" Date: 03/14/2014
4610 .\" Manual: MySQL Database System
4611 .\" Source: MySQL 5.6
4612 .\" Language: English
4613 .\"
4614-.TH "\FBMYSQLSHOW\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4615+.TH "\FBMYSQLSHOW\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4616 .\" -----------------------------------------------------------------
4617 .\" * Define some portability stuff
4618 .\" -----------------------------------------------------------------
4619@@ -227,8 +227,8 @@
4620 Write a debugging log\&. A typical
4621 \fIdebug_options\fR
4622 string is
4623-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
4624-\*(Aqd:t:o\*(Aq\&.
4625+d:t:o,\fIfile_name\fR\&. The default is
4626+d:t:o\&.
4627 .RE
4628 .sp
4629 .RS 4
4630@@ -337,6 +337,31 @@
4631 .sp -1
4632 .IP \(bu 2.3
4633 .\}
4634+.\" mysqlshow: login-path option
4635+.\" login-path option: mysqlshow
4636+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
4637+.sp
4638+Read options from the named login path in the
4639+\&.mylogin\&.cnf
4640+login file\&. A
4641+\(lqlogin path\(rq
4642+is an option group that permits only a limited set of options:
4643+\fBhost\fR,
4644+\fBuser\fR, and
4645+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
4646+\fBmysql_config_editor\fR
4647+utility\&. See
4648+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
4649+.RE
4650+.sp
4651+.RS 4
4652+.ie n \{\
4653+\h'-04'\(bu\h'+03'\c
4654+.\}
4655+.el \{\
4656+.sp -1
4657+.IP \(bu 2.3
4658+.\}
4659 .\" mysqlshow: password option
4660 .\" password option: mysqlshow
4661 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
4662@@ -436,6 +461,39 @@
4663 .sp -1
4664 .IP \(bu 2.3
4665 .\}
4666+.\" mysqlshow: secure-auth option
4667+.\" secure-auth option: mysqlshow
4668+\fB\-\-secure\-auth\fR
4669+.sp
4670+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
4671+\fB\-\-skip\-secure\-auth\fR
4672+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
4673+.if n \{\
4674+.sp
4675+.\}
4676+.RS 4
4677+.it 1 an-trap
4678+.nr an-no-space-flag 1
4679+.nr an-break-flag 1
4680+.br
4681+.ps +1
4682+\fBNote\fR
4683+.ps -1
4684+.br
4685+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
4686+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
4687+.sp .5v
4688+.RE
4689+.RE
4690+.sp
4691+.RS 4
4692+.ie n \{\
4693+\h'-04'\(bu\h'+03'\c
4694+.\}
4695+.el \{\
4696+.sp -1
4697+.IP \(bu 2.3
4698+.\}
4699 .\" mysqlshow: show-table-type option
4700 .\" show-table-type option: mysqlshow
4701 \fB\-\-show\-table\-type\fR,
4702@@ -480,7 +538,7 @@
4703 Options that begin with
4704 \fB\-\-ssl\fR
4705 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
4706-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
4707+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
4708 .RE
4709 .sp
4710 .RS 4
4711
4712=== modified file 'man/mysqlslap.1'
4713--- man/mysqlslap.1 2014-03-03 17:51:33 +0000
4714+++ man/mysqlslap.1 2014-04-24 08:44:11 +0000
4715@@ -2,12 +2,12 @@
4716 .\" Title: \fBmysqlslap\fR
4717 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4718 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4719-.\" Date: 01/14/2014
4720+.\" Date: 03/14/2014
4721 .\" Manual: MySQL Database System
4722 .\" Source: MySQL 5.6
4723 .\" Language: English
4724 .\"
4725-.TH "\FBMYSQLSLAP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4726+.TH "\FBMYSQLSLAP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4727 .\" -----------------------------------------------------------------
4728 .\" * Define some portability stuff
4729 .\" -----------------------------------------------------------------
4730@@ -466,8 +466,8 @@
4731 Write a debugging log\&. A typical
4732 \fIdebug_options\fR
4733 string is
4734-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
4735-\*(Aqd:t:o,/tmp/mysqlslap\&.trace\*(Aq\&.
4736+d:t:o,\fIfile_name\fR\&. The default is
4737+d:t:o,/tmp/mysqlslap\&.trace\&.
4738 .RE
4739 .sp
4740 .RS 4
4741@@ -567,7 +567,7 @@
4742 Enable the
4743 mysql_clear_password
4744 cleartext authentication plugin\&. (See
4745-Section\ \&6.3.7.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
4746+Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
4747 .RE
4748 .sp
4749 .RS 4
4750@@ -626,6 +626,31 @@
4751 .sp -1
4752 .IP \(bu 2.3
4753 .\}
4754+.\" mysqlslap: login-path option
4755+.\" login-path option: mysqlslap
4756+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
4757+.sp
4758+Read options from the named login path in the
4759+\&.mylogin\&.cnf
4760+login file\&. A
4761+\(lqlogin path\(rq
4762+is an option group that permits only a limited set of options:
4763+\fBhost\fR,
4764+\fBuser\fR, and
4765+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
4766+\fBmysql_config_editor\fR
4767+utility\&. See
4768+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
4769+.RE
4770+.sp
4771+.RS 4
4772+.ie n \{\
4773+\h'-04'\(bu\h'+03'\c
4774+.\}
4775+.el \{\
4776+.sp -1
4777+.IP \(bu 2.3
4778+.\}
4779 .\" mysqlslap: no-drop option
4780 .\" no-drop option: mysqlslap
4781 \fB\-\-no\-drop\fR
4782@@ -926,6 +951,39 @@
4783 .sp -1
4784 .IP \(bu 2.3
4785 .\}
4786+.\" mysqlslap: secure-auth option
4787+.\" secure-auth option: mysqlslap
4788+\fB\-\-secure\-auth\fR
4789+.sp
4790+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
4791+\fB\-\-skip\-secure\-auth\fR
4792+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
4793+.if n \{\
4794+.sp
4795+.\}
4796+.RS 4
4797+.it 1 an-trap
4798+.nr an-no-space-flag 1
4799+.nr an-break-flag 1
4800+.br
4801+.ps +1
4802+\fBNote\fR
4803+.ps -1
4804+.br
4805+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
4806+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
4807+.sp .5v
4808+.RE
4809+.RE
4810+.sp
4811+.RS 4
4812+.ie n \{\
4813+\h'-04'\(bu\h'+03'\c
4814+.\}
4815+.el \{\
4816+.sp -1
4817+.IP \(bu 2.3
4818+.\}
4819 .\" mysqlslap: silent option
4820 .\" silent option: mysqlslap
4821 \fB\-\-silent\fR,
4822@@ -966,7 +1024,7 @@
4823 Options that begin with
4824 \fB\-\-ssl\fR
4825 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
4826-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
4827+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
4828 .RE
4829 .sp
4830 .RS 4
4831
4832=== modified file 'man/mysqltest.1'
4833--- man/mysqltest.1 2014-03-03 17:51:33 +0000
4834+++ man/mysqltest.1 2014-04-24 08:44:11 +0000
4835@@ -2,12 +2,12 @@
4836 .\" Title: \fBmysqltest\fR
4837 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4838 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4839-.\" Date: 01/10/2014
4840+.\" Date: 03/10/2014
4841 .\" Manual: MySQL Database System
4842 .\" Source: MySQL
4843 .\" Language: English
4844 .\"
4845-.TH "\FBMYSQLTEST\FR" "1" "01/10/2014" "MySQL" "MySQL Database System"
4846+.TH "\FBMYSQLTEST\FR" "1" "03/10/2014" "MySQL" "MySQL Database System"
4847 .\" -----------------------------------------------------------------
4848 .\" * Define some portability stuff
4849 .\" -----------------------------------------------------------------
4850
4851=== modified file 'man/ndb-common-options.1'
4852--- man/ndb-common-options.1 2014-02-17 11:12:40 +0000
4853+++ man/ndb-common-options.1 2014-04-24 08:44:11 +0000
4854@@ -2,12 +2,12 @@
4855 .\" Title: Options Common to MySQL Cluster Programs
4856 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4857 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4858-.\" Date: 01/14/2014
4859+.\" Date: 03/14/2014
4860 .\" Manual: MySQL Database System
4861 .\" Source: MySQL 5.6
4862 .\" Language: English
4863 .\"
4864-.TH "OPTIONS COMMON TO MY" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4865+.TH "OPTIONS COMMON TO MY" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4866 .\" -----------------------------------------------------------------
4867 .\" * Define some portability stuff
4868 .\" -----------------------------------------------------------------
4869
4870=== modified file 'man/ndb_blob_tool.1'
4871--- man/ndb_blob_tool.1 2014-03-03 17:51:33 +0000
4872+++ man/ndb_blob_tool.1 2014-04-24 08:44:11 +0000
4873@@ -2,12 +2,12 @@
4874 .\" Title: \fBndb_blob_tool\fR
4875 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4876 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4877-.\" Date: 01/14/2014
4878+.\" Date: 03/14/2014
4879 .\" Manual: MySQL Database System
4880 .\" Source: MySQL 5.6
4881 .\" Language: English
4882 .\"
4883-.TH "\FBNDB_BLOB_TOOL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4884+.TH "\FBNDB_BLOB_TOOL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4885 .\" -----------------------------------------------------------------
4886 .\" * Define some portability stuff
4887 .\" -----------------------------------------------------------------
4888
4889=== modified file 'man/ndb_config.1'
4890--- man/ndb_config.1 2014-03-03 17:51:33 +0000
4891+++ man/ndb_config.1 2014-04-24 08:44:11 +0000
4892@@ -2,12 +2,12 @@
4893 .\" Title: \fBndb_config\fR
4894 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4895 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4896-.\" Date: 01/14/2014
4897+.\" Date: 03/14/2014
4898 .\" Manual: MySQL Database System
4899 .\" Source: MySQL 5.6
4900 .\" Language: English
4901 .\"
4902-.TH "\FBNDB_CONFIG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4903+.TH "\FBNDB_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4904 .\" -----------------------------------------------------------------
4905 .\" * Define some portability stuff
4906 .\" -----------------------------------------------------------------
4907@@ -904,6 +904,7 @@
4908 :T{
4909 \fBDefault\fR
4910 T}:T{
4911+[none]
4912 T}
4913 :T{
4914 \fBValid Values\fR
4915@@ -1229,7 +1230,7 @@
4916 .\}
4917 .nf
4918 shell> \fBndb_config \-\-configinfo \-\-xml\fR
4919-<configvariables protocolversion="1" ndbversionstring="5\&.6\&.14\-ndb\-7\&.3\&.4"
4920+<configvariables protocolversion="1" ndbversionstring="5\&.6\&.16\-ndb\-7\&.3\&.5"
4921 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
4922 ndbversionbuild="6">
4923 <section name="SYSTEM">
4924
4925=== modified file 'man/ndb_cpcd.1'
4926--- man/ndb_cpcd.1 2014-03-03 17:51:33 +0000
4927+++ man/ndb_cpcd.1 2014-04-24 08:44:11 +0000
4928@@ -2,12 +2,12 @@
4929 .\" Title: \fBndb_cpcd\fR
4930 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4931 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4932-.\" Date: 01/14/2014
4933+.\" Date: 03/14/2014
4934 .\" Manual: MySQL Database System
4935 .\" Source: MySQL 5.6
4936 .\" Language: English
4937 .\"
4938-.TH "\FBNDB_CPCD\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4939+.TH "\FBNDB_CPCD\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4940 .\" -----------------------------------------------------------------
4941 .\" * Define some portability stuff
4942 .\" -----------------------------------------------------------------
4943
4944=== modified file 'man/ndb_delete_all.1'
4945--- man/ndb_delete_all.1 2014-03-03 17:51:33 +0000
4946+++ man/ndb_delete_all.1 2014-04-24 08:44:11 +0000
4947@@ -2,12 +2,12 @@
4948 .\" Title: \fBndb_delete_all\fR
4949 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4950 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4951-.\" Date: 01/14/2014
4952+.\" Date: 03/14/2014
4953 .\" Manual: MySQL Database System
4954 .\" Source: MySQL 5.6
4955 .\" Language: English
4956 .\"
4957-.TH "\FBNDB_DELETE_ALL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4958+.TH "\FBNDB_DELETE_ALL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4959 .\" -----------------------------------------------------------------
4960 .\" * Define some portability stuff
4961 .\" -----------------------------------------------------------------
4962
4963=== modified file 'man/ndb_desc.1'
4964--- man/ndb_desc.1 2014-03-03 17:51:33 +0000
4965+++ man/ndb_desc.1 2014-04-24 08:44:11 +0000
4966@@ -2,12 +2,12 @@
4967 .\" Title: \fBndb_desc\fR
4968 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4969 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4970-.\" Date: 01/14/2014
4971+.\" Date: 03/14/2014
4972 .\" Manual: MySQL Database System
4973 .\" Source: MySQL 5.6
4974 .\" Language: English
4975 .\"
4976-.TH "\FBNDB_DESC\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4977+.TH "\FBNDB_DESC\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4978 .\" -----------------------------------------------------------------
4979 .\" * Define some portability stuff
4980 .\" -----------------------------------------------------------------
4981
4982=== modified file 'man/ndb_drop_index.1'
4983--- man/ndb_drop_index.1 2014-03-03 17:51:33 +0000
4984+++ man/ndb_drop_index.1 2014-04-24 08:44:11 +0000
4985@@ -2,12 +2,12 @@
4986 .\" Title: \fBndb_drop_index\fR
4987 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4988 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4989-.\" Date: 01/14/2014
4990+.\" Date: 03/14/2014
4991 .\" Manual: MySQL Database System
4992 .\" Source: MySQL 5.6
4993 .\" Language: English
4994 .\"
4995-.TH "\FBNDB_DROP_INDEX\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
4996+.TH "\FBNDB_DROP_INDEX\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
4997 .\" -----------------------------------------------------------------
4998 .\" * Define some portability stuff
4999 .\" -----------------------------------------------------------------
5000@@ -123,7 +123,7 @@
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches