Merge lp:~laurynas-biveinis/percona-server/merge-5.5.39 into lp:percona-server/5.5

Proposed by Laurynas Biveinis on 2014-08-12
Status: Merged
Approved by: Alexey Kopytov on 2014-08-22
Approved revision: no longer in the source branch.
Merged at revision: 692
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.5.39
Merge into: lp:percona-server/5.5
Diff against target: 13677 lines (+4181/-4745)
218 files modified
CMakeLists.txt (+8/-1)
VERSION (+2/-2)
client/mysqladmin.cc (+56/-4)
client/mysqldump.c (+28/-11)
cmake/dtrace.cmake (+23/-20)
cmake/install_macros.cmake (+13/-4)
cmake/os/Windows.cmake (+21/-14)
extra/yassl/CMakeLists.txt (+1/-2)
extra/yassl/src/ssl.cpp (+5/-2)
extra/yassl/taocrypt/CMakeLists.txt (+1/-2)
extra/yassl/taocrypt/include/asn.hpp (+4/-4)
include/mysql/thread_pool_priv.h (+3/-1)
libmysql/CMakeLists.txt (+0/-1)
libmysql/authentication_win/CMakeLists.txt (+1/-2)
man/comp_err.1 (+2/-2)
man/innochecksum.1 (+2/-2)
man/msql2mysql.1 (+2/-2)
man/my_print_defaults.1 (+2/-2)
man/myisam_ftdump.1 (+2/-2)
man/myisamchk.1 (+3/-3)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+3/-3)
man/mysql-stress-test.pl.1 (+2/-2)
man/mysql-test-run.pl.1 (+2/-2)
man/mysql.1 (+33/-12)
man/mysql.server.1 (+2/-2)
man/mysql_client_test.1 (+2/-2)
man/mysql_config.1 (+2/-2)
man/mysql_convert_table_format.1 (+2/-2)
man/mysql_find_rows.1 (+2/-2)
man/mysql_fix_extensions.1 (+2/-2)
man/mysql_install_db.1 (+3/-3)
man/mysql_plugin.1 (+3/-3)
man/mysql_secure_installation.1 (+2/-2)
man/mysql_setpermission.1 (+2/-2)
man/mysql_tzinfo_to_sql.1 (+2/-2)
man/mysql_upgrade.1 (+30/-6)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+4/-4)
man/mysqlbinlog.1 (+39/-6)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+19/-4)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+3/-3)
man/mysqld_safe.1 (+4/-4)
man/mysqldump.1 (+10/-10)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+3/-3)
man/mysqlimport.1 (+3/-3)
man/mysqlshow.1 (+3/-3)
man/mysqlslap.1 (+3/-3)
man/mysqltest.1 (+2/-2)
man/ndb-common-options.1 (+8/-8)
man/ndb_blob_tool.1 (+4/-4)
man/ndb_config.1 (+5/-5)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+3/-3)
man/ndb_desc.1 (+4/-4)
man/ndb_drop_index.1 (+4/-4)
man/ndb_drop_table.1 (+3/-3)
man/ndb_error_reporter.1 (+3/-3)
man/ndb_index_stat.1 (+55/-7)
man/ndb_mgm.1 (+5/-5)
man/ndb_mgmd.8 (+14/-16)
man/ndb_print_backup_file.1 (+3/-3)
man/ndb_print_schema_file.1 (+2/-2)
man/ndb_print_sys_file.1 (+2/-2)
man/ndb_restore.1 (+122/-20)
man/ndb_select_all.1 (+5/-5)
man/ndb_select_count.1 (+3/-3)
man/ndb_show_tables.1 (+3/-3)
man/ndb_size.pl.1 (+3/-3)
man/ndb_waiter.1 (+3/-3)
man/ndbd.8 (+7/-7)
man/ndbd_redo_log_reader.1 (+3/-3)
man/ndbinfo_select_all.1 (+3/-3)
man/ndbmtd.8 (+3/-3)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+3/-3)
man/resolveip.1 (+2/-2)
mysql-test/extra/rpl_tests/rpl_stop_slave.test (+4/-0)
mysql-test/include/stop_dump_threads.inc (+32/-0)
mysql-test/include/uninstall_semisync.inc (+5/-0)
mysql-test/r/bug71858.result (+10/-0)
mysql-test/r/failed_auth_3909.result (+2/-2)
mysql-test/r/group_min_max.result (+54/-2)
mysql-test/r/group_min_max_innodb.result (+168/-0)
mysql-test/r/mysqld--help-notwin.result (+2/-2)
mysql-test/r/mysqld--help-win.result (+2/-2)
mysql-test/r/partition_archive.result (+26/-0)
mysql-test/r/partition_pruning.result (+114/-0)
mysql-test/r/percona_bug1289599.result (+2/-2)
mysql-test/r/plugin.result (+70/-0)
mysql-test/r/plugin_auth_qa_3.result (+1/-1)
mysql-test/r/show_processlist.result (+47/-0)
mysql-test/r/union.result (+34/-0)
mysql-test/r/variables.result (+4/-0)
mysql-test/r/view.result (+37/-0)
mysql-test/suite/binlog/t/binlog_killed.test (+8/-0)
mysql-test/suite/innodb/r/bug71585.result (+9/-0)
mysql-test/suite/innodb/r/bug72665.result (+11/-0)
mysql-test/suite/innodb/r/innodb-fk.result (+35/-0)
mysql-test/suite/innodb/t/bug71585.test (+19/-0)
mysql-test/suite/innodb/t/bug72665.test (+14/-0)
mysql-test/suite/innodb/t/innodb-fk.test (+86/-0)
mysql-test/suite/innodb/t/innodb_bug60196-master.opt (+1/-1)
mysql-test/suite/rpl/r/rpl_4threads_deadlock.result (+43/-0)
mysql-test/suite/rpl/r/rpl_semi_sync.result (+2/-2)
mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result (+36/-0)
mysql-test/suite/rpl/r/rpl_stop_slave.result (+7/-2)
mysql-test/suite/rpl/t/rpl_4threads_deadlock.test (+117/-0)
mysql-test/suite/rpl/t/rpl_semi_sync.test (+2/-10)
mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test (+145/-0)
mysql-test/suite/rpl/t/rpl_stop_slave.test (+27/-2)
mysql-test/suite/sys_vars/r/timed_mutexes_basic.result (+20/-0)
mysql-test/t/bug71858.test (+14/-0)
mysql-test/t/failed_auth_3909.test (+2/-5)
mysql-test/t/group_min_max.test (+24/-0)
mysql-test/t/group_min_max_innodb.test (+93/-0)
mysql-test/t/long_tmpdir-master.sh (+2/-0)
mysql-test/t/lowercase_mixed_tmpdir-master.sh (+2/-0)
mysql-test/t/lowercase_table4-master.opt (+1/-1)
mysql-test/t/partition_archive.test (+18/-0)
mysql-test/t/partition_pruning.test (+48/-0)
mysql-test/t/percona_bug1289599.test (+2/-2)
mysql-test/t/percona_utility_user-master.opt (+1/-1)
mysql-test/t/plugin.test (+117/-0)
mysql-test/t/show_processlist.test (+63/-0)
mysql-test/t/union.test (+31/-0)
mysql-test/t/view.test (+37/-0)
mysys/CMakeLists.txt (+1/-2)
packaging/rpm-oel/filter-requires.sh (+1/-1)
packaging/rpm-oel/mysql.spec.in (+47/-4)
packaging/rpm-uln/CMakeLists.txt (+0/-38)
packaging/rpm-uln/README-ULN (+0/-15)
packaging/rpm-uln/README.mysql-docs (+0/-4)
packaging/rpm-uln/filter-requires-mysql.sh (+0/-3)
packaging/rpm-uln/generate-tarball.sh (+0/-15)
packaging/rpm-uln/my.cnf (+0/-10)
packaging/rpm-uln/my_config.h (+0/-29)
packaging/rpm-uln/mysql-5.5-errno.patch (+0/-21)
packaging/rpm-uln/mysql-5.5-fix-tests.patch (+0/-34)
packaging/rpm-uln/mysql-5.5-libdir.patch (+0/-28)
packaging/rpm-uln/mysql-5.5-mtr1.patch (+0/-25)
packaging/rpm-uln/mysql-5.5-stack-guard.patch (+0/-140)
packaging/rpm-uln/mysql-5.5-testing.patch (+0/-23)
packaging/rpm-uln/mysql-chain-certs.patch (+0/-45)
packaging/rpm-uln/mysql-embedded-check.c (+0/-26)
packaging/rpm-uln/mysql-expired-certs.patch (+0/-555)
packaging/rpm-uln/mysql-install-test.patch (+0/-33)
packaging/rpm-uln/mysql-strmov.patch (+0/-32)
packaging/rpm-uln/mysql.init (+0/-209)
packaging/rpm-uln/mysql.spec.sh (+0/-1991)
packaging/rpm-uln/scriptstub.c (+0/-32)
scripts/CMakeLists.txt (+1/-0)
scripts/mysql_config.sh (+4/-3)
sql-bench/graph-compare-results.sh (+2/-0)
sql-bench/innotest1.sh (+140/-140)
sql-bench/innotest1a.sh (+106/-106)
sql-bench/innotest1b.sh (+99/-99)
sql-bench/innotest2.sh (+148/-148)
sql-bench/innotest2a.sh (+92/-92)
sql-bench/innotest2b.sh (+102/-102)
sql/event_scheduler.cc (+5/-3)
sql/item_strfunc.cc (+83/-59)
sql/log.cc (+8/-8)
sql/log_event_old.cc (+2/-1)
sql/mysqld.cc (+14/-3)
sql/mysqld.h (+4/-2)
sql/opt_range.cc (+157/-56)
sql/scheduler.cc (+2/-1)
sql/slave.cc (+7/-1)
sql/sql_acl.cc (+72/-49)
sql/sql_class.cc (+28/-1)
sql/sql_insert.cc (+3/-1)
sql/sql_lex.cc (+9/-10)
sql/sql_lex.h (+2/-3)
sql/sql_parse.cc (+2/-2)
sql/sql_partition.cc (+37/-26)
sql/sql_plugin.cc (+67/-4)
sql/sql_plugin.h (+2/-0)
sql/sql_repl.cc (+3/-2)
sql/sql_show.cc (+99/-12)
sql/sql_show.h (+1/-0)
sql/sql_table.cc (+39/-31)
sql/sql_table.h (+3/-0)
sql/sql_union.cc (+7/-1)
sql/sql_view.cc (+46/-14)
sql/sql_yacc.yy (+8/-11)
sql/sys_vars.cc (+5/-4)
sql/table.cc (+29/-6)
sql/threadpool_common.cc (+1/-0)
sql/threadpool_unix.cc (+2/-2)
storage/heap/hp_block.c (+3/-2)
storage/heap/hp_create.c (+2/-2)
storage/innobase/dict/dict0crea.c (+38/-4)
storage/innobase/dict/dict0dict.c (+84/-31)
storage/innobase/dict/dict0load.c (+84/-9)
storage/innobase/dict/dict0mem.c (+14/-1)
storage/innobase/handler/i_s.cc (+13/-0)
storage/innobase/include/dict0dict.h (+38/-1)
storage/innobase/include/dict0dict.ic (+60/-1)
storage/innobase/include/dict0load.h (+12/-0)
storage/innobase/include/dict0mem.h (+10/-2)
storage/myisam/ha_myisam.cc (+0/-1)
strings/CMakeLists.txt (+1/-2)
strings/ctype-bin.c (+2/-1)
strings/ctype-eucjpms.c (+2/-1)
strings/ctype-ujis.c (+2/-1)
support-files/CMakeLists.txt (+4/-2)
support-files/mysql.spec.sh (+6/-1)
vio/CMakeLists.txt (+1/-2)
zlib/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.5.39
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-08-12 Approve on 2014-08-22
Review via email: mp+230451@code.launchpad.net

Description of the change

Merge MySQL 5.5.39, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.39,
and taking the upstream fix for bug 1346122.

Revert our fix for bug 1262439 to take the upstream fix
(http://bugs.mysql.com/bug.php?id=71250).

Revert Oracle fix for bug 1277351 /
http://bugs.mysql.com/bug.php?id=71603 and keep the MariaDB fix in
5.5.

Revert our fix for bug 1171941 to take the upstream fix (rev
4676). The Oracle fix loses the feature of returning occasional
"change authentication plugin" error, which should be fine. Adapt the
utility user feature to the fix by initializing the new
ACL_USER::can_authenticate field in acl_init_utility_user.

Add changes necessary for the upstream fix of
http://bugs.mysql.com/bug.php?id=69954, that introduced new mutex,
LOCK_thd_remove: release it in threadpool_remove_connection, change
timeout_check in threadpool_unix.cc to take LOCK_thd_remove instead of
LOCK_thread_count.

Add testases for fixed-in-upstream
http://bugs.mysql.com/bug.php?id=72665,
http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
http://bugs.mysql.com/bug.php?id=71858 (bug 1286186).

Re-order error messages in errmsg-utf8.txt to keep the upstream error
numbering intact, re-record affected testcases.

Imported man pages from mysql-5.5.39.tar.gz.

    http://jenkins.percona.com/job/percona-server-5.5-param/1037/

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

- what’s wrong with Oracle’s fix for bug 1277351 /
http://bugs.mysql.com/bug.php?id=71603

- I don’t see any revisions with fixes for
  http://bugs.mysql.com/bug.php?id=72665 (what is it anyway?),
  http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
  http://bugs.mysql.com/bug.php?id=71858 (bug 1286186)?

- I don’t see any changes to errmsg-utf8.txt, nor any changes in .result
  files that might be relevant to “re-record affected testcases”?

review: Needs Information

> - what’s wrong with Oracle’s fix for bug 1277351 /
> http://bugs.mysql.com/bug.php?id=71603

Nothing is wrong with that fix, it's just that this bug is part of the MDEV-382 bug batch. The other fixes of MDEV-382 are not reverted in 5.5 at the moment, and in general it is easiest to revert the whole batch at the same time, separate from other work such as merges. But this particular bug fix happens to be local enough to be reverted with the merge, if you want me to.

> - I don’t see any revisions with fixes for
> http://bugs.mysql.com/bug.php?id=72665 (what is it anyway?),
> http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
> http://bugs.mysql.com/bug.php?id=71858 (bug 1286186)?

72665 fix is lp:mysql-server/5.5 commit 4666. The other two have been fixed in a release before, 5.5.38, but I missed the fact at the time. I don't have their revisions handy, can dig up if needed.

72665 is

CREATE TABLE t1(c42 tinyblob not null, c45 TEXT, unique(c42 (255)), unique(c45 (255))) ENGINE=innodb;

ALTER TABLE t1 MODIFY c45 SET('') NOT NULL;

DROP TABLE t1;

140516 9:19:16 InnoDB: Assertion failure in thread 4608106496 in file ha_innodb.cc line 7215
InnoDB: Failing assertion: primary_key_no == -1 || primary_key_no == 0

> - I don’t see any changes to errmsg-utf8.txt, nor any changes in .result
> files that might be relevant to “re-record affected testcases”?

I mixed up the commit messages, this bit should have gone to the 5.6.20 merge one.

Alexey Kopytov (akopytov) :
review: Approve
692. By Laurynas Biveinis on 2014-08-22

Merge MySQL 5.5.39, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.39,
and taking the upstream fix for bug 1346122.

Revert our fix for bug 1262439 to take the upstream fix
(http://bugs.mysql.com/bug.php?id=71250).

Revert Oracle fix for bug 1277351 /
http://bugs.mysql.com/bug.php?id=71603 and keep the MariaDB fix in
5.5.

Revert our fix for bug 1171941 to take the upstream fix (rev
4676). The Oracle fix loses the feature of returning occasional
"change authentication plugin" error, which should be fine. Adapt the
utility user feature to the fix by initializing the new
ACL_USER::can_authenticate field in acl_init_utility_user.

Add changes necessary for the upstream fix of
http://bugs.mysql.com/bug.php?id=69954, that introduced new mutex,
LOCK_thd_remove: release it in threadpool_remove_connection, change
timeout_check in threadpool_unix.cc to take LOCK_thd_remove instead of
LOCK_thread_count.

Add testases for fixed-in-upstream
http://bugs.mysql.com/bug.php?id=72665,
http://bugs.mysql.com/bug.php?id=71585 (bug 1278072), and
http://bugs.mysql.com/bug.php?id=71858 (bug 1286186).

Imported man pages from mysql-5.5.39.tar.gz.

Repushed the branch to fix the commit message (errmsg-utf8.txt bit).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-06-03 13:14:25 +0000
+++ CMakeLists.txt 2014-08-22 10:00:31 +0000
@@ -25,6 +25,14 @@
25 CMAKE_POLICY(SET CMP0022 OLD)25 CMAKE_POLICY(SET CMP0022 OLD)
26ENDIF()26ENDIF()
2727
28# We use the LOCATION target property (CMP0026)
29# and get_target_property() for non-existent targets (CMP0045)
30IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
31 CMAKE_VERSION VERSION_GREATER "3.0.0")
32 CMAKE_POLICY(SET CMP0026 OLD)
33 CMAKE_POLICY(SET CMP0045 OLD)
34ENDIF()
35
28MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")36MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
2937
30SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)38SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
@@ -434,7 +442,6 @@
434 IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)442 IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
435 ADD_SUBDIRECTORY(internal)443 ADD_SUBDIRECTORY(internal)
436 ENDIF()444 ENDIF()
437 ADD_SUBDIRECTORY(packaging/rpm-uln)
438 ADD_SUBDIRECTORY(packaging/rpm-oel)445 ADD_SUBDIRECTORY(packaging/rpm-oel)
439ENDIF()446ENDIF()
440447
441448
=== modified file 'VERSION'
--- VERSION 2014-06-11 13:42:04 +0000
+++ VERSION 2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
1MYSQL_VERSION_MAJOR=51MYSQL_VERSION_MAJOR=5
2MYSQL_VERSION_MINOR=52MYSQL_VERSION_MINOR=5
3MYSQL_VERSION_PATCH=383MYSQL_VERSION_PATCH=39
4MYSQL_VERSION_EXTRA=-35.24MYSQL_VERSION_EXTRA=-36.0
55
=== modified file 'client/mysqladmin.cc'
--- client/mysqladmin.cc 2013-03-19 14:53:48 +0000
+++ client/mysqladmin.cc 2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.2 Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
33
4 This program is free software; you can redistribute it and/or modify4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by5 it under the terms of the GNU General Public License as published by
@@ -71,6 +71,7 @@
71 char *argument);71 char *argument);
72static my_bool sql_connect(MYSQL *mysql, uint wait);72static my_bool sql_connect(MYSQL *mysql, uint wait);
73static int execute_commands(MYSQL *mysql,int argc, char **argv);73static int execute_commands(MYSQL *mysql,int argc, char **argv);
74static char **mask_password(int argc, char ***argv);
74static int drop_db(MYSQL *mysql,const char *db);75static int drop_db(MYSQL *mysql,const char *db);
75extern "C" sig_handler endprog(int signal_number);76extern "C" sig_handler endprog(int signal_number);
76static void nice_time(ulong sec,char *buff);77static void nice_time(ulong sec,char *buff);
@@ -304,9 +305,9 @@
304305
305int main(int argc,char *argv[])306int main(int argc,char *argv[])
306{307{
307 int error= 0, ho_error;308 int error= 0, ho_error, temp_argc;
308 MYSQL mysql;309 MYSQL mysql;
309 char **commands, **save_argv;310 char **commands, **save_argv, **temp_argv;
310311
311 MY_INIT(argv[0]);312 MY_INIT(argv[0]);
312 mysql_init(&mysql);313 mysql_init(&mysql);
@@ -318,6 +319,9 @@
318 free_defaults(save_argv);319 free_defaults(save_argv);
319 exit(ho_error);320 exit(ho_error);
320 }321 }
322 temp_argv= mask_password(argc, &argv);
323 temp_argc= argc;
324
321 if (debug_info_flag)325 if (debug_info_flag)
322 my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;326 my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
323 if (debug_check_flag)327 if (debug_check_flag)
@@ -328,7 +332,7 @@
328 usage();332 usage();
329 exit(1);333 exit(1);
330 }334 }
331 commands = argv;335 commands = temp_argv;
332 if (tty_password)336 if (tty_password)
333 opt_password = get_tty_password(NullS);337 opt_password = get_tty_password(NullS);
334338
@@ -476,6 +480,13 @@
476 my_free(shared_memory_base_name);480 my_free(shared_memory_base_name);
477#endif481#endif
478 free_defaults(save_argv);482 free_defaults(save_argv);
483 temp_argc--;
484 while(temp_argc >= 0)
485 {
486 my_free(temp_argv[temp_argc]);
487 temp_argc--;
488 }
489 my_free(temp_argv);
479 my_end(my_end_arg);490 my_end(my_end_arg);
480 exit(error ? 1 : 0);491 exit(error ? 1 : 0);
481 return 0;492 return 0;
@@ -1089,6 +1100,47 @@
1089 return 0;1100 return 0;
1090}1101}
10911102
1103/**
1104 @brief Masking the password if it is passed as command line argument.
1105
1106 @details It works in Linux and changes cmdline in ps and /proc/pid/cmdline,
1107 but it won't work for history file of shell.
1108 The command line arguments are copied to another array and the
1109 password in the argv is masked. This function is called just after
1110 "handle_options" because in "handle_options", the agrv pointers
1111 are altered which makes freeing of dynamically allocated memory
1112 difficult. The password masking is done before all other operations
1113 in order to minimise the time frame of password visibility via cmdline.
1114
1115 @param argc command line options (count)
1116 @param argv command line options (values)
1117
1118 @return temp_argv copy of argv
1119*/
1120
1121static char **mask_password(int argc, char ***argv)
1122{
1123 char **temp_argv;
1124 temp_argv= (char **)(my_malloc(sizeof(char *) * argc, MYF(MY_WME)));
1125 argc--;
1126 while (argc > 0)
1127 {
1128 temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
1129 if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD ||
1130 find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_OLD_PASSWORD)
1131 {
1132 char *start= (*argv)[argc];
1133 while (*start)
1134 *start++= 'x';
1135 start= (*argv)[argc];
1136 if (*start)
1137 start[1]= 0; /* Cut length of argument */
1138 }
1139 argc--;
1140 }
1141 temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
1142 return(temp_argv);
1143}
10921144
1093static void print_version(void)1145static void print_version(void)
1094{1146{
10951147
=== modified file 'client/mysqldump.c'
--- client/mysqldump.c 2013-12-16 08:19:34 +0000
+++ client/mysqldump.c 2014-08-22 10:00:31 +0000
@@ -5991,19 +5991,36 @@
5991 dump_all_tablespaces();5991 dump_all_tablespaces();
5992 dump_all_databases();5992 dump_all_databases();
5993 }5993 }
5994 else if (argc > 1 && !opt_databases)
5995 {
5996 /* Only one database and selected table(s) */
5997 if (!opt_alltspcs && !opt_notspcs)
5998 dump_tablespaces_for_tables(*argv, (argv + 1), (argc -1));
5999 dump_selected_tables(*argv, (argv + 1), (argc - 1));
6000 }
6001 else5994 else
6002 {5995 {
6003 /* One or more databases, all tables */5996 // Check all arguments meet length condition. Currently database and table
6004 if (!opt_alltspcs && !opt_notspcs)5997 // names are limited to NAME_LEN bytes and stack-based buffers assumes
6005 dump_tablespaces_for_databases(argv);5998 // that escaped name will be not longer than NAME_LEN*2 + 2 bytes long.
6006 dump_databases(argv);5999 int argument;
6000 for (argument= 0; argument < argc; argument++)
6001 {
6002 size_t argument_length= strlen(argv[argument]);
6003 if (argument_length > NAME_LEN)
6004 {
6005 die(EX_CONSCHECK, "[ERROR] Argument '%s' is too long, it cannot be "
6006 "name for any table or database.\n", argv[argument]);
6007 }
6008 }
6009
6010 if (argc > 1 && !opt_databases)
6011 {
6012 /* Only one database and selected table(s) */
6013 if (!opt_alltspcs && !opt_notspcs)
6014 dump_tablespaces_for_tables(*argv, (argv + 1), (argc - 1));
6015 dump_selected_tables(*argv, (argv + 1), (argc - 1));
6016 }
6017 else
6018 {
6019 /* One or more databases, all tables */
6020 if (!opt_alltspcs && !opt_notspcs)
6021 dump_tablespaces_for_databases(argv);
6022 dump_databases(argv);
6023 }
6007 }6024 }
60086025
6009 /* if --dump-slave , start the slave sql thread */6026 /* if --dump-slave , start the slave sql thread */
60106027
=== modified file 'cmake/dtrace.cmake'
--- cmake/dtrace.cmake 2013-08-02 09:40:55 +0000
+++ cmake/dtrace.cmake 2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
1# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.1# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
2# 2#
3# This program is free software; you can redistribute it and/or modify3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by4# it under the terms of the GNU General Public License as published by
@@ -75,13 +75,6 @@
75 ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h75 ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h
76 ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h76 ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h
77 )77 )
78 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
79 # Systemtap object
80 EXECUTE_PROCESS(
81 COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
82 -o ${CMAKE_BINARY_DIR}/probes_mysql.o
83 )
84 ENDIF()
85 ADD_CUSTOM_TARGET(gen_dtrace_header78 ADD_CUSTOM_TARGET(gen_dtrace_header
86 DEPENDS 79 DEPENDS
87 ${CMAKE_BINARY_DIR}/include/probes_mysql.d80 ${CMAKE_BINARY_DIR}/include/probes_mysql.d
@@ -100,12 +93,7 @@
100 IF(ENABLE_DTRACE)93 IF(ENABLE_DTRACE)
101 ADD_DEPENDENCIES(${target} gen_dtrace_header)94 ADD_DEPENDENCIES(${target} gen_dtrace_header)
10295
103 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")96 # Invoke dtrace to generate object file and link it together with target.
104 TARGET_LINK_LIBRARIES(${target} ${CMAKE_BINARY_DIR}/probes_mysql.o)
105 ENDIF()
106
107 # On Solaris, invoke dtrace -G to generate object file and
108 # link it together with target.
109 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")97 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
110 SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)98 SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
111 SET(outfile ${objdir}/${target}_dtrace.o)99 SET(outfile ${objdir}/${target}_dtrace.o)
@@ -122,6 +110,21 @@
122 -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake110 -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
123 WORKING_DIRECTORY ${objdir}111 WORKING_DIRECTORY ${objdir}
124 )112 )
113 ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
114 # dtrace on Linux runs gcc and uses flags from environment
115 SET(CFLAGS_SAVED $ENV{CFLAGS})
116 SET(ENV{CFLAGS} ${CMAKE_C_FLAGS})
117 SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
118 # Systemtap object
119 EXECUTE_PROCESS(
120 COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
121 -o ${outfile}
122 )
123 SET(ENV{CFLAGS} ${CFLAGS_SAVED})
124 ENDIF()
125
126 # Do not try to extend the library if we have not built the .o file
127 IF(outfile)
125 # Add full object path to linker flags128 # Add full object path to linker flags
126 GET_TARGET_PROPERTY(target_type ${target} TYPE)129 GET_TARGET_PROPERTY(target_type ${target} TYPE)
127 IF(NOT target_type MATCHES "STATIC")130 IF(NOT target_type MATCHES "STATIC")
@@ -133,12 +136,12 @@
133 # but maybe one day this will be fixed.136 # but maybe one day this will be fixed.
134 GET_TARGET_PROPERTY(target_location ${target} LOCATION)137 GET_TARGET_PROPERTY(target_location ${target} LOCATION)
135 ADD_CUSTOM_COMMAND(138 ADD_CUSTOM_COMMAND(
136 TARGET ${target} POST_BUILD139 TARGET ${target} POST_BUILD
137 COMMAND ${CMAKE_AR} r ${target_location} ${outfile}140 COMMAND ${CMAKE_AR} r ${target_location} ${outfile}
138 COMMAND ${CMAKE_RANLIB} ${target_location}141 COMMAND ${CMAKE_RANLIB} ${target_location}
139 )142 )
140 # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS143 # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
141 SET(TARGET_OBJECT_DIRECTORY_${target} ${objdir} CACHE INTERNAL "")144 SET(TARGET_OBJECT_DIRECTORY_${target} ${objdir} CACHE INTERNAL "")
142 ENDIF()145 ENDIF()
143 ENDIF()146 ENDIF()
144 ENDIF()147 ENDIF()
145148
=== modified file 'cmake/install_macros.cmake'
--- cmake/install_macros.cmake 2014-01-23 08:02:47 +0000
+++ cmake/install_macros.cmake 2014-08-22 10:00:31 +0000
@@ -21,26 +21,35 @@
21 GET_TARGET_PROPERTY(location ${target} LOCATION)21 GET_TARGET_PROPERTY(location ${target} LOCATION)
22 GET_TARGET_PROPERTY(type ${target} TYPE)22 GET_TARGET_PROPERTY(type ${target} TYPE)
23 IF(NOT INSTALL_LOCATION)23 IF(NOT INSTALL_LOCATION)
24 IF(type MATCHES "STATIC_LIBRARY" OR type MATCHES "MODULE_LIBRARY" OR type MATCHES "SHARED_LIBRARY")24 IF(type MATCHES "STATIC_LIBRARY"
25 OR type MATCHES "MODULE_LIBRARY"
26 OR type MATCHES "SHARED_LIBRARY")
25 SET(INSTALL_LOCATION "lib")27 SET(INSTALL_LOCATION "lib")
26 ELSEIF(type MATCHES "EXECUTABLE")28 ELSEIF(type MATCHES "EXECUTABLE")
27 SET(INSTALL_LOCATION "bin")29 SET(INSTALL_LOCATION "bin")
28 ELSE()30 ELSE()
29 MESSAGE(FATAL_ERROR "cannot determine type of ${target}. Don't now where to install")31 MESSAGE(FATAL_ERROR
32 "cannot determine type of ${target}. Don't now where to install")
30 ENDIF()33 ENDIF()
31 ENDIF()34 ENDIF()
32 STRING(REPLACE ".exe" ".pdb" pdb_location ${location})35 STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
33 STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})36 STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
34 STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})37 STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
35 IF(CMAKE_GENERATOR MATCHES "Visual Studio")38 IF(CMAKE_GENERATOR MATCHES "Visual Studio")
36 STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})39 STRING(REPLACE
40 "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
41 pdb_location ${pdb_location})
37 ENDIF()42 ENDIF()
38 IF(target STREQUAL "mysqld")43 IF(target STREQUAL "mysqld")
39 SET(comp Server)44 SET(comp Server)
40 ELSE()45 ELSE()
41 SET(comp Debuginfo)46 SET(comp Debuginfo)
42 ENDIF() 47 ENDIF()
43 INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})48 # No .pdb file for static libraries.
49 IF(NOT type MATCHES "STATIC_LIBRARY")
50 INSTALL(FILES ${pdb_location}
51 DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
52 ENDIF()
44 ENDFOREACH()53 ENDFOREACH()
45 ENDIF()54 ENDIF()
46ENDMACRO()55ENDMACRO()
4756
=== modified file 'cmake/os/Windows.cmake'
--- cmake/os/Windows.cmake 2011-06-30 15:46:53 +0000
+++ cmake/os/Windows.cmake 2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
1# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.1# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
2# 2#
3# This program is free software; you can redistribute it and/or modify3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by4# it under the terms of the GNU General Public License as published by
@@ -62,22 +62,30 @@
62ENDIF()62ENDIF()
6363
64IF(MSVC)64IF(MSVC)
65 # Enable debug info also in Release build, and create PDB to be able to analyze 65 # Enable debug info also in Release build,
66 # crashes66 # and create PDB to be able to analyze crashes.
67 FOREACH(type EXE SHARED MODULE)
68 SET(CMAKE_{type}_LINKER_FLAGS_RELEASE
69 "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
70 ENDFOREACH()
71
72 # Force static runtime libraries
73 # - Choose debugging information:
74 # /Z7
75 # Produces an .obj file containing full symbolic debugging
76 # information for use with the debugger. The symbolic debugging
77 # information includes the names and types of variables, as well as
78 # functions and line numbers. No .pdb file is produced by the compiler.
67 FOREACH(lang C CXX)79 FOREACH(lang C CXX)
68 SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Zi")80 SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
69 ENDFOREACH()81 ENDFOREACH()
70 FOREACH(type EXE SHARED MODULE)
71 SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
72 ENDFOREACH()
73
74 # Force static runtime libraries
75 FOREACH(flag 82 FOREACH(flag
76 CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO 83 CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
77 CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT 84 CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
78 CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO85 CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
79 CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)86 CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
80 STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")87 STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
88 STRING(REPLACE "/Zi" "/Z7" "${flag}" "${${flag}}")
81 ENDFOREACH()89 ENDFOREACH()
82 90
83 # Remove support for exceptions91 # Remove support for exceptions
@@ -107,7 +115,6 @@
107 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")115 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")
108 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")116 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")
109117
110
111 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)118 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
112 # _WIN64 is defined by the compiler itself. 119 # _WIN64 is defined by the compiler itself.
113 # Yet, we define it here again to work around a bug with Intellisense 120 # Yet, we define it here again to work around a bug with Intellisense
114121
=== modified file 'extra/yassl/CMakeLists.txt'
--- extra/yassl/CMakeLists.txt 2014-01-06 05:22:35 +0000
+++ extra/yassl/CMakeLists.txt 2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
1# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.1# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
2# 2#
3# This program is free software; you can redistribute it and/or modify3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by4# it under the terms of the GNU General Public License as published by
@@ -37,7 +37,6 @@
37ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})37ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
38RESTRICT_SYMBOL_EXPORTS(yassl)38RESTRICT_SYMBOL_EXPORTS(yassl)
3939
40INSTALL_DEBUG_SYMBOLS(yassl)
41IF(MSVC)40IF(MSVC)
42 INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)41 INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
43ENDIF()42ENDIF()
4443
=== modified file 'extra/yassl/src/ssl.cpp'
--- extra/yassl/src/ssl.cpp 2013-02-26 05:35:17 +0000
+++ extra/yassl/src/ssl.cpp 2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.2 Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
33
4 This program is free software; you can redistribute it and/or modify4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by5 it under the terms of the GNU General Public License as published by
@@ -790,7 +790,10 @@
790 strncpy(name, path, MAX_PATH - 1 - HALF_PATH);790 strncpy(name, path, MAX_PATH - 1 - HALF_PATH);
791 strncat(name, "/", 1);791 strncat(name, "/", 1);
792 strncat(name, entry->d_name, HALF_PATH);792 strncat(name, entry->d_name, HALF_PATH);
793 if (stat(name, &buf) < 0) return SSL_BAD_STAT;793 if (stat(name, &buf) < 0) {
794 closedir(dir);
795 return SSL_BAD_STAT;
796 }
794 797
795 if (S_ISREG(buf.st_mode))798 if (S_ISREG(buf.st_mode))
796 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);799 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
797800
=== modified file 'extra/yassl/taocrypt/CMakeLists.txt'
--- extra/yassl/taocrypt/CMakeLists.txt 2014-01-06 05:22:35 +0000
+++ extra/yassl/taocrypt/CMakeLists.txt 2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
1# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.1# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
2# 2#
3# This program is free software; you can redistribute it and/or modify3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by4# it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
36ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})36ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
37RESTRICT_SYMBOL_EXPORTS(taocrypt)37RESTRICT_SYMBOL_EXPORTS(taocrypt)
3838
39INSTALL_DEBUG_SYMBOLS(taocrypt)
40IF(MSVC)39IF(MSVC)
41 INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)40 INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
42ENDIF()41ENDIF()
4342
=== modified file 'extra/yassl/taocrypt/include/asn.hpp'
--- extra/yassl/taocrypt/include/asn.hpp 2013-02-26 05:35:17 +0000
+++ extra/yassl/taocrypt/include/asn.hpp 2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.2 Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
33
4 This program is free software; you can redistribute it and/or modify4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by5 it under the terms of the GNU General Public License as published by
@@ -294,9 +294,9 @@
294 byte* signature_;294 byte* signature_;
295 char issuer_[ASN_NAME_MAX]; // Names295 char issuer_[ASN_NAME_MAX]; // Names
296 char subject_[ASN_NAME_MAX]; // Names296 char subject_[ASN_NAME_MAX]; // Names
297 char beforeDate_[MAX_DATE_SZ]; // valid before date297 char beforeDate_[MAX_DATE_SZ+1]; // valid before date, +null term
298 char afterDate_[MAX_DATE_SZ]; // valid after date298 char afterDate_[MAX_DATE_SZ+1]; // valid after date, +null term
299 bool verify_; // Default to yes, but could be off299 bool verify_; // Default to yes, but could be off
300300
301 void ReadHeader();301 void ReadHeader();
302 void Decode(SignerList*, CertType);302 void Decode(SignerList*, CertType);
303303
=== modified file 'include/mysql/thread_pool_priv.h'
--- include/mysql/thread_pool_priv.h 2013-02-26 05:35:17 +0000
+++ include/mysql/thread_pool_priv.h 2014-08-22 10:00:31 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.2 Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
33
4 This program is free software; you can redistribute it and/or modify4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by5 it under the terms of the GNU General Public License as published by
@@ -49,6 +49,8 @@
49void thd_set_thread_stack(THD *thd, char *stack_start);49void thd_set_thread_stack(THD *thd, char *stack_start);
50void thd_lock_thread_count(THD *thd);50void thd_lock_thread_count(THD *thd);
51void thd_unlock_thread_count(THD *thd);51void thd_unlock_thread_count(THD *thd);
52void thd_lock_thread_remove(THD *thd);
53void thd_unlock_thread_remove(THD *thd);
52void thd_close_connection(THD *thd);54void thd_close_connection(THD *thd);
53THD *thd_get_current_thd();55THD *thd_get_current_thd();
54void thd_new_connection_setup(THD *thd, char *stack_start);56void thd_new_connection_setup(THD *thd, char *stack_start);
5557
=== modified file 'libmysql/CMakeLists.txt'
--- libmysql/CMakeLists.txt 2014-03-27 15:42:21 +0000
+++ libmysql/CMakeLists.txt 2014-08-22 10:00:31 +0000
@@ -168,7 +168,6 @@
168MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)168MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
169169
170# Visual Studio users need debug static library for debug projects170# Visual Studio users need debug static library for debug projects
171INSTALL_DEBUG_SYMBOLS(clientlib)
172IF(MSVC)171IF(MSVC)
173 INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)172 INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
174 INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)173 INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
175174
=== modified file 'libmysql/authentication_win/CMakeLists.txt'
--- libmysql/authentication_win/CMakeLists.txt 2014-01-06 05:22:35 +0000
+++ libmysql/authentication_win/CMakeLists.txt 2014-08-22 10:00:31 +0000
@@ -1,4 +1,4 @@
1# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.1# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
2# 2#
3# This program is free software; you can redistribute it and/or modify3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by4# it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@
3232
33SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")33SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
3434
35INSTALL_DEBUG_SYMBOLS(auth_win_client)
36IF(MSVC)35IF(MSVC)
37 INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)36 INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
38ENDIF()37ENDIF()
3938
=== modified file 'man/comp_err.1'
--- man/comp_err.1 2014-06-03 13:14:25 +0000
+++ man/comp_err.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBcomp_err\fR2.\" Title: \fBcomp_err\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBCOMP_ERR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBCOMP_ERR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/innochecksum.1'
--- man/innochecksum.1 2014-06-03 13:14:25 +0000
+++ man/innochecksum.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBinnochecksum\fR2.\" Title: \fBinnochecksum\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBINNOCHECKSUM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBINNOCHECKSUM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/msql2mysql.1'
--- man/msql2mysql.1 2014-06-03 13:14:25 +0000
+++ man/msql2mysql.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmsql2mysql\fR2.\" Title: \fBmsql2mysql\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMSQL2MYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMSQL2MYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/my_print_defaults.1'
--- man/my_print_defaults.1 2014-06-03 13:14:25 +0000
+++ man/my_print_defaults.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmy_print_defaults\fR2.\" Title: \fBmy_print_defaults\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMY_PRINT_DEFAULTS" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMY_PRINT_DEFAULTS" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/myisam_ftdump.1'
--- man/myisam_ftdump.1 2014-06-03 13:14:25 +0000
+++ man/myisam_ftdump.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisam_ftdump\fR2.\" Title: \fBmyisam_ftdump\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAM_FTDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAM_FTDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/myisamchk.1'
--- man/myisamchk.1 2014-06-03 13:14:25 +0000
+++ man/myisamchk.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisamchk\fR2.\" Title: \fBmyisamchk\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAMCHK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAMCHK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -250,7 +250,7 @@
250supports the following options, which can be specified on the command line or in the250supports the following options, which can be specified on the command line or in the
251[myisamchk]251[myisamchk]
252group of an option file\&. For information about option files, see252group of an option file\&. For information about option files, see
253Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.253Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
254.SH "MYISAMCHK GENERAL OPTIONS"254.SH "MYISAMCHK GENERAL OPTIONS"
255.\" options: myisamchk255.\" options: myisamchk
256.\" myisamchk: options256.\" myisamchk: options
257257
=== modified file 'man/myisamlog.1'
--- man/myisamlog.1 2014-06-03 13:14:25 +0000
+++ man/myisamlog.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisamlog\fR2.\" Title: \fBmyisamlog\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAMLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAMLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/myisampack.1'
--- man/myisampack.1 2014-06-03 13:14:25 +0000
+++ man/myisampack.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisampack\fR2.\" Title: \fBmyisampack\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAMPACK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAMPACK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@
122.PP122.PP
123\fBmyisampack\fR123\fBmyisampack\fR
124supports the following options\&. It also reads option files and supports the options for processing them described at124supports the following options\&. It also reads option files and supports the options for processing them described at
125Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.125Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
126.sp126.sp
127.RS 4127.RS 4
128.ie n \{\128.ie n \{\
129129
=== modified file 'man/mysql-stress-test.pl.1'
--- man/mysql-stress-test.pl.1 2014-06-03 13:14:25 +0000
+++ man/mysql-stress-test.pl.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql-stress-test.pl\fR2.\" Title: \fBmysql-stress-test.pl\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/06/20145.\" Date: 07/04/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\-STRESS\-TE" "1" "05/06/2014" "MySQL" "MySQL Database System"10.TH "\FBMYSQL\-STRESS\-TE" "1" "07/04/2014" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1 2014-06-03 13:14:25 +0000
+++ man/mysql-test-run.pl.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql-test-run.pl\fR2.\" Title: \fBmysql-test-run.pl\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/06/20145.\" Date: 07/04/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/06/2014" "MySQL" "MySQL Database System"10.TH "\FBMYSQL\-TEST\-RUN\" "1" "07/04/2014" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql.1'
--- man/mysql.1 2014-06-03 13:14:25 +0000
+++ man/mysql.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql\fR2.\" Title: \fBmysql\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -122,7 +122,7 @@
122and122and
123[client]123[client]
124groups of an option file\&. For information about option files, see124groups of an option file\&. For information about option files, see
125Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.125Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
126.sp126.sp
127.RS 4127.RS 4
128.ie n \{\128.ie n \{\
@@ -158,11 +158,32 @@
158\fBmysql\fR158\fBmysql\fR
159to start faster, but you must issue the159to start faster, but you must issue the
160rehash160rehash
161command if you want to use name completion\&.161command or its
162\e#
163shortcut if you want to use name completion\&.
162.sp164.sp
163To complete a name, enter the first part and press Tab\&. If the name is unambiguous,165To complete a name, enter the first part and press Tab\&. If the name is unambiguous,
164\fBmysql\fR166\fBmysql\fR
165completes it\&. Otherwise, you can press Tab again to see the possible names that begin with what you have typed so far\&. Completion does not occur if there is no default database\&.167completes it\&. Otherwise, you can press Tab again to see the possible names that begin with what you have typed so far\&. Completion does not occur if there is no default database\&.
168.if n \{\
169.sp
170.\}
171.RS 4
172.it 1 an-trap
173.nr an-no-space-flag 1
174.nr an-break-flag 1
175.br
176.ps +1
177\fBNote\fR
178.ps -1
179.br
180This feature requires a MySQL client that is compiled with the
181\fBreadline\fR
182library\&. Typically, the
183\fBreadline\fR
184library is not available on Windows\&.
185.sp .5v
186.RE
166.RE187.RE
167.sp188.sp
168.RS 4189.RS 4
@@ -550,7 +571,7 @@
550.sp571.sp
551Execute the statement and quit\&. The default output format is like that produced with572Execute the statement and quit\&. The default output format is like that produced with
552\fB\-\-batch\fR\&. See573\fB\-\-batch\fR\&. See
553Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,574Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
554\fBmysql\fR575\fBmysql\fR
555does not use the history file\&.576does not use the history file\&.
556.RE577.RE
@@ -718,7 +739,7 @@
718\fB\-A\fR739\fB\-A\fR
719.sp740.sp
720This has the same effect as741This has the same effect as
721\fB\-skip\-auto\-rehash\fR\&. See the description for742\fB\-\-skip\-auto\-rehash\fR\&. See the description for
722\fB\-\-auto\-rehash\fR\&.743\fB\-\-auto\-rehash\fR\&.
723.RE744.RE
724.sp745.sp
@@ -1793,8 +1814,8 @@
1793\(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets1814\(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
1794\(lq;\(rq1815\(lq;\(rq
1795as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see1816as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
1796Section\ \&22.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see1817Section\ \&23.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
1797Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.1818Section\ \&20.1, \(lqDefining Stored Programs\(rq)\&.
1798.RE1819.RE
1799.sp1820.sp
1800.RS 41821.RS 4
@@ -1925,7 +1946,7 @@
1925nowarning,1946nowarning,
1926\ew1947\ew
1927.sp1948.sp
1928Enable display of warnings after each statement\&.1949Disable display of warnings after each statement\&.
1929.RE1950.RE
1930.sp1951.sp
1931.RS 41952.RS 4
@@ -2606,7 +2627,7 @@
2606In this example, note that the backslashes are doubled\&. If you set the prompt using the2627In this example, note that the backslashes are doubled\&. If you set the prompt using the
2607prompt2628prompt
2608option in an option file, it is advisable to double the backslashes when using the special prompt options\&. There is some overlap in the set of permissible prompt options and the set of special escape sequences that are recognized in option files\&. (The rules for escape sequences in option files are listed in2629option in an option file, it is advisable to double the backslashes when using the special prompt options\&. There is some overlap in the set of permissible prompt options and the set of special escape sequences that are recognized in option files\&. (The rules for escape sequences in option files are listed in
2609Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,2630Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
2610\es2631\es
2611is interpreted as a space rather than as the current seconds value\&. The following example shows how to define a prompt within an option file to include the current time in2632is interpreted as a space rather than as the current seconds value\&. The following example shows how to define a prompt within an option file to include the current time in
2612HH:MM:SS>2633HH:MM:SS>
@@ -2918,7 +2939,7 @@
2918.RE2939.RE
2919.\}2940.\}
2920.PP2941.PP
2921The search string can contain the the wildcard characters2942The search string can contain the wildcard characters
2922\(lq%\(rq2943\(lq%\(rq
2923and2944and
2924\(lq_\(rq\&. These have the same meaning as for pattern\-matching operations performed with the2945\(lq_\(rq\&. These have the same meaning as for pattern\-matching operations performed with the
@@ -3313,7 +3334,7 @@
3313option\&.3334option\&.
3314.PP3335.PP
3315For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see3336For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
3316Section\ \&22.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.3337Section\ \&23.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
3317.SH "COPYRIGHT"3338.SH "COPYRIGHT"
3318.br3339.br
3319.PP3340.PP
33203341
=== modified file 'man/mysql.server.1'
--- man/mysql.server.1 2014-06-03 13:14:25 +0000
+++ man/mysql.server.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql.server\fR2.\" Title: \fBmysql.server\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\&.SERVER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL\&.SERVER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_client_test.1'
--- man/mysql_client_test.1 2014-06-03 13:14:25 +0000
+++ man/mysql_client_test.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_client_test\fR2.\" Title: \fBmysql_client_test\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/06/20145.\" Date: 07/04/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_CLIENT_TEST" "1" "05/06/2014" "MySQL" "MySQL Database System"10.TH "\FBMYSQL_CLIENT_TEST" "1" "07/04/2014" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_config.1'
--- man/mysql_config.1 2014-06-03 13:14:25 +0000
+++ man/mysql_config.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_config\fR2.\" Title: \fBmysql_config\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_convert_table_format.1'
--- man/mysql_convert_table_format.1 2014-06-03 13:14:25 +0000
+++ man/mysql_convert_table_format.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_convert_table_format\fR2.\" Title: \fBmysql_convert_table_format\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_CONVERT_TAB" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_CONVERT_TAB" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_find_rows.1'
--- man/mysql_find_rows.1 2014-06-03 13:14:25 +0000
+++ man/mysql_find_rows.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_find_rows\fR2.\" Title: \fBmysql_find_rows\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_FIND_ROWS\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_fix_extensions.1'
--- man/mysql_fix_extensions.1 2014-06-03 13:14:25 +0000
+++ man/mysql_fix_extensions.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_fix_extensions\fR2.\" Title: \fBmysql_fix_extensions\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_FIX_EXTENSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_install_db.1'
--- man/mysql_install_db.1 2014-06-03 13:14:25 +0000
+++ man/mysql_install_db.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_install_db\fR2.\" Title: \fBmysql_install_db\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_INSTALL_DB\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_INSTALL_DB\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -121,7 +121,7 @@
121[mysqld]121[mysqld]
122group\&.) Other options are passed to122group\&.) Other options are passed to
123\fBmysqld\fR\&. For information about option files, see123\fBmysqld\fR\&. For information about option files, see
124Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.124Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
125.sp125.sp
126.RS 4126.RS 4
127.ie n \{\127.ie n \{\
128128
=== modified file 'man/mysql_plugin.1'
--- man/mysql_plugin.1 2014-06-03 13:14:25 +0000
+++ man/mysql_plugin.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_plugin\fR2.\" Title: \fBmysql_plugin\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_PLUGIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_PLUGIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -164,7 +164,7 @@
164\fB\-\-datadir\fR, and164\fB\-\-datadir\fR, and
165\fB\-\-plugin\-dir\fR165\fB\-\-plugin\-dir\fR
166options and ignores others\&. For information about option files, see166options and ignores others\&. For information about option files, see
167Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.167Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
168.sp168.sp
169.RS 4169.RS 4
170.ie n \{\170.ie n \{\
171171
=== modified file 'man/mysql_secure_installation.1'
--- man/mysql_secure_installation.1 2014-06-03 13:14:25 +0000
+++ man/mysql_secure_installation.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_secure_installation\fR2.\" Title: \fBmysql_secure_installation\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_SECURE_INST" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_SECURE_INST" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_setpermission.1'
--- man/mysql_setpermission.1 2014-06-03 13:14:25 +0000
+++ man/mysql_setpermission.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_setpermission\fR2.\" Title: \fBmysql_setpermission\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_SETPERMISSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_SETPERMISSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_tzinfo_to_sql.1'
--- man/mysql_tzinfo_to_sql.1 2014-06-03 13:14:25 +0000
+++ man/mysql_tzinfo_to_sql.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_tzinfo_to_sql\fR2.\" Title: \fBmysql_tzinfo_to_sql\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_TZINFO_TO_S" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_upgrade.1'
--- man/mysql_upgrade.1 2014-06-03 13:14:25 +0000
+++ man/mysql_upgrade.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_upgrade\fR2.\" Title: \fBmysql_upgrade\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_UPGRADE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_UPGRADE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -115,9 +115,11 @@
115.RS 4115.RS 4
116.\}116.\}
117.nf117.nf
118mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-auto\-repair118mysqlcheck \-\-no\-defaults \-\-all\-databases
119mysql < \fIfix_priv_tables\fR119 \-\-fix\-db\-names \-\-fix\-table\-names
120mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-fix\-db\-names \-\-fix\-table\-names120mysqlcheck \-\-no\-defaults \-\-check\-upgrade \-\-all\-databases
121 \-\-auto\-repair
122mysql < fix_priv_tables
121.fi123.fi
122.if n \{\124.if n \{\
123.RE125.RE
@@ -133,6 +135,28 @@
133.sp -1135.sp -1
134.IP \(bu 2.3136.IP \(bu 2.3
135.\}137.\}
138\fBmysql_upgrade\fR
139also adds
140\fB\-\-write\-binlog\fR
141or
142\fB\-\-skip\-write\-binlog\fR
143to the
144\fBmysqlcheck\fR
145commands, depending on whether the
146\fB\-\-write\-binlog\fR
147option was specified on the
148\fBmysql_upgrade\fR
149command\&.
150.RE
151.sp
152.RS 4
153.ie n \{\
154\h'-04'\(bu\h'+03'\c
155.\}
156.el \{\
157.sp -1
158.IP \(bu 2.3
159.\}
136Because160Because
137\fBmysql_upgrade\fR161\fBmysql_upgrade\fR
138invokes162invokes
@@ -208,7 +232,7 @@
208\fBmysqlcheck\fR\&. For example, it might be necessary to specify the232\fBmysqlcheck\fR\&. For example, it might be necessary to specify the
209\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR233\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
210option\&. For information about option files, see234option\&. For information about option files, see
211Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.235Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
212.sp236.sp
213.RS 4237.RS 4
214.ie n \{\238.ie n \{\
215239
=== modified file 'man/mysql_waitpid.1'
--- man/mysql_waitpid.1 2014-06-03 13:14:25 +0000
+++ man/mysql_waitpid.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_waitpid\fR2.\" Title: \fBmysql_waitpid\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_WAITPID\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_WAITPID\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysql_zap.1'
--- man/mysql_zap.1 2014-06-03 13:14:25 +0000
+++ man/mysql_zap.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_zap\fR2.\" Title: \fBmysql_zap\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_ZAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_ZAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysqlaccess.1'
--- man/mysqlaccess.1 2014-06-03 13:14:25 +0000
+++ man/mysqlaccess.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlaccess\fR2.\" Title: \fBmysqlaccess\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLACCESS\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLACCESS\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysqladmin.1'
--- man/mysqladmin.1 2014-06-03 13:14:25 +0000
+++ man/mysqladmin.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqladmin\fR2.\" Title: \fBmysqladmin\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLADMIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLADMIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -84,7 +84,7 @@
84Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.84Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.
85.sp85.sp
86This includes information about the Event Scheduler\&. See86This includes information about the Event Scheduler\&. See
87Section\ \&19.4.5, \(lqEvent Scheduler Status\(rq\&.87Section\ \&20.4.5, \(lqEvent Scheduler Status\(rq\&.
88.RE88.RE
89.sp89.sp
90.RS 490.RS 4
@@ -610,7 +610,7 @@
610and610and
611[client]611[client]
612groups of an option file\&. For information about option files, see612groups of an option file\&. For information about option files, see
613Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.613Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
614.sp614.sp
615.RS 4615.RS 4
616.ie n \{\616.ie n \{\
617617
=== modified file 'man/mysqlbinlog.1'
--- man/mysqlbinlog.1 2014-06-03 13:14:25 +0000
+++ man/mysqlbinlog.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlbinlog\fR2.\" Title: \fBmysqlbinlog\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLBINLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLBINLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@
43\fBmysqlbinlog\fR43\fBmysqlbinlog\fR
44to display the contents of relay log files written by a slave server in a replication setup because relay logs have the same format as binary logs\&. The binary log and relay log are discussed further in44to display the contents of relay log files written by a slave server in a replication setup because relay logs have the same format as binary logs\&. The binary log and relay log are discussed further in
45Section\ \&5.2.4, \(lqThe Binary Log\(rq, and45Section\ \&5.2.4, \(lqThe Binary Log\(rq, and
46Section\ \&16.2.2, \(lqReplication Relay and Status Logs\(rq\&.46Section\ \&17.2.2, \(lqReplication Relay and Status Logs\(rq\&.
47.PP47.PP
48Invoke48Invoke
49\fBmysqlbinlog\fR49\fBmysqlbinlog\fR
@@ -74,7 +74,7 @@
74.PP74.PP
75The output includes events contained in75The output includes events contained in
76binlog\&.000003\&. For statement\-based logging, event information includes the SQL statement, the ID of the server on which it was executed, the timestamp when the statement was executed, how much time it took, and so forth\&. For row\-based logging, the event indicates a row change rather than an SQL statement\&. See76binlog\&.000003\&. For statement\-based logging, event information includes the SQL statement, the ID of the server on which it was executed, the timestamp when the statement was executed, how much time it took, and so forth\&. For row\-based logging, the event indicates a row change rather than an SQL statement\&. See
77Section\ \&16.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.77Section\ \&17.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
78.PP78.PP
79Events are preceded by header comments that provide additional information\&. For example:79Events are preceded by header comments that provide additional information\&. For example:
80.sp80.sp
@@ -92,7 +92,7 @@
92.PP92.PP
93In the first line, the number following93In the first line, the number following
94at94at
95indicates the starting position of the event in the binary log file\&.95indicates the file offset, or starting position, of the event in the binary log file\&.
96.PP96.PP
97The second line starts with a date and time indicating when the statement started on the server where the event originated\&. For replication, this timestamp is propagated to slave servers\&.97The second line starts with a date and time indicating when the statement started on the server where the event originated\&. For replication, this timestamp is propagated to slave servers\&.
98server id98server id
@@ -107,6 +107,39 @@
107is the time spent executing the event, on a master server\&. On a slave, it is the difference of the end execution time on the slave minus the beginning execution time on the master\&. The difference serves as an indicator of how much replication lags behind the master\&.107is the time spent executing the event, on a master server\&. On a slave, it is the difference of the end execution time on the slave minus the beginning execution time on the master\&. The difference serves as an indicator of how much replication lags behind the master\&.
108error_code108error_code
109indicates the result from executing the event\&. Zero means that no error occurred\&.109indicates the result from executing the event\&. Zero means that no error occurred\&.
110.if n \{\
111.sp
112.\}
113.RS 4
114.it 1 an-trap
115.nr an-no-space-flag 1
116.nr an-break-flag 1
117.br
118.ps +1
119\fBNote\fR
120.ps -1
121.br
122.PP
123When using event groups, the file offsets of all events are grouped together and the comments of all events are grouped together\&. For example:
124.sp
125.if n \{\
126.RS 4
127.\}
128.nf
129# at 587
130# at 630
131# at 5662
132#140627 13:16:52 server id 1 end_log_pos 630 Table_map: `test`\&.`t1` mapped to number 41
133#140627 13:16:52 server id 1 end_log_pos 5662 Write_rows: table id 41
134#140627 13:16:52 server id 1 end_log_pos 10694 Write_rows: table id 41 flags: STMT_END_F
135.fi
136.if n \{\
137.RE
138.\}
139.PP
140The three file offsets do not represent blank events\&.
141.sp .5v
142.RE
110.PP143.PP
111The output from144The output from
112\fBmysqlbinlog\fR145\fBmysqlbinlog\fR
@@ -134,7 +167,7 @@
134and167and
135[client]168[client]
136groups of an option file\&. For information about option files, see169groups of an option file\&. For information about option files, see
137Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.170Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
138.sp171.sp
139.RS 4172.RS 4
140.ie n \{\173.ie n \{\
141174
=== modified file 'man/mysqlbug.1'
--- man/mysqlbug.1 2014-06-03 13:14:25 +0000
+++ man/mysqlbug.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlbug\fR2.\" Title: \fBmysqlbug\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLBUG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLBUG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysqlcheck.1'
--- man/mysqlcheck.1 2014-06-03 13:14:25 +0000
+++ man/mysqlcheck.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlcheck\fR2.\" Title: \fBmysqlcheck\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLCHECK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLCHECK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -205,7 +205,7 @@
205and205and
206[client]206[client]
207groups of an option file\&. For information about option files, see207groups of an option file\&. For information about option files, see
208Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.208Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
209.sp209.sp
210.RS 4210.RS 4
211.ie n \{\211.ie n \{\
@@ -238,7 +238,13 @@
238.sp238.sp
239Check all tables in all databases\&. This is the same as using the239Check all tables in all databases\&. This is the same as using the
240\fB\-\-databases\fR240\fB\-\-databases\fR
241option and naming all the databases on the command line\&.241option and naming all the databases on the command line, except that the
242INFORMATION_SCHEMA
243and
244performace_schema
245databases are not dumped\&. They can be dumped by explicitly naming them with the
246\fB\-\-databases\fR
247option\&.
242.RE248.RE
243.sp249.sp
244.RS 4250.RS 4
@@ -410,6 +416,15 @@
410Process all tables in the named databases\&. Normally,416Process all tables in the named databases\&. Normally,
411\fBmysqlcheck\fR417\fBmysqlcheck\fR
412treats the first name argument on the command line as a database name and following names as table names\&. With this option, it treats all name arguments as database names\&.418treats the first name argument on the command line as a database name and following names as table names\&. With this option, it treats all name arguments as database names\&.
419.sp
420This option may be used to dump the
421INFORMATION_SCHEMA
422and
423performace_schema
424databases, which normally are not dumped even with
425\fB\-\-all\-databases\fR\&. option\&. (Also use the
426\fB\-\-skip\-lock\-tables\fR
427option\&.)
413.RE428.RE
414.sp429.sp
415.RS 4430.RS 4
416431
=== modified file 'man/mysqld.8'
--- man/mysqld.8 2014-06-03 13:14:25 +0000
+++ man/mysqld.8 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqld\fR2.\" Title: \fBmysqld\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysqld_multi.1'
--- man/mysqld_multi.1 2014-06-03 13:14:25 +0000
+++ man/mysqld_multi.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqld_multi\fR2.\" Title: \fBmysqld_multi\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLD_MULTI\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLD_MULTI\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -701,7 +701,7 @@
701.\}701.\}
702.PP702.PP
703See703See
704Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.704Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
705.SH "COPYRIGHT"705.SH "COPYRIGHT"
706.br706.br
707.PP707.PP
708708
=== modified file 'man/mysqld_safe.1'
--- man/mysqld_safe.1 2014-06-03 13:14:25 +0000
+++ man/mysqld_safe.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqld_safe\fR2.\" Title: \fBmysqld_safe\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLD_SAFE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLD_SAFE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
70if they are specified on the command line, but ignored if they are specified in the70if they are specified on the command line, but ignored if they are specified in the
71[mysqld_safe]71[mysqld_safe]
72group of an option file\&. See72group of an option file\&. See
73Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.73Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
74.PP74.PP
75\fBmysqld_safe\fR75\fBmysqld_safe\fR
76reads all options from the76reads all options from the
@@ -106,7 +106,7 @@
106.PP106.PP
107\fBmysqld_safe\fR107\fBmysqld_safe\fR
108supports the following options\&. It also reads option files and supports the options for processing them described at108supports the following options\&. It also reads option files and supports the options for processing them described at
109Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.109Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
110.sp110.sp
111.RS 4111.RS 4
112.ie n \{\112.ie n \{\
113113
=== modified file 'man/mysqldump.1'
--- man/mysqldump.1 2014-06-03 13:14:25 +0000
+++ man/mysqldump.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqldump\fR2.\" Title: \fBmysqldump\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -104,7 +104,7 @@
104backups with minimal disruption; it can also back up tables from104backups with minimal disruption; it can also back up tables from
105MyISAM105MyISAM
106and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See106and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See
107Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&.107Section\ \&25.2, \(lqMySQL Enterprise Backup\(rq\&.
108.RE108.RE
109.sp109.sp
110.RS 4110.RS 4
@@ -175,12 +175,12 @@
175\fBmysqldump\fR175\fBmysqldump\fR
176does not dump the176does not dump the
177INFORMATION_SCHEMA177INFORMATION_SCHEMA
178database by default\&.178or
179\fBmysqldump\fR179performance_schema
180dumps180database by default\&. To dump either of these, name it explicitly on the command line and also use the
181INFORMATION_SCHEMA
182only if you name it explicitly on the command line, although currently you must also use the
183\fB\-\-skip\-lock\-tables\fR181\fB\-\-skip\-lock\-tables\fR
182option\&. You can also name them with the
183\fB\-\-databases\fR
184option\&. Before MySQL 5\&.5184option\&. Before MySQL 5\&.5
185\fBmysqldump\fR185\fBmysqldump\fR
186silently ignores186silently ignores
@@ -344,7 +344,7 @@
344and344and
345[client]345[client]
346groups of an option file\&. For information about option files, see346groups of an option file\&. For information about option files, see
347Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.347Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
348.sp348.sp
349.RS 4349.RS 4
350.ie n \{\350.ie n \{\
@@ -2641,7 +2641,7 @@
2641.\" mysqldump: workarounds2641.\" mysqldump: workarounds
2642.PP2642.PP
2643If you encounter problems backing up views, please read the section that covers restrictions on views which describes a workaround for backing up views when this fails due to insufficient privileges\&. See2643If you encounter problems backing up views, please read the section that covers restrictions on views which describes a workaround for backing up views when this fails due to insufficient privileges\&. See
2644Section\ \&E.5, \(lqRestrictions on Views\(rq\&.2644Section\ \&D.5, \(lqRestrictions on Views\(rq\&.
2645.SH "COPYRIGHT"2645.SH "COPYRIGHT"
2646.br2646.br
2647.PP2647.PP
26482648
=== modified file 'man/mysqldumpslow.1'
--- man/mysqldumpslow.1 2014-06-03 13:14:25 +0000
+++ man/mysqldumpslow.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqldumpslow\fR2.\" Title: \fBmysqldumpslow\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLDUMPSLOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/mysqlhotcopy.1'
--- man/mysqlhotcopy.1 2014-06-03 13:14:25 +0000
+++ man/mysqlhotcopy.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlhotcopy\fR2.\" Title: \fBmysqlhotcopy\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLHOTCOPY\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLHOTCOPY\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -114,7 +114,7 @@
114and114and
115[client]115[client]
116groups of an option file\&. For information about option files, see116groups of an option file\&. For information about option files, see
117Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.117Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
118.sp118.sp
119.RS 4119.RS 4
120.ie n \{\120.ie n \{\
121121
=== modified file 'man/mysqlimport.1'
--- man/mysqlimport.1 2014-06-03 13:14:25 +0000
+++ man/mysqlimport.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlimport\fR2.\" Title: \fBmysqlimport\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLIMPORT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLIMPORT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -79,7 +79,7 @@
79and79and
80[client]80[client]
81groups of an option file\&. For information about option files, see81groups of an option file\&. For information about option files, see
82Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.82Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
83.sp83.sp
84.RS 484.RS 4
85.ie n \{\85.ie n \{\
8686
=== modified file 'man/mysqlshow.1'
--- man/mysqlshow.1 2014-06-03 13:14:25 +0000
+++ man/mysqlshow.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlshow\fR2.\" Title: \fBmysqlshow\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLSHOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLSHOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -126,7 +126,7 @@
126and126and
127[client]127[client]
128groups of an option file\&. For information about option files, see128groups of an option file\&. For information about option files, see
129Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.129Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
130.sp130.sp
131.RS 4131.RS 4
132.ie n \{\132.ie n \{\
133133
=== modified file 'man/mysqlslap.1'
--- man/mysqlslap.1 2014-06-03 13:14:25 +0000
+++ man/mysqlslap.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlslap\fR2.\" Title: \fBmysqlslap\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLSLAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLSLAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -163,7 +163,7 @@
163and163and
164[client]164[client]
165groups of an option file\&. For information about option files, see165groups of an option file\&. For information about option files, see
166Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.166Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
167.sp167.sp
168.RS 4168.RS 4
169.ie n \{\169.ie n \{\
170170
=== modified file 'man/mysqltest.1'
--- man/mysqltest.1 2014-06-03 13:14:25 +0000
+++ man/mysqltest.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqltest\fR2.\" Title: \fBmysqltest\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/06/20145.\" Date: 07/04/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLTEST\FR" "1" "05/06/2014" "MySQL" "MySQL Database System"10.TH "\FBMYSQLTEST\FR" "1" "07/04/2014" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/ndb-common-options.1'
--- man/ndb-common-options.1 2014-06-03 13:14:25 +0000
+++ man/ndb-common-options.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: Options Common to MySQL Cluster Programs2.\" Title: Options Common to MySQL Cluster Programs
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "OPTIONS COMMON TO MY" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "OPTIONS COMMON TO MY" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -97,7 +97,7 @@
97.nr an-no-space-flag 197.nr an-no-space-flag 1
98.nr an-break-flag 198.nr an-break-flag 1
99.br99.br
100.B Table\ \&17.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2100.B Table\ \&18.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
101.TS101.TS
102allbox tab(:);102allbox tab(:);
103lB lB lB.103lB lB lB.
@@ -217,10 +217,10 @@
217.sp 1217.sp 1
218.PP218.PP
219For options specific to individual MySQL Cluster programs, see219For options specific to individual MySQL Cluster programs, see
220Section\ \&17.4, \(lqMySQL Cluster Programs\(rq\&.220Section\ \&18.4, \(lqMySQL Cluster Programs\(rq\&.
221.PP221.PP
222See222See
223Section\ \&17.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for223Section\ \&18.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
224\fBmysqld\fR224\fBmysqld\fR
225options relating to MySQL Cluster\&.225options relating to MySQL Cluster\&.
226.sp226.sp
@@ -371,7 +371,7 @@
371.\}371.\}
372.sp372.sp
373For more information, see373For more information, see
374Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.374Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
375.RE375.RE
376.sp376.sp
377.RS 4377.RS 4
@@ -559,7 +559,7 @@
559.sp 1559.sp 1
560Sets this node\*(Aqs MySQL Cluster node ID\&.560Sets this node\*(Aqs MySQL Cluster node ID\&.
561\fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See561\fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See
562Section\ \&17.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.562Section\ \&18.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
563.RE563.RE
564.sp564.sp
565.RS 4565.RS 4
@@ -634,7 +634,7 @@
634Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.634Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.
635.sp635.sp
636See636See
637Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.637Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
638.RE638.RE
639.SH "COPYRIGHT"639.SH "COPYRIGHT"
640.br640.br
641641
=== modified file 'man/ndb_blob_tool.1'
--- man/ndb_blob_tool.1 2014-06-03 13:14:25 +0000
+++ man/ndb_blob_tool.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_blob_tool\fR2.\" Title: \fBndb_blob_tool\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_BLOB_TOOL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_BLOB_TOOL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@
94.nr an-no-space-flag 194.nr an-no-space-flag 1
95.nr an-break-flag 195.nr an-break-flag 1
96.br96.br
97.B Table\ \&17.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.297.B Table\ \&18.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
98.TS98.TS
99allbox tab(:);99allbox tab(:);
100lB lB lB.100lB lB lB.
@@ -478,7 +478,7 @@
478column parts are created by478column parts are created by
479NDB479NDB
480for this column\&. See480for this column\&. See
481Section\ \&11.6, \(lqData Type Storage Requirements\(rq, for more information\&.481Section\ \&11.7, \(lqData Type Storage Requirements\(rq, for more information\&.
482.SH "COPYRIGHT"482.SH "COPYRIGHT"
483.br483.br
484.PP484.PP
485485
=== modified file 'man/ndb_config.1'
--- man/ndb_config.1 2014-06-03 13:14:25 +0000
+++ man/ndb_config.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_config\fR2.\" Title: \fBndb_config\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@
69.nr an-no-space-flag 169.nr an-no-space-flag 1
70.nr an-break-flag 170.nr an-break-flag 1
71.br71.br
72.B Table\ \&17.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.272.B Table\ \&18.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
73.TS73.TS
74allbox tab(:);74allbox tab(:);
75lB lB lB.75lB lB lB.
@@ -427,7 +427,7 @@
427.TE427.TE
428.sp 1428.sp 1
429Specifies the connection string to use in connecting to the management server\&. The format for the connection string is the same as described in429Specifies the connection string to use in connecting to the management server\&. The format for the connection string is the same as described in
430Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to430Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
431localhost:1186\&.431localhost:1186\&.
432.RE432.RE
433.sp433.sp
@@ -1230,7 +1230,7 @@
1230.\}1230.\}
1231.nf1231.nf
1232shell> \fBndb_config \-\-configinfo \-\-xml\fR1232shell> \fBndb_config \-\-configinfo \-\-xml\fR
1233<configvariables protocolversion="1" ndbversionstring="5\&.5\&.37\-ndb\-7\&.2\&.17"1233<configvariables protocolversion="1" ndbversionstring="5\&.5\&.38\-ndb\-7\&.2\&.18"
1234 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"1234 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
1235 ndbversionbuild="6">1235 ndbversionbuild="6">
1236 <section name="SYSTEM">1236 <section name="SYSTEM">
12371237
=== modified file 'man/ndb_cpcd.1'
--- man/ndb_cpcd.1 2014-06-03 13:14:25 +0000
+++ man/ndb_cpcd.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_cpcd\fR2.\" Title: \fBndb_cpcd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_CPCD\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_CPCD\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/ndb_delete_all.1'
--- man/ndb_delete_all.1 2014-06-03 13:14:25 +0000
+++ man/ndb_delete_all.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_delete_all\fR2.\" Title: \fBndb_delete_all\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DELETE_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DELETE_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
70.nr an-no-space-flag 170.nr an-no-space-flag 1
71.nr an-break-flag 171.nr an-break-flag 1
72.br72.br
73.B Table\ \&17.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.273.B Table\ \&18.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
74.TS74.TS
75allbox tab(:);75allbox tab(:);
76lB lB lB.76lB lB lB.
7777
=== modified file 'man/ndb_desc.1'
--- man/ndb_desc.1 2014-06-03 13:14:25 +0000
+++ man/ndb_desc.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_desc\fR2.\" Title: \fBndb_desc\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DESC\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DESC\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -238,7 +238,7 @@
238.\}238.\}
239.PP239.PP
240(For more information on the statements just shown and the objects created by them, see240(For more information on the statements just shown and the objects created by them, see
241Section\ \&17.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as241Section\ \&18.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
242Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and242Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
243Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)243Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
244.PP244.PP
@@ -333,7 +333,7 @@
333.nr an-no-space-flag 1333.nr an-no-space-flag 1
334.nr an-break-flag 1334.nr an-break-flag 1
335.br335.br
336.B Table\ \&17.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2336.B Table\ \&18.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
337.TS337.TS
338allbox tab(:);338allbox tab(:);
339lB lB lB.339lB lB lB.
340340
=== modified file 'man/ndb_drop_index.1'
--- man/ndb_drop_index.1 2014-06-03 13:14:25 +0000
+++ man/ndb_drop_index.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_drop_index\fR2.\" Title: \fBndb_drop_index\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DROP_INDEX\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DROP_INDEX\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -68,7 +68,7 @@
68.nr an-no-space-flag 168.nr an-no-space-flag 1
69.nr an-break-flag 169.nr an-break-flag 1
70.br70.br
71.B Table\ \&17.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.271.B Table\ \&18.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
72.TS72.TS
73allbox tab(:);73allbox tab(:);
74lB lB lB.74lB lB lB.
@@ -123,7 +123,7 @@
123Reading table information for completion of table and column names123Reading table information for completion of table and column names
124You can turn off this feature to get a quicker startup with \-A124You can turn off this feature to get a quicker startup with \-A
125Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.125Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
126Your MySQL connection id is 7 to server version: 5\&.5\&.37\-ndb\-7\&.2\&.17126Your MySQL connection id is 7 to server version: 5\&.5\&.38\-ndb\-7\&.2\&.18
127Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.127Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
128mysql> \fBSHOW TABLES;\fR128mysql> \fBSHOW TABLES;\fR
129+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+129+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
130130
=== modified file 'man/ndb_drop_table.1'
--- man/ndb_drop_table.1 2014-06-03 13:14:25 +0000
+++ man/ndb_drop_table.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_drop_table\fR2.\" Title: \fBndb_drop_table\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DROP_TABLE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DROP_TABLE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -66,7 +66,7 @@
66.nr an-no-space-flag 166.nr an-no-space-flag 1
67.nr an-break-flag 167.nr an-break-flag 1
68.br68.br
69.B Table\ \&17.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.269.B Table\ \&18.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
70.TS70.TS
71allbox tab(:);71allbox tab(:);
72lB lB lB.72lB lB lB.
7373
=== modified file 'man/ndb_error_reporter.1'
--- man/ndb_error_reporter.1 2014-06-03 13:14:25 +0000
+++ man/ndb_error_reporter.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_error_reporter\fR2.\" Title: \fBndb_error_reporter\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_ERROR_REPORTE" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_ERROR_REPORTE" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -58,7 +58,7 @@
58.nr an-no-space-flag 158.nr an-no-space-flag 1
59.nr an-break-flag 159.nr an-break-flag 1
60.br60.br
61.B Table\ \&17.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.261.B Table\ \&18.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
62.TS62.TS
63allbox tab(:);63allbox tab(:);
64lB lB lB.64lB lB lB.
6565
=== modified file 'man/ndb_index_stat.1'
--- man/ndb_index_stat.1 2014-06-03 13:14:25 +0000
+++ man/ndb_index_stat.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_index_stat\fR2.\" Title: \fBndb_index_stat\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_INDEX_STAT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_INDEX_STAT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -65,22 +65,70 @@
65in the65in the
66test66test
67database:67database:
68.\" ndb_index_stat: interpreting output
69.\" ndb_index_stat: example
68.sp70.sp
69.if n \{\71.if n \{\
70.RS 472.RS 4
71.\}73.\}
72.nf74.nf
73shell> \fBndb_index_stat \-d test mytable\fR75shell> \fBndb_index_stat \-d test mytable\fR
74table:mytable index:PRIMARY fragCount:476table:City index:PRIMARY fragCount:2
75sampleVersion:2 loadTime:1336751773 sampleCount:0 keyBytes:077sampleVersion:3 loadTime:1399585986 sampleCount:1994 keyBytes:7976
76query cache: valid:1 sampleCount:0 totalBytes:078query cache: valid:1 sampleCount:1994 totalBytes:27916
77times in ms: save: 12\&.380 sort: 0\&.00179times in ms: save: 7\&.133 sort: 1\&.974 sort per sample: 0\&.000
78NDBT_ProgramExit: 0 \- OK80NDBT_ProgramExit: 0 \- OK
79.fi81.fi
80.if n \{\82.if n \{\
81.RE83.RE
82.\}84.\}
83.PP85.PP
86sampleVersion
87is the version number of the cache from which the statistics data is taken\&. Running
88\fBndb_index_stat\fR
89with the
90\fB\-\-update\fR
91option causes sampleVersion to be incremented\&.
92.PP
93loadTime
94shows when the cache was last updated\&. This is expressed as seconds since the Unix Epoch\&.
95.PP
96sampleCount
97is the number of index entries found per partition\&. You can estimate the total number of entries by multiplying this by the number of fragments (shown as
98fragCount)\&.
99.PP
100sampleCount cab be compared with the cardinality of
101SHOW INDEX
102or
103INFORMATION_SCHEMA\&.STATISTICS, although the latter two provide a view of the table as a whole, while
104\fBndb_index_stat\fR
105provides a per\-fragment average\&.
106.PP
107keyBytes
108is the number of bytes used by the index\&. In this example, the primary key is an integer, which requires four bytes for each index, so
109keyBytes
110can be calculated in this case as shown here:
111.sp
112.if n \{\
113.RS 4
114.\}
115.nf
116 keyBytes = sampleCount * (4 bytes per index) = 1994 * 4 = 7976
117.fi
118.if n \{\
119.RE
120.\}
121.PP
122This information can also be obtained using the corresponding column definitions from
123INFORMATION_SCHEMA\&.COLUMNS
124(this requires a MySQL Server and a MySQL client application)\&.
125.PP
126totalBytes
127is the total memory consumed by all indexes on the table, in bytes\&.
128.PP
129Timings shown in the preceding examples are specific to each invocation of
130\fBndb_index_stat\fR\&.
131.PP
84The132The
85\fB\-\-verbose\fR133\fB\-\-verbose\fR
86option provides some additional output, as shown here:134option provides some additional output, as shown here:
@@ -118,7 +166,7 @@
118.nr an-no-space-flag 1166.nr an-no-space-flag 1
119.nr an-break-flag 1167.nr an-break-flag 1
120.br168.br
121.B Table\ \&17.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2169.B Table\ \&18.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
122.TS170.TS
123allbox tab(:);171allbox tab(:);
124lB lB lB.172lB lB lB.
125173
=== modified file 'man/ndb_mgm.1'
--- man/ndb_mgm.1 2014-06-03 13:14:25 +0000
+++ man/ndb_mgm.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_mgm\fR2.\" Title: \fBndb_mgm\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_MGM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_MGM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -87,7 +87,7 @@
87.nr an-no-space-flag 187.nr an-no-space-flag 1
88.nr an-break-flag 188.nr an-break-flag 1
89.br89.br
90.B Table\ \&17.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.290.B Table\ \&18.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.2
91.TS91.TS
92allbox tab(:);92allbox tab(:);
93lB lB lB.93lB lB lB.
@@ -176,7 +176,7 @@
176option works with the176option works with the
177\fBmysql\fR177\fBmysql\fR
178command\-line client\&. See178command\-line client\&. See
179Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq\&.179Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq\&.
180.if n \{\180.if n \{\
181.sp181.sp
182.\}182.\}
@@ -247,7 +247,7 @@
247Additional information about using247Additional information about using
248\fBndb_mgm\fR248\fBndb_mgm\fR
249can be found in249can be found in
250Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.250Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
251.SH "COPYRIGHT"251.SH "COPYRIGHT"
252.br252.br
253.PP253.PP
254254
=== modified file 'man/ndb_mgmd.8'
--- man/ndb_mgmd.8 2014-06-03 13:14:25 +0000
+++ man/ndb_mgmd.8 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_mgmd\fR2.\" Title: \fBndb_mgmd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_MGMD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_MGMD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -54,7 +54,7 @@
54.nr an-no-space-flag 154.nr an-no-space-flag 1
55.nr an-break-flag 155.nr an-break-flag 1
56.br56.br
57.B Table\ \&17.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.257.B Table\ \&18.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.2
58.TS58.TS
59allbox tab(:);59allbox tab(:);
60lB lB lB.60lB lB lB.
@@ -86,9 +86,7 @@
86.PP86.PP
87--config-file=file,87--config-file=file,
88.PP88.PP
89-f,89-f
90.PP
91-c
92T}:T{90T}:T{
93Specify the cluster configuration file; in NDB\-6\&.4\&.0 and later, needs91Specify the cluster configuration file; in NDB\-6\&.4\&.0 and later, needs
94 \-\-reload or \-\-initial to override configuration cache if92 \-\-reload or \-\-initial to override configuration cache if
@@ -431,7 +429,7 @@
431ON), can be used to disable the management server\*(Aqs configuration cache, so that it reads its configuration from429ON), can be used to disable the management server\*(Aqs configuration cache, so that it reads its configuration from
432config\&.ini430config\&.ini
433every time it starts (see431every time it starts (see
434Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the432Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
435\fBndb_mgmd\fR433\fBndb_mgmd\fR
436process with any one of the following options:434process with any one of the following options:
437.sp435.sp
@@ -622,7 +620,7 @@
622\fBndb_mgmd\fR620\fBndb_mgmd\fR
623was started with621was started with
624\fB\-\-config\-cache=OFF\fR\&. See622\fB\-\-config\-cache=OFF\fR\&. See
625Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.623Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
626.sp624.sp
627Formerly, using this option together with625Formerly, using this option together with
628\fB\-\-initial\fR626\fB\-\-initial\fR
@@ -812,7 +810,7 @@
812.TE810.TE
813.sp 1811.sp 1
814Configuration data is cached internally, rather than being read from the cluster global configuration file each time the management server is started (see812Configuration data is cached internally, rather than being read from the cluster global configuration file each time the management server is started (see
815Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the813Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
816\fB\-\-initial\fR814\fB\-\-initial\fR
817option overrides this behavior, by forcing the management server to delete any existing cache files, and then to re\-read the configuration data from the cluster configuration file and to build a new cache\&.815option overrides this behavior, by forcing the management server to delete any existing cache files, and then to re\-read the configuration data from the cluster configuration file and to build a new cache\&.
818.sp816.sp
@@ -835,7 +833,7 @@
835ignores833ignores
836\fB\-\-initial\fR834\fB\-\-initial\fR
837unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See835unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See
838Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.836Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
839.sp837.sp
840Formerly, using this option together with the838Formerly, using this option together with the
841\fB\-\-config\-file\fR839\fB\-\-config\-file\fR
@@ -1022,7 +1020,7 @@
1022.TE1020.TE
1023.sp 11021.sp 1
1024In MySQL Cluster NDB 7\&.2, configuration data is stored internally rather than being read from the cluster global configuration file each time the management server is started (see1022In MySQL Cluster NDB 7\&.2, configuration data is stored internally rather than being read from the cluster global configuration file each time the management server is started (see
1025Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using this option forces the management server to check its internal data store against the cluster configuration file and to reload the configuration if it finds that the configuration file does not match the cache\&. Existing configuration cache files are preserved, but not used\&.1023Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using this option forces the management server to check its internal data store against the cluster configuration file and to reload the configuration if it finds that the configuration file does not match the cache\&. Existing configuration cache files are preserved, but not used\&.
1026.sp1024.sp
1027This differs in two ways from the1025This differs in two ways from the
1028\fB\-\-initial\fR1026\fB\-\-initial\fR
@@ -1041,7 +1039,7 @@
1041ignores1039ignores
1042\fB\-\-reload\fR1040\fB\-\-reload\fR
1043unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See1041unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See
1044Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.1042Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
1045.RE1043.RE
1046.sp1044.sp
1047.RS 41045.RS 4
@@ -1166,7 +1164,7 @@
1166The same is true with regard to the connection string used with any1164The same is true with regard to the connection string used with any
1167\fBmysqld\fR1165\fBmysqld\fR
1168processes that you wish to start as MySQL Cluster SQL nodes connected to this cluster\&. See1166processes that you wish to start as MySQL Cluster SQL nodes connected to this cluster\&. See
1169Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.1167Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
1170.sp1168.sp
1171When used with1169When used with
1172\fBndb_mgmd\fR, this option affects the behavior of the management node with regard to other management nodes only\&. Do not confuse it with the1170\fBndb_mgmd\fR, this option affects the behavior of the management node with regard to other management nodes only\&. Do not confuse it with the
@@ -1200,7 +1198,7 @@
1200It is not strictly necessary to specify a connection string when starting the management server\&. However, if you are using more than one management server, a connection string should be provided and each node in the cluster should specify its node ID explicitly\&.1198It is not strictly necessary to specify a connection string when starting the management server\&. However, if you are using more than one management server, a connection string should be provided and each node in the cluster should specify its node ID explicitly\&.
1201.PP1199.PP
1202See1200See
1203Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.1201Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
1204\fBndb_mgmd\fR(8), describes other options for1202\fBndb_mgmd\fR(8), describes other options for
1205\fBndb_mgmd\fR\&.1203\fBndb_mgmd\fR\&.
1206.PP1204.PP
@@ -1227,7 +1225,7 @@
1227.\" config.ini (MySQL Cluster)1225.\" config.ini (MySQL Cluster)
1228config\&.ini1226config\&.ini
1229is the configuration file for the cluster as a whole\&. This file is created by the user and read by the management server\&.1227is the configuration file for the cluster as a whole\&. This file is created by the user and read by the management server\&.
1230Section\ \&17.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.1228Section\ \&18.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.
1231.RE1229.RE
1232.sp1230.sp
1233.RS 41231.RS 4
@@ -1240,7 +1238,7 @@
1240.\}1238.\}
1241ndb_\fInode_id\fR_cluster\&.log1239ndb_\fInode_id\fR_cluster\&.log
1242is the cluster events log file\&. Examples of such events include checkpoint startup and completion, node startup events, node failures, and levels of memory usage\&. A complete listing of cluster events with descriptions may be found in1240is the cluster events log file\&. Examples of such events include checkpoint startup and completion, node startup events, node failures, and levels of memory usage\&. A complete listing of cluster events with descriptions may be found in
1243Section\ \&17.5, \(lqManagement of MySQL Cluster\(rq\&.1241Section\ \&18.5, \(lqManagement of MySQL Cluster\(rq\&.
1244.sp1242.sp
1245When the size of the cluster log reaches one million bytes, the file is renamed to1243When the size of the cluster log reaches one million bytes, the file is renamed to
1246ndb_\fInode_id\fR_cluster\&.log\&.\fIseq_id\fR, where1244ndb_\fInode_id\fR_cluster\&.log\&.\fIseq_id\fR, where
12471245
=== modified file 'man/ndb_print_backup_file.1'
--- man/ndb_print_backup_file.1 2014-06-03 13:14:25 +0000
+++ man/ndb_print_backup_file.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_print_backup_file\fR2.\" Title: \fBndb_print_backup_file\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_PRINT_BACKUP_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_PRINT_BACKUP_" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -57,7 +57,7 @@
57BACKUP\-\fI#\fR, where57BACKUP\-\fI#\fR, where
58\fI#\fR58\fI#\fR
59is the sequence number for the backup\&. For more information about cluster backup files and their contents, see59is the sequence number for the backup\&. For more information about cluster backup files and their contents, see
60Section\ \&17.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.60Section\ \&18.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
61.PP61.PP
62Like62Like
63\fBndb_print_schema_file\fR63\fBndb_print_schema_file\fR
6464
=== modified file 'man/ndb_print_schema_file.1'
--- man/ndb_print_schema_file.1 2014-06-03 13:14:25 +0000
+++ man/ndb_print_schema_file.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_print_schema_file\fR2.\" Title: \fBndb_print_schema_file\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_PRINT_SCHEMA_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_PRINT_SCHEMA_" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/ndb_print_sys_file.1'
--- man/ndb_print_sys_file.1 2014-06-03 13:14:25 +0000
+++ man/ndb_print_sys_file.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_print_sys_file\fR2.\" Title: \fBndb_print_sys_file\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_PRINT_SYS_FIL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_PRINT_SYS_FIL" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/ndb_restore.1'
--- man/ndb_restore.1 2014-06-03 13:14:25 +0000
+++ man/ndb_restore.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_restore\fR2.\" Title: \fBndb_restore\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_RESTORE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_RESTORE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -48,7 +48,7 @@
48must be executed once for each of the backup files that were created by the48must be executed once for each of the backup files that were created by the
49START BACKUP49START BACKUP
50command used to create the backup (see50command used to create the backup (see
51Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq)\&. This is equal to the number of data nodes in the cluster at the time that the backup was created\&.51Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq)\&. This is equal to the number of data nodes in the cluster at the time that the backup was created\&.
52.\" single user mode (MySQL Cluster): and ndb_restore52.\" single user mode (MySQL Cluster): and ndb_restore
53.if n \{\53.if n \{\
54.sp54.sp
@@ -65,7 +65,7 @@
65.PP65.PP
66Before using66Before using
67\fBndb_restore\fR, it is recommended that the cluster be running in single user mode, unless you are restoring multiple data nodes in parallel\&. See67\fBndb_restore\fR, it is recommended that the cluster be running in single user mode, unless you are restoring multiple data nodes in parallel\&. See
68Section\ \&17.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.68Section\ \&18.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
69.sp .5v69.sp .5v
70.RE70.RE
71.PP71.PP
@@ -78,7 +78,7 @@
78.nr an-no-space-flag 178.nr an-no-space-flag 1
79.nr an-break-flag 179.nr an-break-flag 1
80.br80.br
81.B Table\ \&17.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.281.B Table\ \&18.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.2
82.TS82.TS
83allbox tab(:);83allbox tab(:);
84lB lB lB.84lB lB lB.
@@ -130,6 +130,7 @@
130l l l130l l l
131l l l131l l l
132l l l132l l l
133l l l
133l l l.134l l l.
134T{135T{
135.PP136.PP
@@ -463,9 +464,9 @@
463.PP464.PP
464--exclude-tables=table-list465--exclude-tables=table-list
465T}:T{466T}:T{
466List of one or more tables to exclude (includes those in same database467List of one or more tables to exclude (includes those in the same
467 that are not not named); each table reference must include468 database that are not named); each table reference must
468 the database name469 include the database name
469T}:T{470T}:T{
470.PP471.PP
471All MySQL 5\&.5 based releases472All MySQL 5\&.5 based releases
@@ -494,8 +495,9 @@
494.PP495.PP
495--rebuild-indexes496--rebuild-indexes
496T}:T{497T}:T{
497Causes multi\-threaded ordered index rebuilding of indexes found in the498Causes multi\-threaded rebuilding of ordered indexes found in the backup\&.
498 backup\&.499 Number of threads used is determined by setting
500 BuildIndexThreads parameter\&.
499T}:T{501T}:T{
500.PP502.PP
501All MySQL 5\&.5 based releases503All MySQL 5\&.5 based releases
@@ -550,8 +552,20 @@
550.PP552.PP
551All MySQL 5\&.5 based releases553All MySQL 5\&.5 based releases
552T}554T}
555T{
556.PP
557--exclude-intermediate-sql-tables[=TRUE|FALSE]
558T}:T{
559If TRUE (the default), do not restore any intermediate tables (having
560 names prefixed with \*(Aq#sql\-\*(Aq) that were left over from
561 copying ALTER TABLE operations\&.
562T}:T{
563.PP
564ADDED: NDB 7\&.2\&.17
565T}
553.TE566.TE
554.sp 1567.sp 1
568.\" ndb_restore: typical and required options
555.PP569.PP
556Typical options for this utility are shown here:570Typical options for this utility are shown here:
557.sp571.sp
@@ -566,13 +580,25 @@
566.RE580.RE
567.\}581.\}
568.PP582.PP
583Normally, when restoring from a MySQL Cluster backup,
584\fBndb_restore\fR
585requires at a minimum the
586\fB\-\-nodeid\fR
587(short form:
588\fB\-n\fR),
589\fB\-\-backupid\fR
590(short form:
591\fB\-b\fR), and
592\fB\-\-backup_path\fR
593options\&.
594.PP
569.\" restore_connect option (ndb_restore)595.\" restore_connect option (ndb_restore)
570The596The
571\fB\-c\fR597\fB\-c\fR
572option is used to specify a connection string which tells598option is used to specify a connection string which tells
573ndb_restore599ndb_restore
574where to locate the cluster management server\&. (See600where to locate the cluster management server\&. (See
575Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then601Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
576\fBndb_restore\fR602\fBndb_restore\fR
577attempts to connect to a management server on603attempts to connect to a management server on
578localhost:1186\&. This utility acts as a cluster API node, and so requires a free connection604localhost:1186\&. This utility acts as a cluster API node, and so requires a free connection
@@ -590,7 +616,7 @@
590section in616section in
591config\&.ini617config\&.ini
592that is not being used for a MySQL server or other application for this reason (see618that is not being used for a MySQL server or other application for this reason (see
593Section\ \&17.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.619Section\ \&18.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
594.PP620.PP
595You can verify that621You can verify that
596\fBndb_restore\fR622\fBndb_restore\fR
@@ -713,7 +739,7 @@
713INT739INT
714or740or
715BIGINT\&. See741BIGINT\&. See
716Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.742Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
717.PP743.PP
718Attribute promotion by744Attribute promotion by
719\fBndb_restore\fR745\fBndb_restore\fR
@@ -828,7 +854,7 @@
828option\&. Using854option\&. Using
829\fB\-\-lossy\-conversions\fR855\fB\-\-lossy\-conversions\fR
830allows lossy conversions of column values (type demotions or changes in sign) when restoring data from backup\&. With some exceptions, the rules governing demotion are the same as for MySQL replication; see856allows lossy conversions of column values (type demotions or changes in sign) when restoring data from backup\&. With some exceptions, the rules governing demotion are the same as for MySQL replication; see
831Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.857Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
832.PP858.PP
833\fBndb_restore\fR859\fBndb_restore\fR
834reports any truncation of data that it performs during lossy conversions once per attribute and column\&.860reports any truncation of data that it performs during lossy conversions once per attribute and column\&.
@@ -882,7 +908,7 @@
882option is used to specify the ID or sequence number of the backup, and is the same number shown by the management client in the908option is used to specify the ID or sequence number of the backup, and is the same number shown by the management client in the
883Backup \fIbackup_id\fR completed909Backup \fIbackup_id\fR completed
884message displayed upon completion of a backup\&. (See910message displayed upon completion of a backup\&. (See
885Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)911Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
886.if n \{\912.if n \{\
887.sp913.sp
888.\}914.\}
@@ -910,7 +936,7 @@
910in the936in the
911id937id
912column is updated if it already exists; such a row is inserted if it does not already exist\&. (See938column is updated if it already exists; such a row is inserted if it does not already exist\&. (See
913Section\ \&17.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)939Section\ \&18.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
914.PP940.PP
915.\" restore_data option (ndb_restore)941.\" restore_data option (ndb_restore)
916\fB\-\-restore_data\fR942\fB\-\-restore_data\fR
@@ -942,7 +968,7 @@
942This works only if the privilege tables were converted to968This works only if the privilege tables were converted to
943NDB969NDB
944before the backup was taken\&. For more information, see970before the backup was taken\&. For more information, see
945Section\ \&17.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.971Section\ \&18.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
946.PP972.PP
947.\" backup_path option (ndb_restore)973.\" backup_path option (ndb_restore)
948.\" ndb_restore: backup_path option974.\" ndb_restore: backup_path option
@@ -971,7 +997,7 @@
971must be run twice\(emonce for each database node in the cluster where the backup was taken\&. However,997must be run twice\(emonce for each database node in the cluster where the backup was taken\&. However,
972\fBndb_restore\fR998\fBndb_restore\fR
973cannot always restore backups made from a cluster running one version of MySQL to a cluster running a different MySQL version\&. See999cannot always restore backups made from a cluster running one version of MySQL to a cluster running a different MySQL version\&. See
974Section\ \&17.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.1000Section\ \&18.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
975.if n \{\1001.if n \{\
976.sp1002.sp
977.\}1003.\}
@@ -1413,7 +1439,7 @@
1413This option stops1439This option stops
1414\fBndb_restore\fR1440\fBndb_restore\fR
1415from restoring any MySQL Cluster Disk Data objects, such as tablespaces and log file groups; see1441from restoring any MySQL Cluster Disk Data objects, such as tablespaces and log file groups; see
1416Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.1442Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
1417.PP1443.PP
1418.\" ndb_restore: parallelism option1444.\" ndb_restore: parallelism option
1419.\" parallelism option (ndb_restore)1445.\" parallelism option (ndb_restore)
@@ -1938,7 +1964,27 @@
1938\fBndb_restore\fR1964\fBndb_restore\fR
1939to cause multi\-threaded rebuilding of the ordered indexes while restoring a native1965to cause multi\-threaded rebuilding of the ordered indexes while restoring a native
1940NDB1966NDB
1941backup\&.1967backup\&. The number of threads used for building ordered indexes by
1968\fBndb_restore\fR
1969with this option is controlled by the
1970BuildIndexThreads
1971data node configuration parameter (MySQL Cluster NDB 6\&.3\&.30 and later; MySQL Cluster NDB 7\&.0\&.11 and later)\&.
1972.\" indexes: and ndb_restore
1973.PP
1974It is necessary to use this option only for the first run of
1975\fBndb_restore\fR; this causes all ordered indexes to be rebuilt without using
1976\fB\-\-rebuild\-indexes\fR
1977again when restoring subsequent nodes\&. You should use this option prior to inserting new rows into the database; otherwise, it is possible for a row to be inserted that later causes a unique constraint violation when trying to rebuild the indexes\&.
1978.PP
1979Rebuilding of unique indexes uses disk write bandwidth for redo logging and local checkpointing\&. An insufficient amount of this bandwith can lead to redo buffer overload or log overload errors\&. In such cases you can run
1980\fBndb_restore\fR
1981\fB\-\-rebuild\-indexes\fR
1982again; the process resumes at the point where the error occurred\&. You can also do this when you have encountered temporarary errors\&. You can repeat execution of
1983\fBndb_restore\fR
1984\fB\-\-rebuild\-indexes\fR
1985indefinitely; you may be able to stop such errors by reducing the value of
1986DiskCheckpointSpeed
1987to provide additional disk bandwidth to redo logging\&.
1942.PP1988.PP
1943.\" ndb_restore: skip-broken-objects option1989.\" ndb_restore: skip-broken-objects option
1944.\" skip-broken-objects option (ndb_restore)1990.\" skip-broken-objects option (ndb_restore)
@@ -2079,6 +2125,62 @@
2079.sp .5v2125.sp .5v
2080.RE2126.RE
2081.PP2127.PP
2128.\" ndb_restore: exclude-intermediate-sql-tables option
2129.\" exclude-intermediate-sql-tables option (ndb_restore)
2130\fB\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]\fR
2131.TS
2132allbox tab(:);
2133l l s s
2134l l s s
2135l l s s
2136^ l l s
2137^ l l s.
2138T{
2139\fBIntroduced\fR
2140T}:T{
21415\&.5\&.37\-ndb\-7\&.2\&.17
2142T}
2143T{
2144\fBCommand\-Line Format\fR
2145T}:T{
2146\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]
2147T}
2148T{
2149\ \&
2150T}:T{
2151\fBPermitted Values\fR
2152T}
2153:T{
2154\fBType\fR
2155T}:T{
2156boolean
2157T}
2158:T{
2159\fBDefault\fR
2160T}:T{
2161TRUE
2162T}
2163.TE
2164.sp 1
2165.PP
2166When performing copying
2167ALTER TABLE
2168operations,
2169\fBmysqld\fR
2170creates intermediate tables (whose names are prefixed with
2171#sql\-)\&. When
2172TRUE, the
2173\fB\-\-exclude\-intermediate\-sql\-tables\fR
2174option keeps
2175\fBndb_restore\fR
2176from restoring such tables that may have been left over from such operations\&. This option is
2177TRUE
2178by default\&.
2179.PP
2180The
2181\fB\-\-exclude\-intermediate\-sql\-tables\fR
2182option was introduced in MySQL Cluster NDB 7\&.2\&.17\&. (Bug #17882305)
2183.PP
2082\fBError reporting\fR. .\" ndb_restore: errors2184\fBError reporting\fR. .\" ndb_restore: errors
2083\fBndb_restore\fR2185\fBndb_restore\fR
2084reports both temporary and permanent errors\&. In the case of temporary errors, it may able to recover from them, and reports2186reports both temporary and permanent errors\&. In the case of temporary errors, it may able to recover from them, and reports
20852187
=== modified file 'man/ndb_select_all.1'
--- man/ndb_select_all.1 2014-06-03 13:14:25 +0000
+++ man/ndb_select_all.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_select_all\fR2.\" Title: \fBndb_select_all\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SELECT_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SELECT_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -61,7 +61,7 @@
61.nr an-no-space-flag 161.nr an-no-space-flag 1
62.nr an-break-flag 162.nr an-break-flag 1
63.br63.br
64.B Table\ \&17.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.264.B Table\ \&18.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.2
65.TS65.TS
66allbox tab(:);66allbox tab(:);
67lB lB lB.67lB lB lB.
@@ -454,8 +454,8 @@
454Adds a454Adds a
455GCI455GCI
456column to the output showing the global checkpoint at which each row was last updated\&. See456column to the output showing the global checkpoint at which each row was last updated\&. See
457Section\ \&17.1, \(lqMySQL Cluster Overview\(rq, and457Section\ \&18.1, \(lqMySQL Cluster Overview\(rq, and
458Section\ \&17.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.458Section\ \&18.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
459.RE459.RE
460.sp460.sp
461.RS 4461.RS 4
462462
=== modified file 'man/ndb_select_count.1'
--- man/ndb_select_count.1 2014-06-03 13:14:25 +0000
+++ man/ndb_select_count.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_select_count\fR2.\" Title: \fBndb_select_count\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SELECT_COUNT\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SELECT_COUNT\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -61,7 +61,7 @@
61.nr an-no-space-flag 161.nr an-no-space-flag 1
62.nr an-break-flag 162.nr an-break-flag 1
63.br63.br
64.B Table\ \&17.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.264.B Table\ \&18.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.2
65.TS65.TS
66allbox tab(:);66allbox tab(:);
67lB lB lB.67lB lB lB.
6868
=== modified file 'man/ndb_show_tables.1'
--- man/ndb_show_tables.1 2014-06-03 13:14:25 +0000
+++ man/ndb_show_tables.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_show_tables\fR2.\" Title: \fBndb_show_tables\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SHOW_TABLES\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SHOW_TABLES\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -52,7 +52,7 @@
52.nr an-no-space-flag 152.nr an-no-space-flag 1
53.nr an-break-flag 153.nr an-break-flag 1
54.br54.br
55.B Table\ \&17.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.255.B Table\ \&18.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.2
56.TS56.TS
57allbox tab(:);57allbox tab(:);
58lB lB lB.58lB lB lB.
5959
=== modified file 'man/ndb_size.pl.1'
--- man/ndb_size.pl.1 2014-06-03 13:14:25 +0000
+++ man/ndb_size.pl.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_size.pl\fR2.\" Title: \fBndb_size.pl\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SIZE\&.PL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SIZE\&.PL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -102,7 +102,7 @@
102.nr an-no-space-flag 1102.nr an-no-space-flag 1
103.nr an-break-flag 1103.nr an-break-flag 1
104.br104.br
105.B Table\ \&17.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2105.B Table\ \&18.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2
106.TS106.TS
107allbox tab(:);107allbox tab(:);
108lB lB lB.108lB lB lB.
109109
=== modified file 'man/ndb_waiter.1'
--- man/ndb_waiter.1 2014-06-03 13:14:25 +0000
+++ man/ndb_waiter.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_waiter\fR2.\" Title: \fBndb_waiter\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_WAITER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_WAITER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -142,7 +142,7 @@
142.nr an-no-space-flag 1142.nr an-no-space-flag 1
143.nr an-break-flag 1143.nr an-break-flag 1
144.br144.br
145.B Table\ \&17.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2145.B Table\ \&18.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2
146.TS146.TS
147allbox tab(:);147allbox tab(:);
148lB lB lB.148lB lB lB.
149149
=== modified file 'man/ndbd.8'
--- man/ndbd.8 2014-06-03 13:14:25 +0000
+++ man/ndbd.8 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbd\fR2.\" Title: \fBndbd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
59.nr an-no-space-flag 159.nr an-no-space-flag 1
60.nr an-break-flag 160.nr an-break-flag 1
61.br61.br
62.B Table\ \&17.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.262.B Table\ \&18.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.2
63.TS63.TS
64allbox tab(:);64allbox tab(:);
65lB lB lB.65lB lB lB.
@@ -556,7 +556,7 @@
556.IP \(bu 2.3556.IP \(bu 2.3
557.\}557.\}
558MySQL Cluster Disk Data files (see558MySQL Cluster Disk Data files (see
559Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.559Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
560.RE560.RE
561.sp561.sp
562This option also has no effect on recovery of data by a data node that is just starting (or restarting) from data nodes that are already running\&. This recovery of data occurs automatically, and requires no user intervention in a MySQL Cluster that is running normally\&.562This option also has no effect on recovery of data by a data node that is just starting (or restarting) from data nodes that are already running\&. This recovery of data occurs automatically, and requires no user intervention in a MySQL Cluster that is running normally\&.
@@ -756,7 +756,7 @@
756connects to the management server, obtains configuration data from it, and initializes communication objects\&. However, it does not actually start the execution engine until specifically requested to do so by the management server\&. This can be accomplished by issuing the proper756connects to the management server, obtains configuration data from it, and initializes communication objects\&. However, it does not actually start the execution engine until specifically requested to do so by the management server\&. This can be accomplished by issuing the proper
757START757START
758command in the management client (see758command in the management client (see
759Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.759Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
760.RE760.RE
761.sp761.sp
762.RS 4762.RS 4
@@ -1163,7 +1163,7 @@
1163.\}1163.\}
1164.PP1164.PP
1165See1165See
1166Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.1166Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
1167\fBndbd\fR(8), describes other options for1167\fBndbd\fR(8), describes other options for
1168\fBndbd\fR\&.1168\fBndbd\fR\&.
1169.PP1169.PP
@@ -1189,7 +1189,7 @@
1189For a machine with many CPUs it is possible to use several1189For a machine with many CPUs it is possible to use several
1190\fBndbd\fR1190\fBndbd\fR
1191processes which belong to different node groups; however, such a configuration is still considered experimental and is not supported for MySQL 5\&.5 in a production setting\&. See1191processes which belong to different node groups; however, such a configuration is still considered experimental and is not supported for MySQL 5\&.5 in a production setting\&. See
1192Section\ \&17.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.1192Section\ \&18.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
1193.SH "COPYRIGHT"1193.SH "COPYRIGHT"
1194.br1194.br
1195.PP1195.PP
11961196
=== modified file 'man/ndbd_redo_log_reader.1'
--- man/ndbd_redo_log_reader.1 2014-06-03 13:14:25 +0000
+++ man/ndbd_redo_log_reader.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbd_redo_log_reader\fR2.\" Title: \fBndbd_redo_log_reader\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBD_REDO_LOG_REA" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBD_REDO_LOG_REA" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -55,7 +55,7 @@
55.nr an-no-space-flag 155.nr an-no-space-flag 1
56.nr an-break-flag 156.nr an-break-flag 1
57.br57.br
58.B Table\ \&17.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.258.B Table\ \&18.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.2
59.TS59.TS
60allbox tab(:);60allbox tab(:);
61lB lB lB.61lB lB lB.
6262
=== modified file 'man/ndbinfo_select_all.1'
--- man/ndbinfo_select_all.1 2014-06-03 13:14:25 +0000
+++ man/ndbinfo_select_all.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbinfo_select_all\fR2.\" Title: \fBndbinfo_select_all\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBINFO_SELECT_AL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBINFO_SELECT_AL" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -121,7 +121,7 @@
121.nr an-no-space-flag 1121.nr an-no-space-flag 1
122.nr an-break-flag 1122.nr an-break-flag 1
123.br123.br
124.B Table\ \&17.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2124.B Table\ \&18.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2
125.TS125.TS
126allbox tab(:);126allbox tab(:);
127lB lB lB.127lB lB lB.
128128
=== modified file 'man/ndbmtd.8'
--- man/ndbmtd.8 2014-06-03 13:14:25 +0000
+++ man/ndbmtd.8 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbmtd\fR2.\" Title: \fBndbmtd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBMTD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBMTD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
59also apply to59also apply to
60\fBndbmtd\fR\&. For more information about these options and parameters, see60\fBndbmtd\fR\&. For more information about these options and parameters, see
61\fBndbd\fR(8), and61\fBndbd\fR(8), and
62Section\ \&17.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.62Section\ \&18.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
63.PP63.PP
64\fBndbmtd\fR64\fBndbmtd\fR
65is also file system\-compatible with65is also file system\-compatible with
6666
=== modified file 'man/perror.1'
--- man/perror.1 2014-06-03 13:14:25 +0000
+++ man/perror.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBperror\fR2.\" Title: \fBperror\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBPERROR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBPERROR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/replace.1'
--- man/replace.1 2014-06-03 13:14:25 +0000
+++ man/replace.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBreplace\fR2.\" Title: \fBreplace\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBREPLACE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBREPLACE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'man/resolve_stack_dump.1'
--- man/resolve_stack_dump.1 2014-06-03 13:14:25 +0000
+++ man/resolve_stack_dump.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBresolve_stack_dump\fR2.\" Title: \fBresolve_stack_dump\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBRESOLVE_STACK_DUM" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBRESOLVE_STACK_DUM" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -125,7 +125,7 @@
125.RE125.RE
126.PP126.PP
127For more information, see127For more information, see
128Section\ \&23.4.1.5, \(lqUsing a Stack Trace\(rq\&.128Section\ \&24.4.1.5, \(lqUsing a Stack Trace\(rq\&.
129.SH "COPYRIGHT"129.SH "COPYRIGHT"
130.br130.br
131.PP131.PP
132132
=== modified file 'man/resolveip.1'
--- man/resolveip.1 2014-06-03 13:14:25 +0000
+++ man/resolveip.1 2014-08-22 10:00:31 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBresolveip\fR2.\" Title: \fBresolveip\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5.\" Date: 05/11/20145.\" Date: 07/18/2014
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBRESOLVEIP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBRESOLVEIP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_slave.test'
--- mysql-test/extra/rpl_tests/rpl_stop_slave.test 2010-12-20 14:15:01 +0000
+++ mysql-test/extra/rpl_tests/rpl_stop_slave.test 2014-08-22 10:00:31 +0000
@@ -42,6 +42,10 @@
42connection slave1;42connection slave1;
43--echo # To resume slave SQL thread43--echo # To resume slave SQL thread
44SET DEBUG_SYNC= 'now SIGNAL signal.continue';44SET DEBUG_SYNC= 'now SIGNAL signal.continue';
45# wait for the sql thread to come out of the
46# waiting phase before resetting the signals
47--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and info LIKE '%INSERT INTO t1 VALUES (1)%'
48--source include/wait_condition.inc
45SET DEBUG_SYNC= 'RESET';49SET DEBUG_SYNC= 'RESET';
4650
47--echo51--echo
4852
=== added file 'mysql-test/include/stop_dump_threads.inc'
--- mysql-test/include/stop_dump_threads.inc 1970-01-01 00:00:00 +0000
+++ mysql-test/include/stop_dump_threads.inc 2014-08-22 10:00:31 +0000
@@ -0,0 +1,32 @@
1# ==== Purpose ====
2#
3# Stop all dump threads on the server of the current connection.
4#
5# ==== Usage ====
6#
7# --source include/stop_dump_threads.inc
8
9--let $include_filename= stop_dump_threads.inc
10--source include/begin_include_file.inc
11
12
13--let $_sdt_show_rpl_debug_info_old= $show_rpl_debug_info
14--let $show_rpl_debug_info= 1
15--disable_query_log
16--disable_result_log
17
18--let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
19
20while ($_sdt_dump_thread_id != '')
21{
22 eval KILL $_sdt_dump_thread_id;
23 --let $wait_condition= SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = $_sdt_dump_thread_id
24 --source include/wait_condition.inc
25
26 --let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
27}
28
29--let $show_rpl_debug_info= $_sdt_show_rpl_debug_info_old
30
31--let $include_filename= stop_dump_threads.inc
32--source include/end_include_file.inc
033
=== modified file 'mysql-test/include/uninstall_semisync.inc'
--- mysql-test/include/uninstall_semisync.inc 2013-03-29 03:58:31 +0000
+++ mysql-test/include/uninstall_semisync.inc 2014-08-22 10:00:31 +0000
@@ -13,6 +13,11 @@
13UNINSTALL PLUGIN rpl_semi_sync_slave;13UNINSTALL PLUGIN rpl_semi_sync_slave;
1414
15--connection master15--connection master
16# After BUG#17638477 fix, uninstallation of rpl_semi_sync_master
17# is not allowed when there are semi sync slaves. Hence kill
18# all dump threads before uninstalling it.
19SET GLOBAL rpl_semi_sync_master_enabled = OFF;
20--source include/stop_dump_threads.inc
16UNINSTALL PLUGIN rpl_semi_sync_master;21UNINSTALL PLUGIN rpl_semi_sync_master;
17--enable_warnings22--enable_warnings
1823
1924
=== added file 'mysql-test/r/bug71858.result'
--- mysql-test/r/bug71858.result 1970-01-01 00:00:00 +0000
+++ mysql-test/r/bug71858.result 2014-08-22 10:00:31 +0000
@@ -0,0 +1,10 @@
1SELECT table_schema, table_name, column_name, column_type FROM INFORMATION_SCHEMA.COLUMNS
2WHERE TABLE_NAME IN ( 'ooooooooooooooooooooooooooooooooooooo' 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
3'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cc' 'ccccccccccccc' 'wwwwwwwwwwwwwwwwwww' 'rrrrrrrrrrrrrrrr'
4'tttttttttttttttttttt' 'yyyyyyyyyyyyyyyyyyy' 'uuuuuuuuuuuuuuuuuuuuuuuuuuuu' 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiii'
5'oooooooooooooooooooo' 'ppppppppppppppppppppppppppppp' 'jjjjjjjjjjjj' 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk'
6'lllllllllllllllllllllllllllllllllllllll' 'zzzzzzzzzzzzzzz' 'xxxxxxxxxxxxxxxxx' 'cccccccccc'
7'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
8'nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn' ) AND TABLE_SCHEMA='AA_BBB' AND COLUMN_TYPE='PRI'
9ORDER BY 2;
10table_schema table_name column_name column_type
011
=== modified file 'mysql-test/r/failed_auth_3909.result'
--- mysql-test/r/failed_auth_3909.result 2013-04-30 11:48:24 +0000
+++ mysql-test/r/failed_auth_3909.result 2014-08-22 10:00:31 +0000
@@ -8,12 +8,12 @@
8Warning 1364 Field 'x509_subject' doesn't have a default value8Warning 1364 Field 'x509_subject' doesn't have a default value
9flush privileges;9flush privileges;
10connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);10connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);
11ERROR HY000: Plugin 'bar' is not loaded11ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
12connect(localhost,u2,,test,MASTER_PORT,MASTER_SOCKET);12connect(localhost,u2,,test,MASTER_PORT,MASTER_SOCKET);
13ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)13ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)
14connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);14connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);
15ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)15ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
16ERROR HY000: Plugin 'bar' is not loaded16ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
17ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)17ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)
18ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)18ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
19delete from mysql.user where plugin = 'bar';19delete from mysql.user where plugin = 'bar';
2020
=== modified file 'mysql-test/r/group_min_max.result'
--- mysql-test/r/group_min_max.result 2013-05-13 11:45:25 +0000
+++ mysql-test/r/group_min_max.result 2014-08-22 10:00:31 +0000
@@ -3001,7 +3001,7 @@
30010 NULL30010 NULL
3002EXPLAIN SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;3002EXPLAIN SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
3003id select_type table type possible_keys key key_len ref rows Extra3003id select_type table type possible_keys key key_len ref rows Extra
30041 SIMPLE t2 range NULL a 5 NULL 9 Using index for group-by30041 SIMPLE t2 index NULL a 15 NULL 16 Using index
3005SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;3005SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
3006SUM(DISTINCT a) MAX(b)3006SUM(DISTINCT a) MAX(b)
30071 830071 8
@@ -3029,7 +3029,7 @@
30291683029168
3030EXPLAIN SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;3030EXPLAIN SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
3031id select_type table type possible_keys key key_len ref rows Extra3031id select_type table type possible_keys key key_len ref rows Extra
30321 SIMPLE t2 range NULL a 5 NULL 9 Using index for group-by30321 SIMPLE t2 index NULL a 15 NULL 16 Using index
3033SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;3033SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
3034(SUM(DISTINCT a) + MAX(b))3034(SUM(DISTINCT a) + MAX(b))
3035930359
@@ -3057,3 +3057,55 @@
30571 SIMPLE t1 range NULL PRIMARY 5 NULL 9 Using index for group-by (scanning)30571 SIMPLE t1 range NULL PRIMARY 5 NULL 9 Using index for group-by (scanning)
3058drop table t1;3058drop table t1;
3059# End of test#50539.3059# End of test#50539.
3060#
3061# Bug#17217128 - BAD INTERACTION BETWEEN MIN/MAX AND
3062# "HAVING SUM(DISTINCT)": WRONG RESULTS.
3063#
3064CREATE TABLE t (a INT, b INT, KEY(a,b));
3065INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
3066ANALYZE TABLE t;
3067Table Op Msg_type Msg_text
3068test.t analyze status OK
3069SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
3070a SUM(DISTINCT a) MIN(b)
30711 1 0
30722 2 2
30733 3 2
30744 4 4
3075EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
3076id select_type table type possible_keys key key_len ref rows Extra
30771 SIMPLE t index NULL a 10 NULL 7 Using index
3078SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
3079a SUM(DISTINCT a) MAX(b)
30801 1 1
30812 2 2
30823 3 3
30834 4 5
3084EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
3085id select_type table type possible_keys key key_len ref rows Extra
30861 SIMPLE t index NULL a 10 NULL 7 Using index
3087SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
3088a MAX(b)
30891 1
30902 2
30913 3
30924 5
3093EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
3094id select_type table type possible_keys key key_len ref rows Extra
30951 SIMPLE t index NULL a 10 NULL 7 Using index
3096SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
3097SUM(DISTINCT a) MIN(b) MAX(b)
309810 0 5
3099EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
3100id select_type table type possible_keys key key_len ref rows Extra
31011 SIMPLE t index NULL a 10 NULL 7 Using index
3102SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
3103a SUM(DISTINCT a) MIN(b) MAX(b)
31041 1 0 1
31052 2 2 2
31063 3 2 3
31074 4 4 5
3108EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
3109id select_type table type possible_keys key key_len ref rows Extra
31101 SIMPLE t index NULL a 10 NULL 7 Using index
3111DROP TABLE t;
30603112
=== modified file 'mysql-test/r/group_min_max_innodb.result'
--- mysql-test/r/group_min_max_innodb.result 2013-05-23 08:39:28 +0000
+++ mysql-test/r/group_min_max_innodb.result 2014-08-22 10:00:31 +0000
@@ -118,3 +118,171 @@
11811181
119DROP TABLE t1;119DROP TABLE t1;
120End of 5.5 tests120End of 5.5 tests
121#
122# Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
123#
124CREATE TABLE t0 (
125i1 INTEGER NOT NULL
126);
127INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
128(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
129(21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
130CREATE TABLE t1 (
131c1 CHAR(1) NOT NULL,
132i1 INTEGER NOT NULL,
133i2 INTEGER NOT NULL,
134UNIQUE KEY k1 (c1,i2)
135) ENGINE=InnoDB;
136INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
137INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
138INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
139INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
140INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
141INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
142CREATE TABLE t2 (
143c1 CHAR(1) NOT NULL,
144i1 INTEGER NOT NULL,
145i2 INTEGER NOT NULL,
146UNIQUE KEY k2 (c1,i1,i2)
147) ENGINE=InnoDB;
148INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
149INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
150INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
151INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
152INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
153INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
154ANALYZE TABLE t1;
155ANALYZE TABLE t2;
156EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
157GROUP BY c1;
158id select_type table type possible_keys key key_len ref rows Extra
1591 SIMPLE t1 range k1 k1 5 NULL 31 Using where; Using index
160SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
161GROUP BY c1;
162c1 max(i2)
163C 17
164F 30
165EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
166GROUP BY c1;
167id select_type table type possible_keys key key_len ref rows Extra
1681 SIMPLE t1 range k1 k1 5 NULL 31 Using where; Using index
169SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
170GROUP BY c1;
171c1 max(i2)
172C 30
173F 17
174EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
175GROUP BY c1;
176id select_type table type possible_keys key key_len ref rows Extra
1771 SIMPLE t1 range k1 k1 5 NULL 1 Using where; Using index for group-by
178SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
179GROUP BY c1;
180c1 max(i2)
181C 17
182F 17
183EXPLAIN SELECT c1, max(i2) FROM t1
184WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
185GROUP BY c1;
186id select_type table type possible_keys key key_len ref rows Extra
1871 SIMPLE t1 range k1 k1 5 NULL 3 Using where; Using index
188SELECT c1, max(i2) FROM t1
189WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
190GROUP BY c1;
191c1 max(i2)
192C 30
193EXPLAIN SELECT c1, i1, max(i2) FROM t2
194WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
195GROUP BY c1,i1;
196id select_type table type possible_keys key key_len ref rows Extra
1971 SIMPLE t2 range k2 k2 9 NULL 59 Using where; Using index for group-by
198SELECT c1, i1, max(i2) FROM t2
199WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
200GROUP BY c1,i1;
201c1 i1 max(i2)
202C 17 17
203F 17 17
204EXPLAIN SELECT c1, i1, max(i2) FROM t2
205WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
206GROUP BY c1,i1;
207id select_type table type possible_keys key key_len ref rows Extra
2081 SIMPLE t2 range k2 k2 9 NULL 58 Using where; Using index for group-by
209SELECT c1, i1, max(i2) FROM t2
210WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
211GROUP BY c1,i1;
212c1 i1 max(i2)
213C 17 17
214F 17 17
215EXPLAIN SELECT c1, i1, max(i2) FROM t2
216WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
217GROUP BY c1,i1;
218id select_type table type possible_keys key key_len ref rows Extra
2191 SIMPLE t2 range k2 k2 5 NULL 181 Using where; Using index for group-by
220SELECT c1, i1, max(i2) FROM t2
221WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
222GROUP BY c1,i1;
223c1 i1 max(i2)
224A 17 17
225B 17 17
226C 1 1
227C 2 2
228C 3 3
229C 4 4
230C 5 5
231C 6 6
232C 7 7
233C 8 8
234C 9 9
235C 10 10
236C 11 11
237C 12 12
238C 13 13
239C 14 14
240C 15 15
241C 16 16
242C 17 17
243C 18 18
244C 19 19
245C 20 20
246C 21 21
247C 22 22
248C 23 23
249C 24 24
250C 25 25
251C 26 26
252C 27 27
253C 28 28
254C 29 29
255C 30 30
256D 17 17
257E 17 17
258F 1 1
259F 2 2
260F 3 3
261F 4 4
262F 5 5
263F 6 6
264F 7 7
265F 8 8
266F 9 9
267F 10 10
268F 11 11
269F 12 12
270F 13 13
271F 14 14
272F 15 15
273F 16 16
274F 17 17
275F 18 18
276F 19 19
277F 20 20
278F 21 21
279F 22 22
280F 23 23
281F 24 24
282F 25 25
283F 26 26
284F 27 27
285F 28 28
286F 29 29
287F 30 30
288DROP TABLE t0,t1,t2;
121289
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- mysql-test/r/mysqld--help-notwin.result 2014-01-23 05:14:14 +0000
+++ mysql-test/r/mysqld--help-notwin.result 2014-08-22 10:00:31 +0000
@@ -792,8 +792,8 @@
792 --thread-statistics Control TABLE_STATISTICS running, when userstat is792 --thread-statistics Control TABLE_STATISTICS running, when userstat is
793 enabled793 enabled
794 --time-format=name The TIME format (ignored)794 --time-format=name The TIME format (ignored)
795 --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are795 --timed-mutexes Specify whether to time mutexes. Deprecated, has no
796 currently supported)796 effect.
797 --tmp-table-size=# If an internal in-memory temporary table exceeds this797 --tmp-table-size=# If an internal in-memory temporary table exceeds this
798 size, MySQL will automatically convert it to an on-disk798 size, MySQL will automatically convert it to an on-disk
799 MyISAM table799 MyISAM table
800800
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- mysql-test/r/mysqld--help-win.result 2014-01-23 05:14:14 +0000
+++ mysql-test/r/mysqld--help-win.result 2014-08-22 10:00:31 +0000
@@ -750,8 +750,8 @@
750 one-thread-per-connection, no-threads, pool-of-threads750 one-thread-per-connection, no-threads, pool-of-threads
751 --thread-stack=# The stack size for each thread751 --thread-stack=# The stack size for each thread
752 --time-format=name The TIME format (ignored)752 --time-format=name The TIME format (ignored)
753 --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are753 --timed-mutexes Specify whether to time mutexes. Deprecated, has no
754 currently supported)754 effect.
755 --tmp-table-size=# If an internal in-memory temporary table exceeds this755 --tmp-table-size=# If an internal in-memory temporary table exceeds this
756 size, MySQL will automatically convert it to an on-disk756 size, MySQL will automatically convert it to an on-disk
757 MyISAM table757 MyISAM table
758758
=== modified file 'mysql-test/r/partition_archive.result'
--- mysql-test/r/partition_archive.result 2009-08-11 12:18:26 +0000
+++ mysql-test/r/partition_archive.result 2014-08-22 10:00:31 +0000
@@ -126,3 +126,29 @@
126count(*)126count(*)
127100127100
128drop table t1;128drop table t1;
129#
130#BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
131# CORRUPTS FRM
132CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
133PARTITIONS 5;
134SHOW CREATE TABLE t1;
135Table Create Table
136t1 CREATE TABLE `t1` (
137 `fld1` int(11) NOT NULL,
138 PRIMARY KEY (`fld1`)
139) ENGINE=MyISAM DEFAULT CHARSET=latin1
140/*!50100 PARTITION BY HASH (fld1)
141PARTITIONS 5 */
142ALTER TABLE t1 ENGINE= ARCHIVE;
143ERROR HY000: Can't create table 'test.#sql-temporary' (errno: 1)
144#After the patch, the ENGINE is correctly displayed as MyISAM
145SHOW CREATE TABLE t1;
146Table Create Table
147t1 CREATE TABLE `t1` (
148 `fld1` int(11) NOT NULL,
149 PRIMARY KEY (`fld1`)
150) ENGINE=MyISAM DEFAULT CHARSET=latin1
151/*!50100 PARTITION BY HASH (fld1)
152PARTITIONS 5 */
153#Cleanup.
154DROP TABLE t1;
129155
=== modified file 'mysql-test/r/partition_pruning.result'
--- mysql-test/r/partition_pruning.result 2012-03-14 20:57:15 +0000
+++ mysql-test/r/partition_pruning.result 2014-08-22 10:00:31 +0000
@@ -3294,3 +3294,117 @@
3294id select_type table partitions type possible_keys key key_len ref rows Extra3294id select_type table partitions type possible_keys key key_len ref rows Extra
32951 SIMPLE t1 p0,p1,p2 ALL NULL NULL NULL NULL 100 Using where32951 SIMPLE t1 p0,p1,p2 ALL NULL NULL NULL NULL 100 Using where
3296drop table t0, t1;3296drop table t0, t1;
3297#
3298# Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
3299#
3300CREATE TABLE t1
3301(c1 int,
3302c2 int,
3303c3 int,
3304c4 int,
3305PRIMARY KEY (c1,c2))
3306PARTITION BY LIST COLUMNS (c2)
3307(PARTITION p1 VALUES IN (1,2),
3308PARTITION p2 VALUES IN (3,4));
3309INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
3310INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
3311SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
3312c1 c2 c3 c4
3313SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
3314c1 c2 c3 c4
33151 1 1 1
3316SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
3317c1 c2 c3 c4
33181 1 1 1
3319SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
3320c1 c2 c3 c4
33211 1 1 1
33221 2 1 1
3323SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
3324c1 c2 c3 c4
33251 2 1 1
3326SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
3327c1 c2 c3 c4
33281 1 1 1
33291 2 1 1
3330SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
3331c1 c2 c3 c4
33321 1 1 1
33331 2 1 1
3334SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
3335c1 c2 c3 c4
33362 3 1 1
3337SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
3338c1 c2 c3 c4
33392 3 1 1
3340SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
3341c1 c2 c3 c4
33422 3 1 1
33432 4 1 1
3344SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
3345c1 c2 c3 c4
33462 4 1 1
3347SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
3348c1 c2 c3 c4
33492 3 1 1
3350SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
3351c1 c2 c3 c4
33522 3 1 1
33532 4 1 1
3354SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
3355c1 c2 c3 c4
33562 4 1 1
3357SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
3358c1 c2 c3 c4
33592 4 1 1
3360SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
3361c1 c2 c3 c4
3362EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
3363id select_type table partitions type possible_keys key key_len ref rows Extra
33641 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
3365EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
3366id select_type table partitions type possible_keys key key_len ref rows Extra
33671 SIMPLE t1 p1 range PRIMARY PRIMARY 8 NULL 1 Using where
3368EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
3369id select_type table partitions type possible_keys key key_len ref rows Extra
33701 SIMPLE t1 p1 const PRIMARY PRIMARY 8 const,const 1
3371EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
3372id select_type table partitions type possible_keys key key_len ref rows Extra
33731 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3374EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
3375id select_type table partitions type possible_keys key key_len ref rows Extra
33761 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3377EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
3378id select_type table partitions type possible_keys key key_len ref rows Extra
33791 SIMPLE t1 p1 range PRIMARY PRIMARY 8 NULL 1 Using where
3380EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
3381id select_type table partitions type possible_keys key key_len ref rows Extra
33821 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3383EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
3384id select_type table partitions type possible_keys key key_len ref rows Extra
33851 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3386EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
3387id select_type table partitions type possible_keys key key_len ref rows Extra
33881 SIMPLE t1 p2 const PRIMARY PRIMARY 8 const,const 1
3389EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
3390id select_type table partitions type possible_keys key key_len ref rows Extra
33911 SIMPLE t1 p2 range PRIMARY PRIMARY 8 NULL 1 Using where
3392EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
3393id select_type table partitions type possible_keys key key_len ref rows Extra
33941 SIMPLE t1 p2 range PRIMARY PRIMARY 8 NULL 1 Using where
3395EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
3396id select_type table partitions type possible_keys key key_len ref rows Extra
33971 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3398EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
3399id select_type table partitions type possible_keys key key_len ref rows Extra
34001 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3401EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
3402id select_type table partitions type possible_keys key key_len ref rows Extra
34031 SIMPLE t1 p2 const PRIMARY PRIMARY 8 const,const 1
3404EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
3405id select_type table partitions type possible_keys key key_len ref rows Extra
34061 SIMPLE t1 p2 range PRIMARY PRIMARY 8 NULL 1 Using where
3407EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
3408id select_type table partitions type possible_keys key key_len ref rows Extra
34091 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
3410DROP TABLE t1;
32973411
=== modified file 'mysql-test/r/percona_bug1289599.result'
--- mysql-test/r/percona_bug1289599.result 2014-03-13 18:25:59 +0000
+++ mysql-test/r/percona_bug1289599.result 2014-08-22 10:00:31 +0000
@@ -1,8 +1,8 @@
1update mysql.user set plugin='auth_socket';1update mysql.user set plugin='auth_socket';
2flush privileges;2flush privileges;
3connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);3connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
4ERROR HY000: Plugin 'auth_socket' is not loaded4ERROR 28000: Access denied for user 'USER'@'localhost' (using password: NO)
5ERROR HY000: Plugin 'auth_socket' is not loaded5ERROR 28000: Access denied for user 'USER'@'localhost' (using password: NO)
6install plugin auth_socket soname 'auth_socket.so';6install plugin auth_socket soname 'auth_socket.so';
7connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);7connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
8Got one of the listed errors8Got one of the listed errors
99
=== modified file 'mysql-test/r/plugin.result'
--- mysql-test/r/plugin.result 2013-05-19 18:08:06 +0000
+++ mysql-test/r/plugin.result 2014-08-22 10:00:31 +0000
@@ -143,3 +143,73 @@
143@@SESSION.example_double_thdvar143@@SESSION.example_double_thdvar
1441000.5000001441000.500000
145UNINSTALL PLUGIN example;145UNINSTALL PLUGIN example;
146#
147# BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
148#
149CREATE PROCEDURE p_install()
150BEGIN
151INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
152END
153|
154CREATE PROCEDURE p_show_vars()
155BEGIN
156SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
157END|
158connect con1, localhost, root,,;
159# Case 18008907_1: Deadlock situation cause by
160# con1: has LOCK_system_variables_hash and waits on LOCK_plugin AND
161# default: has LOCK_plugin and waits on LOCK_system_variables_hash.
162#
163SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
164call p_show_vars();;
165connection default;
166SET DEBUG_SYNC='now WAIT_FOR install_plugin';
167SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
168call p_install();;
169connection con1;
170COUNT(*)
171#
172SET DEBUG_SYNC='RESET';
173connection default;
174ERROR HY000: Can't open shared library
175SET DEBUG_SYNC='RESET';
176# Case 18008907_2: Deadlock situation caused by
177# default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
178# con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
179# con2: has LOCK_global_system_variables and waits on LOCK_plugin.
180SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
181call p_show_vars();;
182connection con1;
183SET DEBUG_SYNC='now WAIT_FOR install_plugin';
184SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
185call p_install();;
186connect con2, localhost, root,,;
187SET DEBUG_SYNC='now WAIT_FOR create_connection';
188connection con1;
189ERROR HY000: Can't open shared library
190connection default;
191COUNT(*)
192#
193Warnings:
194# 1639 debug sync point wait timed out
195disconnect con2;
196# Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
197INSTALL PLUGIN example SONAME 'ha_example.so';
198connection con1;
199SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
200call p_show_vars();;
201connect con2, localhost, root,,;
202SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
203UNINSTALL PLUGIN example;;
204connection default;
205SET DEBUG_SYNC='now SIGNAL go';
206connection con1;
207COUNT(*)
208#
209connection con2;
210connection default;
211DROP PROCEDURE p_show_vars;
212DROP PROCEDURE p_install;
213SET DEBUG_SYNC='RESET';
214disconnect con1;
215disconnect con2;
146216
=== modified file 'mysql-test/r/plugin_auth_qa_3.result'
--- mysql-test/r/plugin_auth_qa_3.result 2010-10-22 08:20:17 +0000
+++ mysql-test/r/plugin_auth_qa_3.result 2014-08-22 10:00:31 +0000
@@ -6,6 +6,6 @@
6current_user() user() @@local.proxy_user @@local.external_user6current_user() user() @@local.proxy_user @@local.external_user
7qa_test_11_dest@% qa_test_11_user@localhost 'qa_test_11_user'@'%' 'qa_test_11_user'@'%'7qa_test_11_dest@% qa_test_11_user@localhost 'qa_test_11_user'@'%' 'qa_test_11_user'@'%'
8exec MYSQL PLUGIN_AUTH_OPT --default_auth=qa_auth_client -h localhost -P MASTER_MYPORT -u qa_test_2_user --password=qa_test_11_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&18exec MYSQL PLUGIN_AUTH_OPT --default_auth=qa_auth_client -h localhost -P MASTER_MYPORT -u qa_test_2_user --password=qa_test_11_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
9ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: NO)9ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: YES)
10DROP USER qa_test_11_user, qa_test_11_dest;10DROP USER qa_test_11_user, qa_test_11_dest;
11DROP DATABASE test_user_db;11DROP DATABASE test_user_db;
1212
=== added file 'mysql-test/r/show_processlist.result'
--- mysql-test/r/show_processlist.result 1970-01-01 00:00:00 +0000
+++ mysql-test/r/show_processlist.result 2014-08-22 10:00:31 +0000
@@ -0,0 +1,47 @@
1Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
2SHOW BINLOGS
3connect connection1,localhost,root,,test,$MASTER_MYPORT,;
4connection default;
5SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
6SHOW PROCESSLIST;
7connection connection1;
8"Wait_for parked1"
9SET DEBUG_SYNC='now WAIT_FOR parked1';
10connect connection2,localhost,root,,test,$MASTER_MYPORT,;
11connect connection3,localhost,root,,test,$MASTER_MYPORT,;
12SET DEBUG_SYNC='now SIGNAL go';
13connection default;
14Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
15<Id> root <Host> test <Command> <Time> <State> <Info> X X X
16<Id> root <Host> test <Command> <Time> <State> <Info> X X X
17<Id> root <Host> test <Command> <Time> <State> <Info> X X X
18<Id> root <Host> test <Command> <Time> <State> <Info> X X X
19SET DEBUG_SYNC='after_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
20SHOW PROCESSLIST;
21connection connection1;
22"Wait_for parked1"
23SET DEBUG_SYNC='now WAIT_FOR parked1';
24connect connection4,localhost,root,,test,$MASTER_MYPORT,;
25connect connection5,localhost,root,,test,$MASTER_MYPORT,;
26SET DEBUG_SYNC='now SIGNAL go';
27connection default;
28Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
29<Id> root <Host> test <Command> <Time> <State> <Info> X X X
30<Id> root <Host> test <Command> <Time> <State> <Info> X X X
31<Id> root <Host> test <Command> <Time> <State> <Info> X X X
32<Id> root <Host> test <Command> <Time> <State> <Info> X X X
33SHOW PROCESSLIST;
34Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
35<Id> root <Host> test <Command> <Time> <State> <Info> X X X
36<Id> root <Host> test <Command> <Time> <State> <Info> X X X
37<Id> root <Host> test <Command> <Time> <State> <Info> X X X
38<Id> root <Host> test <Command> <Time> <State> <Info> X X X
39<Id> root <Host> test <Command> <Time> <State> <Info> X X X
40<Id> root <Host> test <Command> <Time> <State> <Info> X X X
41"Cleanup"
42SET DEBUG_SYNC='RESET';
43disconnect connection1;
44disconnect connection2;
45disconnect connection3;
46disconnect connection4;
47disconnect connection5;
048
=== modified file 'mysql-test/r/union.result'
--- mysql-test/r/union.result 2011-07-11 09:27:52 +0000
+++ mysql-test/r/union.result 2014-08-22 10:00:31 +0000
@@ -1826,3 +1826,37 @@
1826SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;1826SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
1827dev1827dev
1828118281
1829#
1830# Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
1831#
1832SET @old_slow_query_log= @@global.slow_query_log;
1833SET @old_log_output= @@global.log_output;
1834SET @old_long_query_time= @@long_query_time;
1835SET GLOBAL log_output= "TABLE";
1836SET GLOBAL slow_query_log= ON;
1837SET SESSION long_query_time= 0;
1838CREATE TABLE t17059925 (a INT);
1839CREATE TABLE t2 (b INT);
1840CREATE TABLE t3 (c INT);
1841INSERT INTO t17059925 VALUES (1), (2), (3);
1842INSERT INTO t2 VALUES (4), (5), (6);
1843INSERT INTO t3 VALUES (7), (8), (9);
1844TRUNCATE table mysql.slow_log;
1845SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
1846a
18471
18482
18493
18504
18515
18526
18537
18548
18559
1856SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
1857sql_text rows_examined
1858SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3 18
1859DROP TABLE t17059925, t2, t3;
1860SET @@long_query_time= @old_long_query_time;
1861SET @@global.log_output= @old_log_output;
1862SET @@global.slow_query_log= @old_slow_query_log;
18291863
=== modified file 'mysql-test/r/variables.result'
--- mysql-test/r/variables.result 2013-06-27 15:35:20 +0000
+++ mysql-test/r/variables.result 2014-08-22 10:00:31 +0000
@@ -188,6 +188,8 @@
188@@concurrent_insert188@@concurrent_insert
189AUTO189AUTO
190set global timed_mutexes=ON;190set global timed_mutexes=ON;
191Warnings:
192Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
191show variables like 'timed_mutexes';193show variables like 'timed_mutexes';
192Variable_name Value194Variable_name Value
193timed_mutexes ON195timed_mutexes ON
@@ -195,6 +197,8 @@
195VARIABLE_NAME VARIABLE_VALUE197VARIABLE_NAME VARIABLE_VALUE
196TIMED_MUTEXES ON198TIMED_MUTEXES ON
197set global timed_mutexes=0;199set global timed_mutexes=0;
200Warnings:
201Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
198show variables like 'timed_mutexes';202show variables like 'timed_mutexes';
199Variable_name Value203Variable_name Value
200timed_mutexes OFF204timed_mutexes OFF
201205
=== modified file 'mysql-test/r/view.result'
--- mysql-test/r/view.result 2012-03-14 00:57:03 +0000
+++ mysql-test/r/view.result 2014-08-22 10:00:31 +0000
@@ -4109,3 +4109,40 @@
4109DROP DATABASE IF EXISTS nodb;4109DROP DATABASE IF EXISTS nodb;
4110CREATE VIEW nodb.a AS SELECT 1;4110CREATE VIEW nodb.a AS SELECT 1;
4111ERROR 42000: Unknown database 'nodb'4111ERROR 42000: Unknown database 'nodb'
4112#
4113# BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
4114# BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
4115#
4116CREATE VIEW v1 AS (SELECT '' FROM DUAL);
4117CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
4118(SELECT '' FROM DUAL);
4119CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
4120(SELECT '' FROM DUAL) UNION ALL
4121(SELECT '' FROM DUAL);
4122CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
4123(SELECT '' AS col2 FROM DUAL) UNION ALL
4124(SELECT '' FROM DUAL);
4125# Name for the column in select1 is set properly with or
4126# without this fix.
4127SHOW CREATE VIEW v1;
4128View Create View character_set_client collation_connection
4129v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select '' AS `Name_exp_1`) latin1 latin1_swedish_ci
4130# Name for the column in select2 is set with this fix.
4131# Without this fix, name would not have set for the
4132# columns in select2.
4133SHOW CREATE VIEW v2;
4134View Create View character_set_client collation_connection
4135v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`) latin1 latin1_swedish_ci
4136# Name for the field item in select2 & select3 is set with this fix.
4137# Without this fix, name would not have set for the
4138# columns in select2 & select3.
4139SHOW CREATE VIEW v3;
4140View Create View character_set_client collation_connection
4141v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`) union all (select '' AS `Name_exp_3`) latin1 latin1_swedish_ci
4142# Name for the field item in select3 is set with this fix.
4143# Without this fix, name would not have set for the
4144# columns in select3.
4145SHOW CREATE VIEW v4;
4146View Create View character_set_client collation_connection
4147v4 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `col2`) union all (select '' AS `Name_exp_3`) latin1 latin1_swedish_ci
4148DROP VIEW v1, v2, v3, v4;
41124149
=== modified file 'mysql-test/suite/binlog/t/binlog_killed.test'
--- mysql-test/suite/binlog/t/binlog_killed.test 2010-05-31 09:18:27 +0000
+++ mysql-test/suite/binlog/t/binlog_killed.test 2014-08-22 10:00:31 +0000
@@ -340,6 +340,14 @@
340# common cleanup 340# common cleanup
341#341#
342342
343connection con1;
344disconnect con1;
345--source include/wait_until_disconnected.inc
346connection con2;
347disconnect con2;
348--source include/wait_until_disconnected.inc
349connection default;
350
343drop table t1,t2,t3;351drop table t1,t2,t3;
344352
345--echo end of the tests353--echo end of the tests
346354
=== added file 'mysql-test/suite/innodb/r/bug71585.result'
--- mysql-test/suite/innodb/r/bug71585.result 1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/bug71585.result 2014-08-22 10:00:31 +0000
@@ -0,0 +1,9 @@
1CREATE