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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-06-03 13:14:25 +0000
3+++ CMakeLists.txt 2014-08-22 10:00:31 +0000
4@@ -25,6 +25,14 @@
5 CMAKE_POLICY(SET CMP0022 OLD)
6 ENDIF()
7
8+# We use the LOCATION target property (CMP0026)
9+# and get_target_property() for non-existent targets (CMP0045)
10+IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
11+ CMAKE_VERSION VERSION_GREATER "3.0.0")
12+ CMAKE_POLICY(SET CMP0026 OLD)
13+ CMAKE_POLICY(SET CMP0045 OLD)
14+ENDIF()
15+
16 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
17
18 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
19@@ -434,7 +442,6 @@
20 IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
21 ADD_SUBDIRECTORY(internal)
22 ENDIF()
23- ADD_SUBDIRECTORY(packaging/rpm-uln)
24 ADD_SUBDIRECTORY(packaging/rpm-oel)
25 ENDIF()
26
27
28=== modified file 'VERSION'
29--- VERSION 2014-06-11 13:42:04 +0000
30+++ VERSION 2014-08-22 10:00:31 +0000
31@@ -1,4 +1,4 @@
32 MYSQL_VERSION_MAJOR=5
33 MYSQL_VERSION_MINOR=5
34-MYSQL_VERSION_PATCH=38
35-MYSQL_VERSION_EXTRA=-35.2
36+MYSQL_VERSION_PATCH=39
37+MYSQL_VERSION_EXTRA=-36.0
38
39=== modified file 'client/mysqladmin.cc'
40--- client/mysqladmin.cc 2013-03-19 14:53:48 +0000
41+++ client/mysqladmin.cc 2014-08-22 10:00:31 +0000
42@@ -1,5 +1,5 @@
43 /*
44- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
45+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
46
47 This program is free software; you can redistribute it and/or modify
48 it under the terms of the GNU General Public License as published by
49@@ -71,6 +71,7 @@
50 char *argument);
51 static my_bool sql_connect(MYSQL *mysql, uint wait);
52 static int execute_commands(MYSQL *mysql,int argc, char **argv);
53+static char **mask_password(int argc, char ***argv);
54 static int drop_db(MYSQL *mysql,const char *db);
55 extern "C" sig_handler endprog(int signal_number);
56 static void nice_time(ulong sec,char *buff);
57@@ -304,9 +305,9 @@
58
59 int main(int argc,char *argv[])
60 {
61- int error= 0, ho_error;
62+ int error= 0, ho_error, temp_argc;
63 MYSQL mysql;
64- char **commands, **save_argv;
65+ char **commands, **save_argv, **temp_argv;
66
67 MY_INIT(argv[0]);
68 mysql_init(&mysql);
69@@ -318,6 +319,9 @@
70 free_defaults(save_argv);
71 exit(ho_error);
72 }
73+ temp_argv= mask_password(argc, &argv);
74+ temp_argc= argc;
75+
76 if (debug_info_flag)
77 my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
78 if (debug_check_flag)
79@@ -328,7 +332,7 @@
80 usage();
81 exit(1);
82 }
83- commands = argv;
84+ commands = temp_argv;
85 if (tty_password)
86 opt_password = get_tty_password(NullS);
87
88@@ -476,6 +480,13 @@
89 my_free(shared_memory_base_name);
90 #endif
91 free_defaults(save_argv);
92+ temp_argc--;
93+ while(temp_argc >= 0)
94+ {
95+ my_free(temp_argv[temp_argc]);
96+ temp_argc--;
97+ }
98+ my_free(temp_argv);
99 my_end(my_end_arg);
100 exit(error ? 1 : 0);
101 return 0;
102@@ -1089,6 +1100,47 @@
103 return 0;
104 }
105
106+/**
107+ @brief Masking the password if it is passed as command line argument.
108+
109+ @details It works in Linux and changes cmdline in ps and /proc/pid/cmdline,
110+ but it won't work for history file of shell.
111+ The command line arguments are copied to another array and the
112+ password in the argv is masked. This function is called just after
113+ "handle_options" because in "handle_options", the agrv pointers
114+ are altered which makes freeing of dynamically allocated memory
115+ difficult. The password masking is done before all other operations
116+ in order to minimise the time frame of password visibility via cmdline.
117+
118+ @param argc command line options (count)
119+ @param argv command line options (values)
120+
121+ @return temp_argv copy of argv
122+*/
123+
124+static char **mask_password(int argc, char ***argv)
125+{
126+ char **temp_argv;
127+ temp_argv= (char **)(my_malloc(sizeof(char *) * argc, MYF(MY_WME)));
128+ argc--;
129+ while (argc > 0)
130+ {
131+ temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
132+ if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD ||
133+ find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_OLD_PASSWORD)
134+ {
135+ char *start= (*argv)[argc];
136+ while (*start)
137+ *start++= 'x';
138+ start= (*argv)[argc];
139+ if (*start)
140+ start[1]= 0; /* Cut length of argument */
141+ }
142+ argc--;
143+ }
144+ temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
145+ return(temp_argv);
146+}
147
148 static void print_version(void)
149 {
150
151=== modified file 'client/mysqldump.c'
152--- client/mysqldump.c 2013-12-16 08:19:34 +0000
153+++ client/mysqldump.c 2014-08-22 10:00:31 +0000
154@@ -5991,19 +5991,36 @@
155 dump_all_tablespaces();
156 dump_all_databases();
157 }
158- else if (argc > 1 && !opt_databases)
159- {
160- /* Only one database and selected table(s) */
161- if (!opt_alltspcs && !opt_notspcs)
162- dump_tablespaces_for_tables(*argv, (argv + 1), (argc -1));
163- dump_selected_tables(*argv, (argv + 1), (argc - 1));
164- }
165 else
166 {
167- /* One or more databases, all tables */
168- if (!opt_alltspcs && !opt_notspcs)
169- dump_tablespaces_for_databases(argv);
170- dump_databases(argv);
171+ // Check all arguments meet length condition. Currently database and table
172+ // names are limited to NAME_LEN bytes and stack-based buffers assumes
173+ // that escaped name will be not longer than NAME_LEN*2 + 2 bytes long.
174+ int argument;
175+ for (argument= 0; argument < argc; argument++)
176+ {
177+ size_t argument_length= strlen(argv[argument]);
178+ if (argument_length > NAME_LEN)
179+ {
180+ die(EX_CONSCHECK, "[ERROR] Argument '%s' is too long, it cannot be "
181+ "name for any table or database.\n", argv[argument]);
182+ }
183+ }
184+
185+ if (argc > 1 && !opt_databases)
186+ {
187+ /* Only one database and selected table(s) */
188+ if (!opt_alltspcs && !opt_notspcs)
189+ dump_tablespaces_for_tables(*argv, (argv + 1), (argc - 1));
190+ dump_selected_tables(*argv, (argv + 1), (argc - 1));
191+ }
192+ else
193+ {
194+ /* One or more databases, all tables */
195+ if (!opt_alltspcs && !opt_notspcs)
196+ dump_tablespaces_for_databases(argv);
197+ dump_databases(argv);
198+ }
199 }
200
201 /* if --dump-slave , start the slave sql thread */
202
203=== modified file 'cmake/dtrace.cmake'
204--- cmake/dtrace.cmake 2013-08-02 09:40:55 +0000
205+++ cmake/dtrace.cmake 2014-08-22 10:00:31 +0000
206@@ -1,4 +1,4 @@
207-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
208+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
209 #
210 # This program is free software; you can redistribute it and/or modify
211 # it under the terms of the GNU General Public License as published by
212@@ -75,13 +75,6 @@
213 ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h
214 ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h
215 )
216- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
217- # Systemtap object
218- EXECUTE_PROCESS(
219- COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
220- -o ${CMAKE_BINARY_DIR}/probes_mysql.o
221- )
222- ENDIF()
223 ADD_CUSTOM_TARGET(gen_dtrace_header
224 DEPENDS
225 ${CMAKE_BINARY_DIR}/include/probes_mysql.d
226@@ -100,12 +93,7 @@
227 IF(ENABLE_DTRACE)
228 ADD_DEPENDENCIES(${target} gen_dtrace_header)
229
230- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
231- TARGET_LINK_LIBRARIES(${target} ${CMAKE_BINARY_DIR}/probes_mysql.o)
232- ENDIF()
233-
234- # On Solaris, invoke dtrace -G to generate object file and
235- # link it together with target.
236+ # Invoke dtrace to generate object file and link it together with target.
237 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
238 SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
239 SET(outfile ${objdir}/${target}_dtrace.o)
240@@ -122,6 +110,21 @@
241 -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
242 WORKING_DIRECTORY ${objdir}
243 )
244+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
245+ # dtrace on Linux runs gcc and uses flags from environment
246+ SET(CFLAGS_SAVED $ENV{CFLAGS})
247+ SET(ENV{CFLAGS} ${CMAKE_C_FLAGS})
248+ SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
249+ # Systemtap object
250+ EXECUTE_PROCESS(
251+ COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
252+ -o ${outfile}
253+ )
254+ SET(ENV{CFLAGS} ${CFLAGS_SAVED})
255+ ENDIF()
256+
257+ # Do not try to extend the library if we have not built the .o file
258+ IF(outfile)
259 # Add full object path to linker flags
260 GET_TARGET_PROPERTY(target_type ${target} TYPE)
261 IF(NOT target_type MATCHES "STATIC")
262@@ -133,12 +136,12 @@
263 # but maybe one day this will be fixed.
264 GET_TARGET_PROPERTY(target_location ${target} LOCATION)
265 ADD_CUSTOM_COMMAND(
266- TARGET ${target} POST_BUILD
267- COMMAND ${CMAKE_AR} r ${target_location} ${outfile}
268- COMMAND ${CMAKE_RANLIB} ${target_location}
269- )
270- # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
271- SET(TARGET_OBJECT_DIRECTORY_${target} ${objdir} CACHE INTERNAL "")
272+ TARGET ${target} POST_BUILD
273+ COMMAND ${CMAKE_AR} r ${target_location} ${outfile}
274+ COMMAND ${CMAKE_RANLIB} ${target_location}
275+ )
276+ # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
277+ SET(TARGET_OBJECT_DIRECTORY_${target} ${objdir} CACHE INTERNAL "")
278 ENDIF()
279 ENDIF()
280 ENDIF()
281
282=== modified file 'cmake/install_macros.cmake'
283--- cmake/install_macros.cmake 2014-01-23 08:02:47 +0000
284+++ cmake/install_macros.cmake 2014-08-22 10:00:31 +0000
285@@ -21,26 +21,35 @@
286 GET_TARGET_PROPERTY(location ${target} LOCATION)
287 GET_TARGET_PROPERTY(type ${target} TYPE)
288 IF(NOT INSTALL_LOCATION)
289- IF(type MATCHES "STATIC_LIBRARY" OR type MATCHES "MODULE_LIBRARY" OR type MATCHES "SHARED_LIBRARY")
290+ IF(type MATCHES "STATIC_LIBRARY"
291+ OR type MATCHES "MODULE_LIBRARY"
292+ OR type MATCHES "SHARED_LIBRARY")
293 SET(INSTALL_LOCATION "lib")
294 ELSEIF(type MATCHES "EXECUTABLE")
295 SET(INSTALL_LOCATION "bin")
296 ELSE()
297- MESSAGE(FATAL_ERROR "cannot determine type of ${target}. Don't now where to install")
298+ MESSAGE(FATAL_ERROR
299+ "cannot determine type of ${target}. Don't now where to install")
300 ENDIF()
301 ENDIF()
302 STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
303 STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
304 STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
305 IF(CMAKE_GENERATOR MATCHES "Visual Studio")
306- STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})
307+ STRING(REPLACE
308+ "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
309+ pdb_location ${pdb_location})
310 ENDIF()
311 IF(target STREQUAL "mysqld")
312 SET(comp Server)
313 ELSE()
314 SET(comp Debuginfo)
315 ENDIF()
316- INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
317+ # No .pdb file for static libraries.
318+ IF(NOT type MATCHES "STATIC_LIBRARY")
319+ INSTALL(FILES ${pdb_location}
320+ DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
321+ ENDIF()
322 ENDFOREACH()
323 ENDIF()
324 ENDMACRO()
325
326=== modified file 'cmake/os/Windows.cmake'
327--- cmake/os/Windows.cmake 2011-06-30 15:46:53 +0000
328+++ cmake/os/Windows.cmake 2014-08-22 10:00:31 +0000
329@@ -1,4 +1,4 @@
330-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
331+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
332 #
333 # This program is free software; you can redistribute it and/or modify
334 # it under the terms of the GNU General Public License as published by
335@@ -62,22 +62,30 @@
336 ENDIF()
337
338 IF(MSVC)
339- # Enable debug info also in Release build, and create PDB to be able to analyze
340- # crashes
341+ # Enable debug info also in Release build,
342+ # and create PDB to be able to analyze crashes.
343+ FOREACH(type EXE SHARED MODULE)
344+ SET(CMAKE_{type}_LINKER_FLAGS_RELEASE
345+ "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
346+ ENDFOREACH()
347+
348+ # Force static runtime libraries
349+ # - Choose debugging information:
350+ # /Z7
351+ # Produces an .obj file containing full symbolic debugging
352+ # information for use with the debugger. The symbolic debugging
353+ # information includes the names and types of variables, as well as
354+ # functions and line numbers. No .pdb file is produced by the compiler.
355 FOREACH(lang C CXX)
356- SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Zi")
357- ENDFOREACH()
358- FOREACH(type EXE SHARED MODULE)
359- SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
360- ENDFOREACH()
361-
362- # Force static runtime libraries
363+ SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
364+ ENDFOREACH()
365 FOREACH(flag
366- CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
367- CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
368+ CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
369+ CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
370 CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
371- CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
372+ CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
373 STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
374+ STRING(REPLACE "/Zi" "/Z7" "${flag}" "${${flag}}")
375 ENDFOREACH()
376
377 # Remove support for exceptions
378@@ -107,7 +115,6 @@
379 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")
380 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")
381
382-
383 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
384 # _WIN64 is defined by the compiler itself.
385 # Yet, we define it here again to work around a bug with Intellisense
386
387=== modified file 'extra/yassl/CMakeLists.txt'
388--- extra/yassl/CMakeLists.txt 2014-01-06 05:22:35 +0000
389+++ extra/yassl/CMakeLists.txt 2014-08-22 10:00:31 +0000
390@@ -1,4 +1,4 @@
391-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
392+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
393 #
394 # This program is free software; you can redistribute it and/or modify
395 # it under the terms of the GNU General Public License as published by
396@@ -37,7 +37,6 @@
397 ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
398 RESTRICT_SYMBOL_EXPORTS(yassl)
399
400-INSTALL_DEBUG_SYMBOLS(yassl)
401 IF(MSVC)
402 INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
403 ENDIF()
404
405=== modified file 'extra/yassl/src/ssl.cpp'
406--- extra/yassl/src/ssl.cpp 2013-02-26 05:35:17 +0000
407+++ extra/yassl/src/ssl.cpp 2014-08-22 10:00:31 +0000
408@@ -1,5 +1,5 @@
409 /*
410- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
411+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
412
413 This program is free software; you can redistribute it and/or modify
414 it under the terms of the GNU General Public License as published by
415@@ -790,7 +790,10 @@
416 strncpy(name, path, MAX_PATH - 1 - HALF_PATH);
417 strncat(name, "/", 1);
418 strncat(name, entry->d_name, HALF_PATH);
419- if (stat(name, &buf) < 0) return SSL_BAD_STAT;
420+ if (stat(name, &buf) < 0) {
421+ closedir(dir);
422+ return SSL_BAD_STAT;
423+ }
424
425 if (S_ISREG(buf.st_mode))
426 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
427
428=== modified file 'extra/yassl/taocrypt/CMakeLists.txt'
429--- extra/yassl/taocrypt/CMakeLists.txt 2014-01-06 05:22:35 +0000
430+++ extra/yassl/taocrypt/CMakeLists.txt 2014-08-22 10:00:31 +0000
431@@ -1,4 +1,4 @@
432-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
433+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
434 #
435 # This program is free software; you can redistribute it and/or modify
436 # it under the terms of the GNU General Public License as published by
437@@ -36,7 +36,6 @@
438 ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
439 RESTRICT_SYMBOL_EXPORTS(taocrypt)
440
441-INSTALL_DEBUG_SYMBOLS(taocrypt)
442 IF(MSVC)
443 INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
444 ENDIF()
445
446=== modified file 'extra/yassl/taocrypt/include/asn.hpp'
447--- extra/yassl/taocrypt/include/asn.hpp 2013-02-26 05:35:17 +0000
448+++ extra/yassl/taocrypt/include/asn.hpp 2014-08-22 10:00:31 +0000
449@@ -1,5 +1,5 @@
450 /*
451- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
452+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
453
454 This program is free software; you can redistribute it and/or modify
455 it under the terms of the GNU General Public License as published by
456@@ -294,9 +294,9 @@
457 byte* signature_;
458 char issuer_[ASN_NAME_MAX]; // Names
459 char subject_[ASN_NAME_MAX]; // Names
460- char beforeDate_[MAX_DATE_SZ]; // valid before date
461- char afterDate_[MAX_DATE_SZ]; // valid after date
462- bool verify_; // Default to yes, but could be off
463+ char beforeDate_[MAX_DATE_SZ+1]; // valid before date, +null term
464+ char afterDate_[MAX_DATE_SZ+1]; // valid after date, +null term
465+ bool verify_; // Default to yes, but could be off
466
467 void ReadHeader();
468 void Decode(SignerList*, CertType);
469
470=== modified file 'include/mysql/thread_pool_priv.h'
471--- include/mysql/thread_pool_priv.h 2013-02-26 05:35:17 +0000
472+++ include/mysql/thread_pool_priv.h 2014-08-22 10:00:31 +0000
473@@ -1,5 +1,5 @@
474 /*
475- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
476+ Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
477
478 This program is free software; you can redistribute it and/or modify
479 it under the terms of the GNU General Public License as published by
480@@ -49,6 +49,8 @@
481 void thd_set_thread_stack(THD *thd, char *stack_start);
482 void thd_lock_thread_count(THD *thd);
483 void thd_unlock_thread_count(THD *thd);
484+void thd_lock_thread_remove(THD *thd);
485+void thd_unlock_thread_remove(THD *thd);
486 void thd_close_connection(THD *thd);
487 THD *thd_get_current_thd();
488 void thd_new_connection_setup(THD *thd, char *stack_start);
489
490=== modified file 'libmysql/CMakeLists.txt'
491--- libmysql/CMakeLists.txt 2014-03-27 15:42:21 +0000
492+++ libmysql/CMakeLists.txt 2014-08-22 10:00:31 +0000
493@@ -168,7 +168,6 @@
494 MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
495
496 # Visual Studio users need debug static library for debug projects
497-INSTALL_DEBUG_SYMBOLS(clientlib)
498 IF(MSVC)
499 INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
500 INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
501
502=== modified file 'libmysql/authentication_win/CMakeLists.txt'
503--- libmysql/authentication_win/CMakeLists.txt 2014-01-06 05:22:35 +0000
504+++ libmysql/authentication_win/CMakeLists.txt 2014-08-22 10:00:31 +0000
505@@ -1,4 +1,4 @@
506-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
507+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
508 #
509 # This program is free software; you can redistribute it and/or modify
510 # it under the terms of the GNU General Public License as published by
511@@ -32,7 +32,6 @@
512
513 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
514
515-INSTALL_DEBUG_SYMBOLS(auth_win_client)
516 IF(MSVC)
517 INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
518 ENDIF()
519
520=== modified file 'man/comp_err.1'
521--- man/comp_err.1 2014-06-03 13:14:25 +0000
522+++ man/comp_err.1 2014-08-22 10:00:31 +0000
523@@ -2,12 +2,12 @@
524 .\" Title: \fBcomp_err\fR
525 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
526 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
527-.\" Date: 05/11/2014
528+.\" Date: 07/18/2014
529 .\" Manual: MySQL Database System
530 .\" Source: MySQL 5.5
531 .\" Language: English
532 .\"
533-.TH "\FBCOMP_ERR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
534+.TH "\FBCOMP_ERR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
535 .\" -----------------------------------------------------------------
536 .\" * Define some portability stuff
537 .\" -----------------------------------------------------------------
538
539=== modified file 'man/innochecksum.1'
540--- man/innochecksum.1 2014-06-03 13:14:25 +0000
541+++ man/innochecksum.1 2014-08-22 10:00:31 +0000
542@@ -2,12 +2,12 @@
543 .\" Title: \fBinnochecksum\fR
544 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
545 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
546-.\" Date: 05/11/2014
547+.\" Date: 07/18/2014
548 .\" Manual: MySQL Database System
549 .\" Source: MySQL 5.5
550 .\" Language: English
551 .\"
552-.TH "\FBINNOCHECKSUM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
553+.TH "\FBINNOCHECKSUM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
554 .\" -----------------------------------------------------------------
555 .\" * Define some portability stuff
556 .\" -----------------------------------------------------------------
557
558=== modified file 'man/msql2mysql.1'
559--- man/msql2mysql.1 2014-06-03 13:14:25 +0000
560+++ man/msql2mysql.1 2014-08-22 10:00:31 +0000
561@@ -2,12 +2,12 @@
562 .\" Title: \fBmsql2mysql\fR
563 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
564 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
565-.\" Date: 05/11/2014
566+.\" Date: 07/18/2014
567 .\" Manual: MySQL Database System
568 .\" Source: MySQL 5.5
569 .\" Language: English
570 .\"
571-.TH "\FBMSQL2MYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
572+.TH "\FBMSQL2MYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
573 .\" -----------------------------------------------------------------
574 .\" * Define some portability stuff
575 .\" -----------------------------------------------------------------
576
577=== modified file 'man/my_print_defaults.1'
578--- man/my_print_defaults.1 2014-06-03 13:14:25 +0000
579+++ man/my_print_defaults.1 2014-08-22 10:00:31 +0000
580@@ -2,12 +2,12 @@
581 .\" Title: \fBmy_print_defaults\fR
582 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
583 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
584-.\" Date: 05/11/2014
585+.\" Date: 07/18/2014
586 .\" Manual: MySQL Database System
587 .\" Source: MySQL 5.5
588 .\" Language: English
589 .\"
590-.TH "\FBMY_PRINT_DEFAULTS" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
591+.TH "\FBMY_PRINT_DEFAULTS" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
592 .\" -----------------------------------------------------------------
593 .\" * Define some portability stuff
594 .\" -----------------------------------------------------------------
595
596=== modified file 'man/myisam_ftdump.1'
597--- man/myisam_ftdump.1 2014-06-03 13:14:25 +0000
598+++ man/myisam_ftdump.1 2014-08-22 10:00:31 +0000
599@@ -2,12 +2,12 @@
600 .\" Title: \fBmyisam_ftdump\fR
601 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
602 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
603-.\" Date: 05/11/2014
604+.\" Date: 07/18/2014
605 .\" Manual: MySQL Database System
606 .\" Source: MySQL 5.5
607 .\" Language: English
608 .\"
609-.TH "\FBMYISAM_FTDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
610+.TH "\FBMYISAM_FTDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
611 .\" -----------------------------------------------------------------
612 .\" * Define some portability stuff
613 .\" -----------------------------------------------------------------
614
615=== modified file 'man/myisamchk.1'
616--- man/myisamchk.1 2014-06-03 13:14:25 +0000
617+++ man/myisamchk.1 2014-08-22 10:00:31 +0000
618@@ -2,12 +2,12 @@
619 .\" Title: \fBmyisamchk\fR
620 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
621 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
622-.\" Date: 05/11/2014
623+.\" Date: 07/18/2014
624 .\" Manual: MySQL Database System
625 .\" Source: MySQL 5.5
626 .\" Language: English
627 .\"
628-.TH "\FBMYISAMCHK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
629+.TH "\FBMYISAMCHK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
630 .\" -----------------------------------------------------------------
631 .\" * Define some portability stuff
632 .\" -----------------------------------------------------------------
633@@ -250,7 +250,7 @@
634 supports the following options, which can be specified on the command line or in the
635 [myisamchk]
636 group of an option file\&. For information about option files, see
637-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
638+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
639 .SH "MYISAMCHK GENERAL OPTIONS"
640 .\" options: myisamchk
641 .\" myisamchk: options
642
643=== modified file 'man/myisamlog.1'
644--- man/myisamlog.1 2014-06-03 13:14:25 +0000
645+++ man/myisamlog.1 2014-08-22 10:00:31 +0000
646@@ -2,12 +2,12 @@
647 .\" Title: \fBmyisamlog\fR
648 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
649 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
650-.\" Date: 05/11/2014
651+.\" Date: 07/18/2014
652 .\" Manual: MySQL Database System
653 .\" Source: MySQL 5.5
654 .\" Language: English
655 .\"
656-.TH "\FBMYISAMLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
657+.TH "\FBMYISAMLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
658 .\" -----------------------------------------------------------------
659 .\" * Define some portability stuff
660 .\" -----------------------------------------------------------------
661
662=== modified file 'man/myisampack.1'
663--- man/myisampack.1 2014-06-03 13:14:25 +0000
664+++ man/myisampack.1 2014-08-22 10:00:31 +0000
665@@ -2,12 +2,12 @@
666 .\" Title: \fBmyisampack\fR
667 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
668 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
669-.\" Date: 05/11/2014
670+.\" Date: 07/18/2014
671 .\" Manual: MySQL Database System
672 .\" Source: MySQL 5.5
673 .\" Language: English
674 .\"
675-.TH "\FBMYISAMPACK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
676+.TH "\FBMYISAMPACK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
677 .\" -----------------------------------------------------------------
678 .\" * Define some portability stuff
679 .\" -----------------------------------------------------------------
680@@ -122,7 +122,7 @@
681 .PP
682 \fBmyisampack\fR
683 supports the following options\&. It also reads option files and supports the options for processing them described at
684-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
685+Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
686 .sp
687 .RS 4
688 .ie n \{\
689
690=== modified file 'man/mysql-stress-test.pl.1'
691--- man/mysql-stress-test.pl.1 2014-06-03 13:14:25 +0000
692+++ man/mysql-stress-test.pl.1 2014-08-22 10:00:31 +0000
693@@ -2,12 +2,12 @@
694 .\" Title: \fBmysql-stress-test.pl\fR
695 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
696 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
697-.\" Date: 05/06/2014
698+.\" Date: 07/04/2014
699 .\" Manual: MySQL Database System
700 .\" Source: MySQL
701 .\" Language: English
702 .\"
703-.TH "\FBMYSQL\-STRESS\-TE" "1" "05/06/2014" "MySQL" "MySQL Database System"
704+.TH "\FBMYSQL\-STRESS\-TE" "1" "07/04/2014" "MySQL" "MySQL Database System"
705 .\" -----------------------------------------------------------------
706 .\" * Define some portability stuff
707 .\" -----------------------------------------------------------------
708
709=== modified file 'man/mysql-test-run.pl.1'
710--- man/mysql-test-run.pl.1 2014-06-03 13:14:25 +0000
711+++ man/mysql-test-run.pl.1 2014-08-22 10:00:31 +0000
712@@ -2,12 +2,12 @@
713 .\" Title: \fBmysql-test-run.pl\fR
714 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
715 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
716-.\" Date: 05/06/2014
717+.\" Date: 07/04/2014
718 .\" Manual: MySQL Database System
719 .\" Source: MySQL
720 .\" Language: English
721 .\"
722-.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/06/2014" "MySQL" "MySQL Database System"
723+.TH "\FBMYSQL\-TEST\-RUN\" "1" "07/04/2014" "MySQL" "MySQL Database System"
724 .\" -----------------------------------------------------------------
725 .\" * Define some portability stuff
726 .\" -----------------------------------------------------------------
727
728=== modified file 'man/mysql.1'
729--- man/mysql.1 2014-06-03 13:14:25 +0000
730+++ man/mysql.1 2014-08-22 10:00:31 +0000
731@@ -2,12 +2,12 @@
732 .\" Title: \fBmysql\fR
733 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
734 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
735-.\" Date: 05/11/2014
736+.\" Date: 07/18/2014
737 .\" Manual: MySQL Database System
738 .\" Source: MySQL 5.5
739 .\" Language: English
740 .\"
741-.TH "\FBMYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
742+.TH "\FBMYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
743 .\" -----------------------------------------------------------------
744 .\" * Define some portability stuff
745 .\" -----------------------------------------------------------------
746@@ -122,7 +122,7 @@
747 and
748 [client]
749 groups of an option file\&. For information about option files, see
750-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
751+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
752 .sp
753 .RS 4
754 .ie n \{\
755@@ -158,11 +158,32 @@
756 \fBmysql\fR
757 to start faster, but you must issue the
758 rehash
759-command if you want to use name completion\&.
760+command or its
761+\e#
762+shortcut if you want to use name completion\&.
763 .sp
764 To complete a name, enter the first part and press Tab\&. If the name is unambiguous,
765 \fBmysql\fR
766 completes 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\&.
767+.if n \{\
768+.sp
769+.\}
770+.RS 4
771+.it 1 an-trap
772+.nr an-no-space-flag 1
773+.nr an-break-flag 1
774+.br
775+.ps +1
776+\fBNote\fR
777+.ps -1
778+.br
779+This feature requires a MySQL client that is compiled with the
780+\fBreadline\fR
781+library\&. Typically, the
782+\fBreadline\fR
783+library is not available on Windows\&.
784+.sp .5v
785+.RE
786 .RE
787 .sp
788 .RS 4
789@@ -550,7 +571,7 @@
790 .sp
791 Execute the statement and quit\&. The default output format is like that produced with
792 \fB\-\-batch\fR\&. See
793-Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
794+Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
795 \fBmysql\fR
796 does not use the history file\&.
797 .RE
798@@ -718,7 +739,7 @@
799 \fB\-A\fR
800 .sp
801 This has the same effect as
802-\fB\-skip\-auto\-rehash\fR\&. See the description for
803+\fB\-\-skip\-auto\-rehash\fR\&. See the description for
804 \fB\-\-auto\-rehash\fR\&.
805 .RE
806 .sp
807@@ -1793,8 +1814,8 @@
808 \(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
809 \(lq;\(rq
810 as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
811-Section\ \&22.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
812-Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.
813+Section\ \&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
814+Section\ \&20.1, \(lqDefining Stored Programs\(rq)\&.
815 .RE
816 .sp
817 .RS 4
818@@ -1925,7 +1946,7 @@
819 nowarning,
820 \ew
821 .sp
822-Enable display of warnings after each statement\&.
823+Disable display of warnings after each statement\&.
824 .RE
825 .sp
826 .RS 4
827@@ -2606,7 +2627,7 @@
828 In this example, note that the backslashes are doubled\&. If you set the prompt using the
829 prompt
830 option 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
831-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
832+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
833 \es
834 is 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
835 HH:MM:SS>
836@@ -2918,7 +2939,7 @@
837 .RE
838 .\}
839 .PP
840-The search string can contain the the wildcard characters
841+The search string can contain the wildcard characters
842 \(lq%\(rq
843 and
844 \(lq_\(rq\&. These have the same meaning as for pattern\-matching operations performed with the
845@@ -3313,7 +3334,7 @@
846 option\&.
847 .PP
848 For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
849-Section\ \&22.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
850+Section\ \&23.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
851 .SH "COPYRIGHT"
852 .br
853 .PP
854
855=== modified file 'man/mysql.server.1'
856--- man/mysql.server.1 2014-06-03 13:14:25 +0000
857+++ man/mysql.server.1 2014-08-22 10:00:31 +0000
858@@ -2,12 +2,12 @@
859 .\" Title: \fBmysql.server\fR
860 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
861 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
862-.\" Date: 05/11/2014
863+.\" Date: 07/18/2014
864 .\" Manual: MySQL Database System
865 .\" Source: MySQL 5.5
866 .\" Language: English
867 .\"
868-.TH "\FBMYSQL\&.SERVER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
869+.TH "\FBMYSQL\&.SERVER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
870 .\" -----------------------------------------------------------------
871 .\" * Define some portability stuff
872 .\" -----------------------------------------------------------------
873
874=== modified file 'man/mysql_client_test.1'
875--- man/mysql_client_test.1 2014-06-03 13:14:25 +0000
876+++ man/mysql_client_test.1 2014-08-22 10:00:31 +0000
877@@ -2,12 +2,12 @@
878 .\" Title: \fBmysql_client_test\fR
879 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
880 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
881-.\" Date: 05/06/2014
882+.\" Date: 07/04/2014
883 .\" Manual: MySQL Database System
884 .\" Source: MySQL
885 .\" Language: English
886 .\"
887-.TH "\FBMYSQL_CLIENT_TEST" "1" "05/06/2014" "MySQL" "MySQL Database System"
888+.TH "\FBMYSQL_CLIENT_TEST" "1" "07/04/2014" "MySQL" "MySQL Database System"
889 .\" -----------------------------------------------------------------
890 .\" * Define some portability stuff
891 .\" -----------------------------------------------------------------
892
893=== modified file 'man/mysql_config.1'
894--- man/mysql_config.1 2014-06-03 13:14:25 +0000
895+++ man/mysql_config.1 2014-08-22 10:00:31 +0000
896@@ -2,12 +2,12 @@
897 .\" Title: \fBmysql_config\fR
898 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
899 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
900-.\" Date: 05/11/2014
901+.\" Date: 07/18/2014
902 .\" Manual: MySQL Database System
903 .\" Source: MySQL 5.5
904 .\" Language: English
905 .\"
906-.TH "\FBMYSQL_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
907+.TH "\FBMYSQL_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
908 .\" -----------------------------------------------------------------
909 .\" * Define some portability stuff
910 .\" -----------------------------------------------------------------
911
912=== modified file 'man/mysql_convert_table_format.1'
913--- man/mysql_convert_table_format.1 2014-06-03 13:14:25 +0000
914+++ man/mysql_convert_table_format.1 2014-08-22 10:00:31 +0000
915@@ -2,12 +2,12 @@
916 .\" Title: \fBmysql_convert_table_format\fR
917 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
918 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
919-.\" Date: 05/11/2014
920+.\" Date: 07/18/2014
921 .\" Manual: MySQL Database System
922 .\" Source: MySQL 5.5
923 .\" Language: English
924 .\"
925-.TH "\FBMYSQL_CONVERT_TAB" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
926+.TH "\FBMYSQL_CONVERT_TAB" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
927 .\" -----------------------------------------------------------------
928 .\" * Define some portability stuff
929 .\" -----------------------------------------------------------------
930
931=== modified file 'man/mysql_find_rows.1'
932--- man/mysql_find_rows.1 2014-06-03 13:14:25 +0000
933+++ man/mysql_find_rows.1 2014-08-22 10:00:31 +0000
934@@ -2,12 +2,12 @@
935 .\" Title: \fBmysql_find_rows\fR
936 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
937 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
938-.\" Date: 05/11/2014
939+.\" Date: 07/18/2014
940 .\" Manual: MySQL Database System
941 .\" Source: MySQL 5.5
942 .\" Language: English
943 .\"
944-.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
945+.TH "\FBMYSQL_FIND_ROWS\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
946 .\" -----------------------------------------------------------------
947 .\" * Define some portability stuff
948 .\" -----------------------------------------------------------------
949
950=== modified file 'man/mysql_fix_extensions.1'
951--- man/mysql_fix_extensions.1 2014-06-03 13:14:25 +0000
952+++ man/mysql_fix_extensions.1 2014-08-22 10:00:31 +0000
953@@ -2,12 +2,12 @@
954 .\" Title: \fBmysql_fix_extensions\fR
955 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
956 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
957-.\" Date: 05/11/2014
958+.\" Date: 07/18/2014
959 .\" Manual: MySQL Database System
960 .\" Source: MySQL 5.5
961 .\" Language: English
962 .\"
963-.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
964+.TH "\FBMYSQL_FIX_EXTENSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
965 .\" -----------------------------------------------------------------
966 .\" * Define some portability stuff
967 .\" -----------------------------------------------------------------
968
969=== modified file 'man/mysql_install_db.1'
970--- man/mysql_install_db.1 2014-06-03 13:14:25 +0000
971+++ man/mysql_install_db.1 2014-08-22 10:00:31 +0000
972@@ -2,12 +2,12 @@
973 .\" Title: \fBmysql_install_db\fR
974 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
975 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
976-.\" Date: 05/11/2014
977+.\" Date: 07/18/2014
978 .\" Manual: MySQL Database System
979 .\" Source: MySQL 5.5
980 .\" Language: English
981 .\"
982-.TH "\FBMYSQL_INSTALL_DB\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
983+.TH "\FBMYSQL_INSTALL_DB\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
984 .\" -----------------------------------------------------------------
985 .\" * Define some portability stuff
986 .\" -----------------------------------------------------------------
987@@ -121,7 +121,7 @@
988 [mysqld]
989 group\&.) Other options are passed to
990 \fBmysqld\fR\&. For information about option files, see
991-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
992+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
993 .sp
994 .RS 4
995 .ie n \{\
996
997=== modified file 'man/mysql_plugin.1'
998--- man/mysql_plugin.1 2014-06-03 13:14:25 +0000
999+++ man/mysql_plugin.1 2014-08-22 10:00:31 +0000
1000@@ -2,12 +2,12 @@
1001 .\" Title: \fBmysql_plugin\fR
1002 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1003 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1004-.\" Date: 05/11/2014
1005+.\" Date: 07/18/2014
1006 .\" Manual: MySQL Database System
1007 .\" Source: MySQL 5.5
1008 .\" Language: English
1009 .\"
1010-.TH "\FBMYSQL_PLUGIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1011+.TH "\FBMYSQL_PLUGIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1012 .\" -----------------------------------------------------------------
1013 .\" * Define some portability stuff
1014 .\" -----------------------------------------------------------------
1015@@ -164,7 +164,7 @@
1016 \fB\-\-datadir\fR, and
1017 \fB\-\-plugin\-dir\fR
1018 options and ignores others\&. For information about option files, see
1019-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1020+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1021 .sp
1022 .RS 4
1023 .ie n \{\
1024
1025=== modified file 'man/mysql_secure_installation.1'
1026--- man/mysql_secure_installation.1 2014-06-03 13:14:25 +0000
1027+++ man/mysql_secure_installation.1 2014-08-22 10:00:31 +0000
1028@@ -2,12 +2,12 @@
1029 .\" Title: \fBmysql_secure_installation\fR
1030 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1031 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1032-.\" Date: 05/11/2014
1033+.\" Date: 07/18/2014
1034 .\" Manual: MySQL Database System
1035 .\" Source: MySQL 5.5
1036 .\" Language: English
1037 .\"
1038-.TH "\FBMYSQL_SECURE_INST" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1039+.TH "\FBMYSQL_SECURE_INST" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1040 .\" -----------------------------------------------------------------
1041 .\" * Define some portability stuff
1042 .\" -----------------------------------------------------------------
1043
1044=== modified file 'man/mysql_setpermission.1'
1045--- man/mysql_setpermission.1 2014-06-03 13:14:25 +0000
1046+++ man/mysql_setpermission.1 2014-08-22 10:00:31 +0000
1047@@ -2,12 +2,12 @@
1048 .\" Title: \fBmysql_setpermission\fR
1049 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1050 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1051-.\" Date: 05/11/2014
1052+.\" Date: 07/18/2014
1053 .\" Manual: MySQL Database System
1054 .\" Source: MySQL 5.5
1055 .\" Language: English
1056 .\"
1057-.TH "\FBMYSQL_SETPERMISSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1058+.TH "\FBMYSQL_SETPERMISSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1059 .\" -----------------------------------------------------------------
1060 .\" * Define some portability stuff
1061 .\" -----------------------------------------------------------------
1062
1063=== modified file 'man/mysql_tzinfo_to_sql.1'
1064--- man/mysql_tzinfo_to_sql.1 2014-06-03 13:14:25 +0000
1065+++ man/mysql_tzinfo_to_sql.1 2014-08-22 10:00:31 +0000
1066@@ -2,12 +2,12 @@
1067 .\" Title: \fBmysql_tzinfo_to_sql\fR
1068 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1069 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1070-.\" Date: 05/11/2014
1071+.\" Date: 07/18/2014
1072 .\" Manual: MySQL Database System
1073 .\" Source: MySQL 5.5
1074 .\" Language: English
1075 .\"
1076-.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1077+.TH "\FBMYSQL_TZINFO_TO_S" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1078 .\" -----------------------------------------------------------------
1079 .\" * Define some portability stuff
1080 .\" -----------------------------------------------------------------
1081
1082=== modified file 'man/mysql_upgrade.1'
1083--- man/mysql_upgrade.1 2014-06-03 13:14:25 +0000
1084+++ man/mysql_upgrade.1 2014-08-22 10:00:31 +0000
1085@@ -2,12 +2,12 @@
1086 .\" Title: \fBmysql_upgrade\fR
1087 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1088 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1089-.\" Date: 05/11/2014
1090+.\" Date: 07/18/2014
1091 .\" Manual: MySQL Database System
1092 .\" Source: MySQL 5.5
1093 .\" Language: English
1094 .\"
1095-.TH "\FBMYSQL_UPGRADE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1096+.TH "\FBMYSQL_UPGRADE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1097 .\" -----------------------------------------------------------------
1098 .\" * Define some portability stuff
1099 .\" -----------------------------------------------------------------
1100@@ -115,9 +115,11 @@
1101 .RS 4
1102 .\}
1103 .nf
1104-mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-auto\-repair
1105-mysql < \fIfix_priv_tables\fR
1106-mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-fix\-db\-names \-\-fix\-table\-names
1107+mysqlcheck \-\-no\-defaults \-\-all\-databases
1108+ \-\-fix\-db\-names \-\-fix\-table\-names
1109+mysqlcheck \-\-no\-defaults \-\-check\-upgrade \-\-all\-databases
1110+ \-\-auto\-repair
1111+mysql < fix_priv_tables
1112 .fi
1113 .if n \{\
1114 .RE
1115@@ -133,6 +135,28 @@
1116 .sp -1
1117 .IP \(bu 2.3
1118 .\}
1119+\fBmysql_upgrade\fR
1120+also adds
1121+\fB\-\-write\-binlog\fR
1122+or
1123+\fB\-\-skip\-write\-binlog\fR
1124+to the
1125+\fBmysqlcheck\fR
1126+commands, depending on whether the
1127+\fB\-\-write\-binlog\fR
1128+option was specified on the
1129+\fBmysql_upgrade\fR
1130+command\&.
1131+.RE
1132+.sp
1133+.RS 4
1134+.ie n \{\
1135+\h'-04'\(bu\h'+03'\c
1136+.\}
1137+.el \{\
1138+.sp -1
1139+.IP \(bu 2.3
1140+.\}
1141 Because
1142 \fBmysql_upgrade\fR
1143 invokes
1144@@ -208,7 +232,7 @@
1145 \fBmysqlcheck\fR\&. For example, it might be necessary to specify the
1146 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
1147 option\&. For information about option files, see
1148-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1149+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1150 .sp
1151 .RS 4
1152 .ie n \{\
1153
1154=== modified file 'man/mysql_waitpid.1'
1155--- man/mysql_waitpid.1 2014-06-03 13:14:25 +0000
1156+++ man/mysql_waitpid.1 2014-08-22 10:00:31 +0000
1157@@ -2,12 +2,12 @@
1158 .\" Title: \fBmysql_waitpid\fR
1159 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1160 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1161-.\" Date: 05/11/2014
1162+.\" Date: 07/18/2014
1163 .\" Manual: MySQL Database System
1164 .\" Source: MySQL 5.5
1165 .\" Language: English
1166 .\"
1167-.TH "\FBMYSQL_WAITPID\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1168+.TH "\FBMYSQL_WAITPID\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1169 .\" -----------------------------------------------------------------
1170 .\" * Define some portability stuff
1171 .\" -----------------------------------------------------------------
1172
1173=== modified file 'man/mysql_zap.1'
1174--- man/mysql_zap.1 2014-06-03 13:14:25 +0000
1175+++ man/mysql_zap.1 2014-08-22 10:00:31 +0000
1176@@ -2,12 +2,12 @@
1177 .\" Title: \fBmysql_zap\fR
1178 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1179 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1180-.\" Date: 05/11/2014
1181+.\" Date: 07/18/2014
1182 .\" Manual: MySQL Database System
1183 .\" Source: MySQL 5.5
1184 .\" Language: English
1185 .\"
1186-.TH "\FBMYSQL_ZAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1187+.TH "\FBMYSQL_ZAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1188 .\" -----------------------------------------------------------------
1189 .\" * Define some portability stuff
1190 .\" -----------------------------------------------------------------
1191
1192=== modified file 'man/mysqlaccess.1'
1193--- man/mysqlaccess.1 2014-06-03 13:14:25 +0000
1194+++ man/mysqlaccess.1 2014-08-22 10:00:31 +0000
1195@@ -2,12 +2,12 @@
1196 .\" Title: \fBmysqlaccess\fR
1197 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1198 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1199-.\" Date: 05/11/2014
1200+.\" Date: 07/18/2014
1201 .\" Manual: MySQL Database System
1202 .\" Source: MySQL 5.5
1203 .\" Language: English
1204 .\"
1205-.TH "\FBMYSQLACCESS\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1206+.TH "\FBMYSQLACCESS\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1207 .\" -----------------------------------------------------------------
1208 .\" * Define some portability stuff
1209 .\" -----------------------------------------------------------------
1210
1211=== modified file 'man/mysqladmin.1'
1212--- man/mysqladmin.1 2014-06-03 13:14:25 +0000
1213+++ man/mysqladmin.1 2014-08-22 10:00:31 +0000
1214@@ -2,12 +2,12 @@
1215 .\" Title: \fBmysqladmin\fR
1216 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1217 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1218-.\" Date: 05/11/2014
1219+.\" Date: 07/18/2014
1220 .\" Manual: MySQL Database System
1221 .\" Source: MySQL 5.5
1222 .\" Language: English
1223 .\"
1224-.TH "\FBMYSQLADMIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1225+.TH "\FBMYSQLADMIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1226 .\" -----------------------------------------------------------------
1227 .\" * Define some portability stuff
1228 .\" -----------------------------------------------------------------
1229@@ -84,7 +84,7 @@
1230 Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.
1231 .sp
1232 This includes information about the Event Scheduler\&. See
1233-Section\ \&19.4.5, \(lqEvent Scheduler Status\(rq\&.
1234+Section\ \&20.4.5, \(lqEvent Scheduler Status\(rq\&.
1235 .RE
1236 .sp
1237 .RS 4
1238@@ -610,7 +610,7 @@
1239 and
1240 [client]
1241 groups of an option file\&. For information about option files, see
1242-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1243+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1244 .sp
1245 .RS 4
1246 .ie n \{\
1247
1248=== modified file 'man/mysqlbinlog.1'
1249--- man/mysqlbinlog.1 2014-06-03 13:14:25 +0000
1250+++ man/mysqlbinlog.1 2014-08-22 10:00:31 +0000
1251@@ -2,12 +2,12 @@
1252 .\" Title: \fBmysqlbinlog\fR
1253 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1254 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1255-.\" Date: 05/11/2014
1256+.\" Date: 07/18/2014
1257 .\" Manual: MySQL Database System
1258 .\" Source: MySQL 5.5
1259 .\" Language: English
1260 .\"
1261-.TH "\FBMYSQLBINLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1262+.TH "\FBMYSQLBINLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1263 .\" -----------------------------------------------------------------
1264 .\" * Define some portability stuff
1265 .\" -----------------------------------------------------------------
1266@@ -43,7 +43,7 @@
1267 \fBmysqlbinlog\fR
1268 to 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
1269 Section\ \&5.2.4, \(lqThe Binary Log\(rq, and
1270-Section\ \&16.2.2, \(lqReplication Relay and Status Logs\(rq\&.
1271+Section\ \&17.2.2, \(lqReplication Relay and Status Logs\(rq\&.
1272 .PP
1273 Invoke
1274 \fBmysqlbinlog\fR
1275@@ -74,7 +74,7 @@
1276 .PP
1277 The output includes events contained in
1278 binlog\&.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
1279-Section\ \&16.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
1280+Section\ \&17.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
1281 .PP
1282 Events are preceded by header comments that provide additional information\&. For example:
1283 .sp
1284@@ -92,7 +92,7 @@
1285 .PP
1286 In the first line, the number following
1287 at
1288-indicates the starting position of the event in the binary log file\&.
1289+indicates the file offset, or starting position, of the event in the binary log file\&.
1290 .PP
1291 The 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\&.
1292 server id
1293@@ -107,6 +107,39 @@
1294 is 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\&.
1295 error_code
1296 indicates the result from executing the event\&. Zero means that no error occurred\&.
1297+.if n \{\
1298+.sp
1299+.\}
1300+.RS 4
1301+.it 1 an-trap
1302+.nr an-no-space-flag 1
1303+.nr an-break-flag 1
1304+.br
1305+.ps +1
1306+\fBNote\fR
1307+.ps -1
1308+.br
1309+.PP
1310+When using event groups, the file offsets of all events are grouped together and the comments of all events are grouped together\&. For example:
1311+.sp
1312+.if n \{\
1313+.RS 4
1314+.\}
1315+.nf
1316+# at 587
1317+# at 630
1318+# at 5662
1319+#140627 13:16:52 server id 1 end_log_pos 630 Table_map: `test`\&.`t1` mapped to number 41
1320+#140627 13:16:52 server id 1 end_log_pos 5662 Write_rows: table id 41
1321+#140627 13:16:52 server id 1 end_log_pos 10694 Write_rows: table id 41 flags: STMT_END_F
1322+.fi
1323+.if n \{\
1324+.RE
1325+.\}
1326+.PP
1327+The three file offsets do not represent blank events\&.
1328+.sp .5v
1329+.RE
1330 .PP
1331 The output from
1332 \fBmysqlbinlog\fR
1333@@ -134,7 +167,7 @@
1334 and
1335 [client]
1336 groups of an option file\&. For information about option files, see
1337-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1338+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1339 .sp
1340 .RS 4
1341 .ie n \{\
1342
1343=== modified file 'man/mysqlbug.1'
1344--- man/mysqlbug.1 2014-06-03 13:14:25 +0000
1345+++ man/mysqlbug.1 2014-08-22 10:00:31 +0000
1346@@ -2,12 +2,12 @@
1347 .\" Title: \fBmysqlbug\fR
1348 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1349 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1350-.\" Date: 05/11/2014
1351+.\" Date: 07/18/2014
1352 .\" Manual: MySQL Database System
1353 .\" Source: MySQL 5.5
1354 .\" Language: English
1355 .\"
1356-.TH "\FBMYSQLBUG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1357+.TH "\FBMYSQLBUG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1358 .\" -----------------------------------------------------------------
1359 .\" * Define some portability stuff
1360 .\" -----------------------------------------------------------------
1361
1362=== modified file 'man/mysqlcheck.1'
1363--- man/mysqlcheck.1 2014-06-03 13:14:25 +0000
1364+++ man/mysqlcheck.1 2014-08-22 10:00:31 +0000
1365@@ -2,12 +2,12 @@
1366 .\" Title: \fBmysqlcheck\fR
1367 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1368 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1369-.\" Date: 05/11/2014
1370+.\" Date: 07/18/2014
1371 .\" Manual: MySQL Database System
1372 .\" Source: MySQL 5.5
1373 .\" Language: English
1374 .\"
1375-.TH "\FBMYSQLCHECK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1376+.TH "\FBMYSQLCHECK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1377 .\" -----------------------------------------------------------------
1378 .\" * Define some portability stuff
1379 .\" -----------------------------------------------------------------
1380@@ -205,7 +205,7 @@
1381 and
1382 [client]
1383 groups of an option file\&. For information about option files, see
1384-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1385+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1386 .sp
1387 .RS 4
1388 .ie n \{\
1389@@ -238,7 +238,13 @@
1390 .sp
1391 Check all tables in all databases\&. This is the same as using the
1392 \fB\-\-databases\fR
1393-option and naming all the databases on the command line\&.
1394+option and naming all the databases on the command line, except that the
1395+INFORMATION_SCHEMA
1396+and
1397+performace_schema
1398+databases are not dumped\&. They can be dumped by explicitly naming them with the
1399+\fB\-\-databases\fR
1400+option\&.
1401 .RE
1402 .sp
1403 .RS 4
1404@@ -410,6 +416,15 @@
1405 Process all tables in the named databases\&. Normally,
1406 \fBmysqlcheck\fR
1407 treats 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\&.
1408+.sp
1409+This option may be used to dump the
1410+INFORMATION_SCHEMA
1411+and
1412+performace_schema
1413+databases, which normally are not dumped even with
1414+\fB\-\-all\-databases\fR\&. option\&. (Also use the
1415+\fB\-\-skip\-lock\-tables\fR
1416+option\&.)
1417 .RE
1418 .sp
1419 .RS 4
1420
1421=== modified file 'man/mysqld.8'
1422--- man/mysqld.8 2014-06-03 13:14:25 +0000
1423+++ man/mysqld.8 2014-08-22 10:00:31 +0000
1424@@ -2,12 +2,12 @@
1425 .\" Title: \fBmysqld\fR
1426 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1427 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1428-.\" Date: 05/11/2014
1429+.\" Date: 07/18/2014
1430 .\" Manual: MySQL Database System
1431 .\" Source: MySQL 5.5
1432 .\" Language: English
1433 .\"
1434-.TH "\FBMYSQLD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1435+.TH "\FBMYSQLD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1436 .\" -----------------------------------------------------------------
1437 .\" * Define some portability stuff
1438 .\" -----------------------------------------------------------------
1439
1440=== modified file 'man/mysqld_multi.1'
1441--- man/mysqld_multi.1 2014-06-03 13:14:25 +0000
1442+++ man/mysqld_multi.1 2014-08-22 10:00:31 +0000
1443@@ -2,12 +2,12 @@
1444 .\" Title: \fBmysqld_multi\fR
1445 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1446 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1447-.\" Date: 05/11/2014
1448+.\" Date: 07/18/2014
1449 .\" Manual: MySQL Database System
1450 .\" Source: MySQL 5.5
1451 .\" Language: English
1452 .\"
1453-.TH "\FBMYSQLD_MULTI\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1454+.TH "\FBMYSQLD_MULTI\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1455 .\" -----------------------------------------------------------------
1456 .\" * Define some portability stuff
1457 .\" -----------------------------------------------------------------
1458@@ -701,7 +701,7 @@
1459 .\}
1460 .PP
1461 See
1462-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1463+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1464 .SH "COPYRIGHT"
1465 .br
1466 .PP
1467
1468=== modified file 'man/mysqld_safe.1'
1469--- man/mysqld_safe.1 2014-06-03 13:14:25 +0000
1470+++ man/mysqld_safe.1 2014-08-22 10:00:31 +0000
1471@@ -2,12 +2,12 @@
1472 .\" Title: \fBmysqld_safe\fR
1473 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1474 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1475-.\" Date: 05/11/2014
1476+.\" Date: 07/18/2014
1477 .\" Manual: MySQL Database System
1478 .\" Source: MySQL 5.5
1479 .\" Language: English
1480 .\"
1481-.TH "\FBMYSQLD_SAFE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1482+.TH "\FBMYSQLD_SAFE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1483 .\" -----------------------------------------------------------------
1484 .\" * Define some portability stuff
1485 .\" -----------------------------------------------------------------
1486@@ -70,7 +70,7 @@
1487 if they are specified on the command line, but ignored if they are specified in the
1488 [mysqld_safe]
1489 group of an option file\&. See
1490-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1491+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1492 .PP
1493 \fBmysqld_safe\fR
1494 reads all options from the
1495@@ -106,7 +106,7 @@
1496 .PP
1497 \fBmysqld_safe\fR
1498 supports the following options\&. It also reads option files and supports the options for processing them described at
1499-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1500+Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1501 .sp
1502 .RS 4
1503 .ie n \{\
1504
1505=== modified file 'man/mysqldump.1'
1506--- man/mysqldump.1 2014-06-03 13:14:25 +0000
1507+++ man/mysqldump.1 2014-08-22 10:00:31 +0000
1508@@ -2,12 +2,12 @@
1509 .\" Title: \fBmysqldump\fR
1510 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1511 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1512-.\" Date: 05/11/2014
1513+.\" Date: 07/18/2014
1514 .\" Manual: MySQL Database System
1515 .\" Source: MySQL 5.5
1516 .\" Language: English
1517 .\"
1518-.TH "\FBMYSQLDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1519+.TH "\FBMYSQLDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1520 .\" -----------------------------------------------------------------
1521 .\" * Define some portability stuff
1522 .\" -----------------------------------------------------------------
1523@@ -104,7 +104,7 @@
1524 backups with minimal disruption; it can also back up tables from
1525 MyISAM
1526 and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See
1527-Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&.
1528+Section\ \&25.2, \(lqMySQL Enterprise Backup\(rq\&.
1529 .RE
1530 .sp
1531 .RS 4
1532@@ -175,12 +175,12 @@
1533 \fBmysqldump\fR
1534 does not dump the
1535 INFORMATION_SCHEMA
1536-database by default\&.
1537-\fBmysqldump\fR
1538-dumps
1539-INFORMATION_SCHEMA
1540-only if you name it explicitly on the command line, although currently you must also use the
1541+or
1542+performance_schema
1543+database by default\&. To dump either of these, name it explicitly on the command line and also use the
1544 \fB\-\-skip\-lock\-tables\fR
1545+option\&. You can also name them with the
1546+\fB\-\-databases\fR
1547 option\&. Before MySQL 5\&.5
1548 \fBmysqldump\fR
1549 silently ignores
1550@@ -344,7 +344,7 @@
1551 and
1552 [client]
1553 groups of an option file\&. For information about option files, see
1554-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1555+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1556 .sp
1557 .RS 4
1558 .ie n \{\
1559@@ -2641,7 +2641,7 @@
1560 .\" mysqldump: workarounds
1561 .PP
1562 If 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
1563-Section\ \&E.5, \(lqRestrictions on Views\(rq\&.
1564+Section\ \&D.5, \(lqRestrictions on Views\(rq\&.
1565 .SH "COPYRIGHT"
1566 .br
1567 .PP
1568
1569=== modified file 'man/mysqldumpslow.1'
1570--- man/mysqldumpslow.1 2014-06-03 13:14:25 +0000
1571+++ man/mysqldumpslow.1 2014-08-22 10:00:31 +0000
1572@@ -2,12 +2,12 @@
1573 .\" Title: \fBmysqldumpslow\fR
1574 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1575 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1576-.\" Date: 05/11/2014
1577+.\" Date: 07/18/2014
1578 .\" Manual: MySQL Database System
1579 .\" Source: MySQL 5.5
1580 .\" Language: English
1581 .\"
1582-.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1583+.TH "\FBMYSQLDUMPSLOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1584 .\" -----------------------------------------------------------------
1585 .\" * Define some portability stuff
1586 .\" -----------------------------------------------------------------
1587
1588=== modified file 'man/mysqlhotcopy.1'
1589--- man/mysqlhotcopy.1 2014-06-03 13:14:25 +0000
1590+++ man/mysqlhotcopy.1 2014-08-22 10:00:31 +0000
1591@@ -2,12 +2,12 @@
1592 .\" Title: \fBmysqlhotcopy\fR
1593 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1594 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1595-.\" Date: 05/11/2014
1596+.\" Date: 07/18/2014
1597 .\" Manual: MySQL Database System
1598 .\" Source: MySQL 5.5
1599 .\" Language: English
1600 .\"
1601-.TH "\FBMYSQLHOTCOPY\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1602+.TH "\FBMYSQLHOTCOPY\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1603 .\" -----------------------------------------------------------------
1604 .\" * Define some portability stuff
1605 .\" -----------------------------------------------------------------
1606@@ -114,7 +114,7 @@
1607 and
1608 [client]
1609 groups of an option file\&. For information about option files, see
1610-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1611+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1612 .sp
1613 .RS 4
1614 .ie n \{\
1615
1616=== modified file 'man/mysqlimport.1'
1617--- man/mysqlimport.1 2014-06-03 13:14:25 +0000
1618+++ man/mysqlimport.1 2014-08-22 10:00:31 +0000
1619@@ -2,12 +2,12 @@
1620 .\" Title: \fBmysqlimport\fR
1621 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1622 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1623-.\" Date: 05/11/2014
1624+.\" Date: 07/18/2014
1625 .\" Manual: MySQL Database System
1626 .\" Source: MySQL 5.5
1627 .\" Language: English
1628 .\"
1629-.TH "\FBMYSQLIMPORT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1630+.TH "\FBMYSQLIMPORT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1631 .\" -----------------------------------------------------------------
1632 .\" * Define some portability stuff
1633 .\" -----------------------------------------------------------------
1634@@ -79,7 +79,7 @@
1635 and
1636 [client]
1637 groups of an option file\&. For information about option files, see
1638-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1639+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1640 .sp
1641 .RS 4
1642 .ie n \{\
1643
1644=== modified file 'man/mysqlshow.1'
1645--- man/mysqlshow.1 2014-06-03 13:14:25 +0000
1646+++ man/mysqlshow.1 2014-08-22 10:00:31 +0000
1647@@ -2,12 +2,12 @@
1648 .\" Title: \fBmysqlshow\fR
1649 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1650 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1651-.\" Date: 05/11/2014
1652+.\" Date: 07/18/2014
1653 .\" Manual: MySQL Database System
1654 .\" Source: MySQL 5.5
1655 .\" Language: English
1656 .\"
1657-.TH "\FBMYSQLSHOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1658+.TH "\FBMYSQLSHOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1659 .\" -----------------------------------------------------------------
1660 .\" * Define some portability stuff
1661 .\" -----------------------------------------------------------------
1662@@ -126,7 +126,7 @@
1663 and
1664 [client]
1665 groups of an option file\&. For information about option files, see
1666-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1667+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1668 .sp
1669 .RS 4
1670 .ie n \{\
1671
1672=== modified file 'man/mysqlslap.1'
1673--- man/mysqlslap.1 2014-06-03 13:14:25 +0000
1674+++ man/mysqlslap.1 2014-08-22 10:00:31 +0000
1675@@ -2,12 +2,12 @@
1676 .\" Title: \fBmysqlslap\fR
1677 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1678 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1679-.\" Date: 05/11/2014
1680+.\" Date: 07/18/2014
1681 .\" Manual: MySQL Database System
1682 .\" Source: MySQL 5.5
1683 .\" Language: English
1684 .\"
1685-.TH "\FBMYSQLSLAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1686+.TH "\FBMYSQLSLAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1687 .\" -----------------------------------------------------------------
1688 .\" * Define some portability stuff
1689 .\" -----------------------------------------------------------------
1690@@ -163,7 +163,7 @@
1691 and
1692 [client]
1693 groups of an option file\&. For information about option files, see
1694-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1695+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
1696 .sp
1697 .RS 4
1698 .ie n \{\
1699
1700=== modified file 'man/mysqltest.1'
1701--- man/mysqltest.1 2014-06-03 13:14:25 +0000
1702+++ man/mysqltest.1 2014-08-22 10:00:31 +0000
1703@@ -2,12 +2,12 @@
1704 .\" Title: \fBmysqltest\fR
1705 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1706 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1707-.\" Date: 05/06/2014
1708+.\" Date: 07/04/2014
1709 .\" Manual: MySQL Database System
1710 .\" Source: MySQL
1711 .\" Language: English
1712 .\"
1713-.TH "\FBMYSQLTEST\FR" "1" "05/06/2014" "MySQL" "MySQL Database System"
1714+.TH "\FBMYSQLTEST\FR" "1" "07/04/2014" "MySQL" "MySQL Database System"
1715 .\" -----------------------------------------------------------------
1716 .\" * Define some portability stuff
1717 .\" -----------------------------------------------------------------
1718
1719=== modified file 'man/ndb-common-options.1'
1720--- man/ndb-common-options.1 2014-06-03 13:14:25 +0000
1721+++ man/ndb-common-options.1 2014-08-22 10:00:31 +0000
1722@@ -2,12 +2,12 @@
1723 .\" Title: Options Common to MySQL Cluster Programs
1724 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1725 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1726-.\" Date: 05/11/2014
1727+.\" Date: 07/18/2014
1728 .\" Manual: MySQL Database System
1729 .\" Source: MySQL 5.5
1730 .\" Language: English
1731 .\"
1732-.TH "OPTIONS COMMON TO MY" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1733+.TH "OPTIONS COMMON TO MY" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1734 .\" -----------------------------------------------------------------
1735 .\" * Define some portability stuff
1736 .\" -----------------------------------------------------------------
1737@@ -97,7 +97,7 @@
1738 .nr an-no-space-flag 1
1739 .nr an-break-flag 1
1740 .br
1741-.B Table\ \&17.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
1742+.B Table\ \&18.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
1743 .TS
1744 allbox tab(:);
1745 lB lB lB.
1746@@ -217,10 +217,10 @@
1747 .sp 1
1748 .PP
1749 For options specific to individual MySQL Cluster programs, see
1750-Section\ \&17.4, \(lqMySQL Cluster Programs\(rq\&.
1751+Section\ \&18.4, \(lqMySQL Cluster Programs\(rq\&.
1752 .PP
1753 See
1754-Section\ \&17.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
1755+Section\ \&18.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
1756 \fBmysqld\fR
1757 options relating to MySQL Cluster\&.
1758 .sp
1759@@ -371,7 +371,7 @@
1760 .\}
1761 .sp
1762 For more information, see
1763-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
1764+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
1765 .RE
1766 .sp
1767 .RS 4
1768@@ -559,7 +559,7 @@
1769 .sp 1
1770 Sets this node\*(Aqs MySQL Cluster node ID\&.
1771 \fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See
1772-Section\ \&17.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
1773+Section\ \&18.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
1774 .RE
1775 .sp
1776 .RS 4
1777@@ -634,7 +634,7 @@
1778 Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.
1779 .sp
1780 See
1781-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
1782+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
1783 .RE
1784 .SH "COPYRIGHT"
1785 .br
1786
1787=== modified file 'man/ndb_blob_tool.1'
1788--- man/ndb_blob_tool.1 2014-06-03 13:14:25 +0000
1789+++ man/ndb_blob_tool.1 2014-08-22 10:00:31 +0000
1790@@ -2,12 +2,12 @@
1791 .\" Title: \fBndb_blob_tool\fR
1792 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1793 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1794-.\" Date: 05/11/2014
1795+.\" Date: 07/18/2014
1796 .\" Manual: MySQL Database System
1797 .\" Source: MySQL 5.5
1798 .\" Language: English
1799 .\"
1800-.TH "\FBNDB_BLOB_TOOL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1801+.TH "\FBNDB_BLOB_TOOL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1802 .\" -----------------------------------------------------------------
1803 .\" * Define some portability stuff
1804 .\" -----------------------------------------------------------------
1805@@ -94,7 +94,7 @@
1806 .nr an-no-space-flag 1
1807 .nr an-break-flag 1
1808 .br
1809-.B Table\ \&17.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
1810+.B Table\ \&18.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
1811 .TS
1812 allbox tab(:);
1813 lB lB lB.
1814@@ -478,7 +478,7 @@
1815 column parts are created by
1816 NDB
1817 for this column\&. See
1818-Section\ \&11.6, \(lqData Type Storage Requirements\(rq, for more information\&.
1819+Section\ \&11.7, \(lqData Type Storage Requirements\(rq, for more information\&.
1820 .SH "COPYRIGHT"
1821 .br
1822 .PP
1823
1824=== modified file 'man/ndb_config.1'
1825--- man/ndb_config.1 2014-06-03 13:14:25 +0000
1826+++ man/ndb_config.1 2014-08-22 10:00:31 +0000
1827@@ -2,12 +2,12 @@
1828 .\" Title: \fBndb_config\fR
1829 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1830 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1831-.\" Date: 05/11/2014
1832+.\" Date: 07/18/2014
1833 .\" Manual: MySQL Database System
1834 .\" Source: MySQL 5.5
1835 .\" Language: English
1836 .\"
1837-.TH "\FBNDB_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1838+.TH "\FBNDB_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1839 .\" -----------------------------------------------------------------
1840 .\" * Define some portability stuff
1841 .\" -----------------------------------------------------------------
1842@@ -69,7 +69,7 @@
1843 .nr an-no-space-flag 1
1844 .nr an-break-flag 1
1845 .br
1846-.B Table\ \&17.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
1847+.B Table\ \&18.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
1848 .TS
1849 allbox tab(:);
1850 lB lB lB.
1851@@ -427,7 +427,7 @@
1852 .TE
1853 .sp 1
1854 Specifies the connection string to use in connecting to the management server\&. The format for the connection string is the same as described in
1855-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
1856+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
1857 localhost:1186\&.
1858 .RE
1859 .sp
1860@@ -1230,7 +1230,7 @@
1861 .\}
1862 .nf
1863 shell> \fBndb_config \-\-configinfo \-\-xml\fR
1864-<configvariables protocolversion="1" ndbversionstring="5\&.5\&.37\-ndb\-7\&.2\&.17"
1865+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.38\-ndb\-7\&.2\&.18"
1866 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
1867 ndbversionbuild="6">
1868 <section name="SYSTEM">
1869
1870=== modified file 'man/ndb_cpcd.1'
1871--- man/ndb_cpcd.1 2014-06-03 13:14:25 +0000
1872+++ man/ndb_cpcd.1 2014-08-22 10:00:31 +0000
1873@@ -2,12 +2,12 @@
1874 .\" Title: \fBndb_cpcd\fR
1875 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1876 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1877-.\" Date: 05/11/2014
1878+.\" Date: 07/18/2014
1879 .\" Manual: MySQL Database System
1880 .\" Source: MySQL 5.5
1881 .\" Language: English
1882 .\"
1883-.TH "\FBNDB_CPCD\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1884+.TH "\FBNDB_CPCD\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1885 .\" -----------------------------------------------------------------
1886 .\" * Define some portability stuff
1887 .\" -----------------------------------------------------------------
1888
1889=== modified file 'man/ndb_delete_all.1'
1890--- man/ndb_delete_all.1 2014-06-03 13:14:25 +0000
1891+++ man/ndb_delete_all.1 2014-08-22 10:00:31 +0000
1892@@ -2,12 +2,12 @@
1893 .\" Title: \fBndb_delete_all\fR
1894 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1895 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1896-.\" Date: 05/11/2014
1897+.\" Date: 07/18/2014
1898 .\" Manual: MySQL Database System
1899 .\" Source: MySQL 5.5
1900 .\" Language: English
1901 .\"
1902-.TH "\FBNDB_DELETE_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1903+.TH "\FBNDB_DELETE_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1904 .\" -----------------------------------------------------------------
1905 .\" * Define some portability stuff
1906 .\" -----------------------------------------------------------------
1907@@ -70,7 +70,7 @@
1908 .nr an-no-space-flag 1
1909 .nr an-break-flag 1
1910 .br
1911-.B Table\ \&17.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
1912+.B Table\ \&18.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
1913 .TS
1914 allbox tab(:);
1915 lB lB lB.
1916
1917=== modified file 'man/ndb_desc.1'
1918--- man/ndb_desc.1 2014-06-03 13:14:25 +0000
1919+++ man/ndb_desc.1 2014-08-22 10:00:31 +0000
1920@@ -2,12 +2,12 @@
1921 .\" Title: \fBndb_desc\fR
1922 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1923 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1924-.\" Date: 05/11/2014
1925+.\" Date: 07/18/2014
1926 .\" Manual: MySQL Database System
1927 .\" Source: MySQL 5.5
1928 .\" Language: English
1929 .\"
1930-.TH "\FBNDB_DESC\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1931+.TH "\FBNDB_DESC\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1932 .\" -----------------------------------------------------------------
1933 .\" * Define some portability stuff
1934 .\" -----------------------------------------------------------------
1935@@ -238,7 +238,7 @@
1936 .\}
1937 .PP
1938 (For more information on the statements just shown and the objects created by them, see
1939-Section\ \&17.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
1940+Section\ \&18.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
1941 Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
1942 Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
1943 .PP
1944@@ -333,7 +333,7 @@
1945 .nr an-no-space-flag 1
1946 .nr an-break-flag 1
1947 .br
1948-.B Table\ \&17.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
1949+.B Table\ \&18.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
1950 .TS
1951 allbox tab(:);
1952 lB lB lB.
1953
1954=== modified file 'man/ndb_drop_index.1'
1955--- man/ndb_drop_index.1 2014-06-03 13:14:25 +0000
1956+++ man/ndb_drop_index.1 2014-08-22 10:00:31 +0000
1957@@ -2,12 +2,12 @@
1958 .\" Title: \fBndb_drop_index\fR
1959 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1960 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1961-.\" Date: 05/11/2014
1962+.\" Date: 07/18/2014
1963 .\" Manual: MySQL Database System
1964 .\" Source: MySQL 5.5
1965 .\" Language: English
1966 .\"
1967-.TH "\FBNDB_DROP_INDEX\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1968+.TH "\FBNDB_DROP_INDEX\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
1969 .\" -----------------------------------------------------------------
1970 .\" * Define some portability stuff
1971 .\" -----------------------------------------------------------------
1972@@ -68,7 +68,7 @@
1973 .nr an-no-space-flag 1
1974 .nr an-break-flag 1
1975 .br
1976-.B Table\ \&17.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
1977+.B Table\ \&18.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
1978 .TS
1979 allbox tab(:);
1980 lB lB lB.
1981@@ -123,7 +123,7 @@
1982 Reading table information for completion of table and column names
1983 You can turn off this feature to get a quicker startup with \-A
1984 Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
1985-Your MySQL connection id is 7 to server version: 5\&.5\&.37\-ndb\-7\&.2\&.17
1986+Your MySQL connection id is 7 to server version: 5\&.5\&.38\-ndb\-7\&.2\&.18
1987 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
1988 mysql> \fBSHOW TABLES;\fR
1989 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
1990
1991=== modified file 'man/ndb_drop_table.1'
1992--- man/ndb_drop_table.1 2014-06-03 13:14:25 +0000
1993+++ man/ndb_drop_table.1 2014-08-22 10:00:31 +0000
1994@@ -2,12 +2,12 @@
1995 .\" Title: \fBndb_drop_table\fR
1996 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1997 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1998-.\" Date: 05/11/2014
1999+.\" Date: 07/18/2014
2000 .\" Manual: MySQL Database System
2001 .\" Source: MySQL 5.5
2002 .\" Language: English
2003 .\"
2004-.TH "\FBNDB_DROP_TABLE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2005+.TH "\FBNDB_DROP_TABLE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2006 .\" -----------------------------------------------------------------
2007 .\" * Define some portability stuff
2008 .\" -----------------------------------------------------------------
2009@@ -66,7 +66,7 @@
2010 .nr an-no-space-flag 1
2011 .nr an-break-flag 1
2012 .br
2013-.B Table\ \&17.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
2014+.B Table\ \&18.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
2015 .TS
2016 allbox tab(:);
2017 lB lB lB.
2018
2019=== modified file 'man/ndb_error_reporter.1'
2020--- man/ndb_error_reporter.1 2014-06-03 13:14:25 +0000
2021+++ man/ndb_error_reporter.1 2014-08-22 10:00:31 +0000
2022@@ -2,12 +2,12 @@
2023 .\" Title: \fBndb_error_reporter\fR
2024 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2025 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2026-.\" Date: 05/11/2014
2027+.\" Date: 07/18/2014
2028 .\" Manual: MySQL Database System
2029 .\" Source: MySQL 5.5
2030 .\" Language: English
2031 .\"
2032-.TH "\FBNDB_ERROR_REPORTE" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2033+.TH "\FBNDB_ERROR_REPORTE" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2034 .\" -----------------------------------------------------------------
2035 .\" * Define some portability stuff
2036 .\" -----------------------------------------------------------------
2037@@ -58,7 +58,7 @@
2038 .nr an-no-space-flag 1
2039 .nr an-break-flag 1
2040 .br
2041-.B Table\ \&17.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
2042+.B Table\ \&18.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
2043 .TS
2044 allbox tab(:);
2045 lB lB lB.
2046
2047=== modified file 'man/ndb_index_stat.1'
2048--- man/ndb_index_stat.1 2014-06-03 13:14:25 +0000
2049+++ man/ndb_index_stat.1 2014-08-22 10:00:31 +0000
2050@@ -2,12 +2,12 @@
2051 .\" Title: \fBndb_index_stat\fR
2052 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2053 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2054-.\" Date: 05/11/2014
2055+.\" Date: 07/18/2014
2056 .\" Manual: MySQL Database System
2057 .\" Source: MySQL 5.5
2058 .\" Language: English
2059 .\"
2060-.TH "\FBNDB_INDEX_STAT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2061+.TH "\FBNDB_INDEX_STAT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2062 .\" -----------------------------------------------------------------
2063 .\" * Define some portability stuff
2064 .\" -----------------------------------------------------------------
2065@@ -65,22 +65,70 @@
2066 in the
2067 test
2068 database:
2069+.\" ndb_index_stat: interpreting output
2070+.\" ndb_index_stat: example
2071 .sp
2072 .if n \{\
2073 .RS 4
2074 .\}
2075 .nf
2076 shell> \fBndb_index_stat \-d test mytable\fR
2077-table:mytable index:PRIMARY fragCount:4
2078-sampleVersion:2 loadTime:1336751773 sampleCount:0 keyBytes:0
2079-query cache: valid:1 sampleCount:0 totalBytes:0
2080-times in ms: save: 12\&.380 sort: 0\&.001
2081+table:City index:PRIMARY fragCount:2
2082+sampleVersion:3 loadTime:1399585986 sampleCount:1994 keyBytes:7976
2083+query cache: valid:1 sampleCount:1994 totalBytes:27916
2084+times in ms: save: 7\&.133 sort: 1\&.974 sort per sample: 0\&.000
2085 NDBT_ProgramExit: 0 \- OK
2086 .fi
2087 .if n \{\
2088 .RE
2089 .\}
2090 .PP
2091+sampleVersion
2092+is the version number of the cache from which the statistics data is taken\&. Running
2093+\fBndb_index_stat\fR
2094+with the
2095+\fB\-\-update\fR
2096+option causes sampleVersion to be incremented\&.
2097+.PP
2098+loadTime
2099+shows when the cache was last updated\&. This is expressed as seconds since the Unix Epoch\&.
2100+.PP
2101+sampleCount
2102+is 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
2103+fragCount)\&.
2104+.PP
2105+sampleCount cab be compared with the cardinality of
2106+SHOW INDEX
2107+or
2108+INFORMATION_SCHEMA\&.STATISTICS, although the latter two provide a view of the table as a whole, while
2109+\fBndb_index_stat\fR
2110+provides a per\-fragment average\&.
2111+.PP
2112+keyBytes
2113+is 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
2114+keyBytes
2115+can be calculated in this case as shown here:
2116+.sp
2117+.if n \{\
2118+.RS 4
2119+.\}
2120+.nf
2121+ keyBytes = sampleCount * (4 bytes per index) = 1994 * 4 = 7976
2122+.fi
2123+.if n \{\
2124+.RE
2125+.\}
2126+.PP
2127+This information can also be obtained using the corresponding column definitions from
2128+INFORMATION_SCHEMA\&.COLUMNS
2129+(this requires a MySQL Server and a MySQL client application)\&.
2130+.PP
2131+totalBytes
2132+is the total memory consumed by all indexes on the table, in bytes\&.
2133+.PP
2134+Timings shown in the preceding examples are specific to each invocation of
2135+\fBndb_index_stat\fR\&.
2136+.PP
2137 The
2138 \fB\-\-verbose\fR
2139 option provides some additional output, as shown here:
2140@@ -118,7 +166,7 @@
2141 .nr an-no-space-flag 1
2142 .nr an-break-flag 1
2143 .br
2144-.B Table\ \&17.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
2145+.B Table\ \&18.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
2146 .TS
2147 allbox tab(:);
2148 lB lB lB.
2149
2150=== modified file 'man/ndb_mgm.1'
2151--- man/ndb_mgm.1 2014-06-03 13:14:25 +0000
2152+++ man/ndb_mgm.1 2014-08-22 10:00:31 +0000
2153@@ -2,12 +2,12 @@
2154 .\" Title: \fBndb_mgm\fR
2155 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2156 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2157-.\" Date: 05/11/2014
2158+.\" Date: 07/18/2014
2159 .\" Manual: MySQL Database System
2160 .\" Source: MySQL 5.5
2161 .\" Language: English
2162 .\"
2163-.TH "\FBNDB_MGM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2164+.TH "\FBNDB_MGM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2165 .\" -----------------------------------------------------------------
2166 .\" * Define some portability stuff
2167 .\" -----------------------------------------------------------------
2168@@ -87,7 +87,7 @@
2169 .nr an-no-space-flag 1
2170 .nr an-break-flag 1
2171 .br
2172-.B Table\ \&17.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.2
2173+.B Table\ \&18.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.2
2174 .TS
2175 allbox tab(:);
2176 lB lB lB.
2177@@ -176,7 +176,7 @@
2178 option works with the
2179 \fBmysql\fR
2180 command\-line client\&. See
2181-Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq\&.
2182+Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq\&.
2183 .if n \{\
2184 .sp
2185 .\}
2186@@ -247,7 +247,7 @@
2187 Additional information about using
2188 \fBndb_mgm\fR
2189 can be found in
2190-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
2191+Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
2192 .SH "COPYRIGHT"
2193 .br
2194 .PP
2195
2196=== modified file 'man/ndb_mgmd.8'
2197--- man/ndb_mgmd.8 2014-06-03 13:14:25 +0000
2198+++ man/ndb_mgmd.8 2014-08-22 10:00:31 +0000
2199@@ -2,12 +2,12 @@
2200 .\" Title: \fBndb_mgmd\fR
2201 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2202 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2203-.\" Date: 05/11/2014
2204+.\" Date: 07/18/2014
2205 .\" Manual: MySQL Database System
2206 .\" Source: MySQL 5.5
2207 .\" Language: English
2208 .\"
2209-.TH "\FBNDB_MGMD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2210+.TH "\FBNDB_MGMD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2211 .\" -----------------------------------------------------------------
2212 .\" * Define some portability stuff
2213 .\" -----------------------------------------------------------------
2214@@ -54,7 +54,7 @@
2215 .nr an-no-space-flag 1
2216 .nr an-break-flag 1
2217 .br
2218-.B Table\ \&17.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.2
2219+.B Table\ \&18.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.2
2220 .TS
2221 allbox tab(:);
2222 lB lB lB.
2223@@ -86,9 +86,7 @@
2224 .PP
2225 --config-file=file,
2226 .PP
2227--f,
2228-.PP
2229--c
2230+-f
2231 T}:T{
2232 Specify the cluster configuration file; in NDB\-6\&.4\&.0 and later, needs
2233 \-\-reload or \-\-initial to override configuration cache if
2234@@ -431,7 +429,7 @@
2235 ON), can be used to disable the management server\*(Aqs configuration cache, so that it reads its configuration from
2236 config\&.ini
2237 every time it starts (see
2238-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
2239+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
2240 \fBndb_mgmd\fR
2241 process with any one of the following options:
2242 .sp
2243@@ -622,7 +620,7 @@
2244 \fBndb_mgmd\fR
2245 was started with
2246 \fB\-\-config\-cache=OFF\fR\&. See
2247-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
2248+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
2249 .sp
2250 Formerly, using this option together with
2251 \fB\-\-initial\fR
2252@@ -812,7 +810,7 @@
2253 .TE
2254 .sp 1
2255 Configuration data is cached internally, rather than being read from the cluster global configuration file each time the management server is started (see
2256-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
2257+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
2258 \fB\-\-initial\fR
2259 option 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\&.
2260 .sp
2261@@ -835,7 +833,7 @@
2262 ignores
2263 \fB\-\-initial\fR
2264 unless 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
2265-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
2266+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
2267 .sp
2268 Formerly, using this option together with the
2269 \fB\-\-config\-file\fR
2270@@ -1022,7 +1020,7 @@
2271 .TE
2272 .sp 1
2273 In 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
2274-Section\ \&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\&.
2275+Section\ \&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\&.
2276 .sp
2277 This differs in two ways from the
2278 \fB\-\-initial\fR
2279@@ -1041,7 +1039,7 @@
2280 ignores
2281 \fB\-\-reload\fR
2282 unless 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
2283-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
2284+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
2285 .RE
2286 .sp
2287 .RS 4
2288@@ -1166,7 +1164,7 @@
2289 The same is true with regard to the connection string used with any
2290 \fBmysqld\fR
2291 processes that you wish to start as MySQL Cluster SQL nodes connected to this cluster\&. See
2292-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
2293+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
2294 .sp
2295 When used with
2296 \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
2297@@ -1200,7 +1198,7 @@
2298 It 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\&.
2299 .PP
2300 See
2301-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
2302+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
2303 \fBndb_mgmd\fR(8), describes other options for
2304 \fBndb_mgmd\fR\&.
2305 .PP
2306@@ -1227,7 +1225,7 @@
2307 .\" config.ini (MySQL Cluster)
2308 config\&.ini
2309 is the configuration file for the cluster as a whole\&. This file is created by the user and read by the management server\&.
2310-Section\ \&17.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.
2311+Section\ \&18.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.
2312 .RE
2313 .sp
2314 .RS 4
2315@@ -1240,7 +1238,7 @@
2316 .\}
2317 ndb_\fInode_id\fR_cluster\&.log
2318 is 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
2319-Section\ \&17.5, \(lqManagement of MySQL Cluster\(rq\&.
2320+Section\ \&18.5, \(lqManagement of MySQL Cluster\(rq\&.
2321 .sp
2322 When the size of the cluster log reaches one million bytes, the file is renamed to
2323 ndb_\fInode_id\fR_cluster\&.log\&.\fIseq_id\fR, where
2324
2325=== modified file 'man/ndb_print_backup_file.1'
2326--- man/ndb_print_backup_file.1 2014-06-03 13:14:25 +0000
2327+++ man/ndb_print_backup_file.1 2014-08-22 10:00:31 +0000
2328@@ -2,12 +2,12 @@
2329 .\" Title: \fBndb_print_backup_file\fR
2330 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2331 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2332-.\" Date: 05/11/2014
2333+.\" Date: 07/18/2014
2334 .\" Manual: MySQL Database System
2335 .\" Source: MySQL 5.5
2336 .\" Language: English
2337 .\"
2338-.TH "\FBNDB_PRINT_BACKUP_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2339+.TH "\FBNDB_PRINT_BACKUP_" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2340 .\" -----------------------------------------------------------------
2341 .\" * Define some portability stuff
2342 .\" -----------------------------------------------------------------
2343@@ -57,7 +57,7 @@
2344 BACKUP\-\fI#\fR, where
2345 \fI#\fR
2346 is the sequence number for the backup\&. For more information about cluster backup files and their contents, see
2347-Section\ \&17.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
2348+Section\ \&18.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
2349 .PP
2350 Like
2351 \fBndb_print_schema_file\fR
2352
2353=== modified file 'man/ndb_print_schema_file.1'
2354--- man/ndb_print_schema_file.1 2014-06-03 13:14:25 +0000
2355+++ man/ndb_print_schema_file.1 2014-08-22 10:00:31 +0000
2356@@ -2,12 +2,12 @@
2357 .\" Title: \fBndb_print_schema_file\fR
2358 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2359 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2360-.\" Date: 05/11/2014
2361+.\" Date: 07/18/2014
2362 .\" Manual: MySQL Database System
2363 .\" Source: MySQL 5.5
2364 .\" Language: English
2365 .\"
2366-.TH "\FBNDB_PRINT_SCHEMA_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2367+.TH "\FBNDB_PRINT_SCHEMA_" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2368 .\" -----------------------------------------------------------------
2369 .\" * Define some portability stuff
2370 .\" -----------------------------------------------------------------
2371
2372=== modified file 'man/ndb_print_sys_file.1'
2373--- man/ndb_print_sys_file.1 2014-06-03 13:14:25 +0000
2374+++ man/ndb_print_sys_file.1 2014-08-22 10:00:31 +0000
2375@@ -2,12 +2,12 @@
2376 .\" Title: \fBndb_print_sys_file\fR
2377 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2378 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2379-.\" Date: 05/11/2014
2380+.\" Date: 07/18/2014
2381 .\" Manual: MySQL Database System
2382 .\" Source: MySQL 5.5
2383 .\" Language: English
2384 .\"
2385-.TH "\FBNDB_PRINT_SYS_FIL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2386+.TH "\FBNDB_PRINT_SYS_FIL" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2387 .\" -----------------------------------------------------------------
2388 .\" * Define some portability stuff
2389 .\" -----------------------------------------------------------------
2390
2391=== modified file 'man/ndb_restore.1'
2392--- man/ndb_restore.1 2014-06-03 13:14:25 +0000
2393+++ man/ndb_restore.1 2014-08-22 10:00:31 +0000
2394@@ -2,12 +2,12 @@
2395 .\" Title: \fBndb_restore\fR
2396 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2397 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2398-.\" Date: 05/11/2014
2399+.\" Date: 07/18/2014
2400 .\" Manual: MySQL Database System
2401 .\" Source: MySQL 5.5
2402 .\" Language: English
2403 .\"
2404-.TH "\FBNDB_RESTORE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2405+.TH "\FBNDB_RESTORE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2406 .\" -----------------------------------------------------------------
2407 .\" * Define some portability stuff
2408 .\" -----------------------------------------------------------------
2409@@ -48,7 +48,7 @@
2410 must be executed once for each of the backup files that were created by the
2411 START BACKUP
2412 command used to create the backup (see
2413-Section\ \&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\&.
2414+Section\ \&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\&.
2415 .\" single user mode (MySQL Cluster): and ndb_restore
2416 .if n \{\
2417 .sp
2418@@ -65,7 +65,7 @@
2419 .PP
2420 Before using
2421 \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
2422-Section\ \&17.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
2423+Section\ \&18.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
2424 .sp .5v
2425 .RE
2426 .PP
2427@@ -78,7 +78,7 @@
2428 .nr an-no-space-flag 1
2429 .nr an-break-flag 1
2430 .br
2431-.B Table\ \&17.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.2
2432+.B Table\ \&18.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.2
2433 .TS
2434 allbox tab(:);
2435 lB lB lB.
2436@@ -130,6 +130,7 @@
2437 l l l
2438 l l l
2439 l l l
2440+l l l
2441 l l l.
2442 T{
2443 .PP
2444@@ -463,9 +464,9 @@
2445 .PP
2446 --exclude-tables=table-list
2447 T}:T{
2448-List of one or more tables to exclude (includes those in same database
2449- that are not not named); each table reference must include
2450- the database name
2451+List of one or more tables to exclude (includes those in the same
2452+ database that are not named); each table reference must
2453+ include the database name
2454 T}:T{
2455 .PP
2456 All MySQL 5\&.5 based releases
2457@@ -494,8 +495,9 @@
2458 .PP
2459 --rebuild-indexes
2460 T}:T{
2461-Causes multi\-threaded ordered index rebuilding of indexes found in the
2462- backup\&.
2463+Causes multi\-threaded rebuilding of ordered indexes found in the backup\&.
2464+ Number of threads used is determined by setting
2465+ BuildIndexThreads parameter\&.
2466 T}:T{
2467 .PP
2468 All MySQL 5\&.5 based releases
2469@@ -550,8 +552,20 @@
2470 .PP
2471 All MySQL 5\&.5 based releases
2472 T}
2473+T{
2474+.PP
2475+--exclude-intermediate-sql-tables[=TRUE|FALSE]
2476+T}:T{
2477+If TRUE (the default), do not restore any intermediate tables (having
2478+ names prefixed with \*(Aq#sql\-\*(Aq) that were left over from
2479+ copying ALTER TABLE operations\&.
2480+T}:T{
2481+.PP
2482+ADDED: NDB 7\&.2\&.17
2483+T}
2484 .TE
2485 .sp 1
2486+.\" ndb_restore: typical and required options
2487 .PP
2488 Typical options for this utility are shown here:
2489 .sp
2490@@ -566,13 +580,25 @@
2491 .RE
2492 .\}
2493 .PP
2494+Normally, when restoring from a MySQL Cluster backup,
2495+\fBndb_restore\fR
2496+requires at a minimum the
2497+\fB\-\-nodeid\fR
2498+(short form:
2499+\fB\-n\fR),
2500+\fB\-\-backupid\fR
2501+(short form:
2502+\fB\-b\fR), and
2503+\fB\-\-backup_path\fR
2504+options\&.
2505+.PP
2506 .\" restore_connect option (ndb_restore)
2507 The
2508 \fB\-c\fR
2509 option is used to specify a connection string which tells
2510 ndb_restore
2511 where to locate the cluster management server\&. (See
2512-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
2513+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
2514 \fBndb_restore\fR
2515 attempts to connect to a management server on
2516 localhost:1186\&. This utility acts as a cluster API node, and so requires a free connection
2517@@ -590,7 +616,7 @@
2518 section in
2519 config\&.ini
2520 that is not being used for a MySQL server or other application for this reason (see
2521-Section\ \&17.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
2522+Section\ \&18.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
2523 .PP
2524 You can verify that
2525 \fBndb_restore\fR
2526@@ -713,7 +739,7 @@
2527 INT
2528 or
2529 BIGINT\&. See
2530-Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
2531+Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
2532 .PP
2533 Attribute promotion by
2534 \fBndb_restore\fR
2535@@ -828,7 +854,7 @@
2536 option\&. Using
2537 \fB\-\-lossy\-conversions\fR
2538 allows 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
2539-Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
2540+Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
2541 .PP
2542 \fBndb_restore\fR
2543 reports any truncation of data that it performs during lossy conversions once per attribute and column\&.
2544@@ -882,7 +908,7 @@
2545 option is used to specify the ID or sequence number of the backup, and is the same number shown by the management client in the
2546 Backup \fIbackup_id\fR completed
2547 message displayed upon completion of a backup\&. (See
2548-Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
2549+Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
2550 .if n \{\
2551 .sp
2552 .\}
2553@@ -910,7 +936,7 @@
2554 in the
2555 id
2556 column is updated if it already exists; such a row is inserted if it does not already exist\&. (See
2557-Section\ \&17.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
2558+Section\ \&18.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
2559 .PP
2560 .\" restore_data option (ndb_restore)
2561 \fB\-\-restore_data\fR
2562@@ -942,7 +968,7 @@
2563 This works only if the privilege tables were converted to
2564 NDB
2565 before the backup was taken\&. For more information, see
2566-Section\ \&17.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
2567+Section\ \&18.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
2568 .PP
2569 .\" backup_path option (ndb_restore)
2570 .\" ndb_restore: backup_path option
2571@@ -971,7 +997,7 @@
2572 must be run twice\(emonce for each database node in the cluster where the backup was taken\&. However,
2573 \fBndb_restore\fR
2574 cannot always restore backups made from a cluster running one version of MySQL to a cluster running a different MySQL version\&. See
2575-Section\ \&17.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
2576+Section\ \&18.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
2577 .if n \{\
2578 .sp
2579 .\}
2580@@ -1413,7 +1439,7 @@
2581 This option stops
2582 \fBndb_restore\fR
2583 from restoring any MySQL Cluster Disk Data objects, such as tablespaces and log file groups; see
2584-Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
2585+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
2586 .PP
2587 .\" ndb_restore: parallelism option
2588 .\" parallelism option (ndb_restore)
2589@@ -1938,7 +1964,27 @@
2590 \fBndb_restore\fR
2591 to cause multi\-threaded rebuilding of the ordered indexes while restoring a native
2592 NDB
2593-backup\&.
2594+backup\&. The number of threads used for building ordered indexes by
2595+\fBndb_restore\fR
2596+with this option is controlled by the
2597+BuildIndexThreads
2598+data node configuration parameter (MySQL Cluster NDB 6\&.3\&.30 and later; MySQL Cluster NDB 7\&.0\&.11 and later)\&.
2599+.\" indexes: and ndb_restore
2600+.PP
2601+It is necessary to use this option only for the first run of
2602+\fBndb_restore\fR; this causes all ordered indexes to be rebuilt without using
2603+\fB\-\-rebuild\-indexes\fR
2604+again 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\&.
2605+.PP
2606+Rebuilding 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
2607+\fBndb_restore\fR
2608+\fB\-\-rebuild\-indexes\fR
2609+again; 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
2610+\fBndb_restore\fR
2611+\fB\-\-rebuild\-indexes\fR
2612+indefinitely; you may be able to stop such errors by reducing the value of
2613+DiskCheckpointSpeed
2614+to provide additional disk bandwidth to redo logging\&.
2615 .PP
2616 .\" ndb_restore: skip-broken-objects option
2617 .\" skip-broken-objects option (ndb_restore)
2618@@ -2079,6 +2125,62 @@
2619 .sp .5v
2620 .RE
2621 .PP
2622+.\" ndb_restore: exclude-intermediate-sql-tables option
2623+.\" exclude-intermediate-sql-tables option (ndb_restore)
2624+\fB\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]\fR
2625+.TS
2626+allbox tab(:);
2627+l l s s
2628+l l s s
2629+l l s s
2630+^ l l s
2631+^ l l s.
2632+T{
2633+\fBIntroduced\fR
2634+T}:T{
2635+5\&.5\&.37\-ndb\-7\&.2\&.17
2636+T}
2637+T{
2638+\fBCommand\-Line Format\fR
2639+T}:T{
2640+\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]
2641+T}
2642+T{
2643+\ \&
2644+T}:T{
2645+\fBPermitted Values\fR
2646+T}
2647+:T{
2648+\fBType\fR
2649+T}:T{
2650+boolean
2651+T}
2652+:T{
2653+\fBDefault\fR
2654+T}:T{
2655+TRUE
2656+T}
2657+.TE
2658+.sp 1
2659+.PP
2660+When performing copying
2661+ALTER TABLE
2662+operations,
2663+\fBmysqld\fR
2664+creates intermediate tables (whose names are prefixed with
2665+#sql\-)\&. When
2666+TRUE, the
2667+\fB\-\-exclude\-intermediate\-sql\-tables\fR
2668+option keeps
2669+\fBndb_restore\fR
2670+from restoring such tables that may have been left over from such operations\&. This option is
2671+TRUE
2672+by default\&.
2673+.PP
2674+The
2675+\fB\-\-exclude\-intermediate\-sql\-tables\fR
2676+option was introduced in MySQL Cluster NDB 7\&.2\&.17\&. (Bug #17882305)
2677+.PP
2678 \fBError reporting\fR. .\" ndb_restore: errors
2679 \fBndb_restore\fR
2680 reports both temporary and permanent errors\&. In the case of temporary errors, it may able to recover from them, and reports
2681
2682=== modified file 'man/ndb_select_all.1'
2683--- man/ndb_select_all.1 2014-06-03 13:14:25 +0000
2684+++ man/ndb_select_all.1 2014-08-22 10:00:31 +0000
2685@@ -2,12 +2,12 @@
2686 .\" Title: \fBndb_select_all\fR
2687 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2688 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2689-.\" Date: 05/11/2014
2690+.\" Date: 07/18/2014
2691 .\" Manual: MySQL Database System
2692 .\" Source: MySQL 5.5
2693 .\" Language: English
2694 .\"
2695-.TH "\FBNDB_SELECT_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2696+.TH "\FBNDB_SELECT_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2697 .\" -----------------------------------------------------------------
2698 .\" * Define some portability stuff
2699 .\" -----------------------------------------------------------------
2700@@ -61,7 +61,7 @@
2701 .nr an-no-space-flag 1
2702 .nr an-break-flag 1
2703 .br
2704-.B Table\ \&17.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.2
2705+.B Table\ \&18.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.2
2706 .TS
2707 allbox tab(:);
2708 lB lB lB.
2709@@ -454,8 +454,8 @@
2710 Adds a
2711 GCI
2712 column to the output showing the global checkpoint at which each row was last updated\&. See
2713-Section\ \&17.1, \(lqMySQL Cluster Overview\(rq, and
2714-Section\ \&17.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
2715+Section\ \&18.1, \(lqMySQL Cluster Overview\(rq, and
2716+Section\ \&18.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
2717 .RE
2718 .sp
2719 .RS 4
2720
2721=== modified file 'man/ndb_select_count.1'
2722--- man/ndb_select_count.1 2014-06-03 13:14:25 +0000
2723+++ man/ndb_select_count.1 2014-08-22 10:00:31 +0000
2724@@ -2,12 +2,12 @@
2725 .\" Title: \fBndb_select_count\fR
2726 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2727 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2728-.\" Date: 05/11/2014
2729+.\" Date: 07/18/2014
2730 .\" Manual: MySQL Database System
2731 .\" Source: MySQL 5.5
2732 .\" Language: English
2733 .\"
2734-.TH "\FBNDB_SELECT_COUNT\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2735+.TH "\FBNDB_SELECT_COUNT\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2736 .\" -----------------------------------------------------------------
2737 .\" * Define some portability stuff
2738 .\" -----------------------------------------------------------------
2739@@ -61,7 +61,7 @@
2740 .nr an-no-space-flag 1
2741 .nr an-break-flag 1
2742 .br
2743-.B Table\ \&17.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.2
2744+.B Table\ \&18.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.2
2745 .TS
2746 allbox tab(:);
2747 lB lB lB.
2748
2749=== modified file 'man/ndb_show_tables.1'
2750--- man/ndb_show_tables.1 2014-06-03 13:14:25 +0000
2751+++ man/ndb_show_tables.1 2014-08-22 10:00:31 +0000
2752@@ -2,12 +2,12 @@
2753 .\" Title: \fBndb_show_tables\fR
2754 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2755 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2756-.\" Date: 05/11/2014
2757+.\" Date: 07/18/2014
2758 .\" Manual: MySQL Database System
2759 .\" Source: MySQL 5.5
2760 .\" Language: English
2761 .\"
2762-.TH "\FBNDB_SHOW_TABLES\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2763+.TH "\FBNDB_SHOW_TABLES\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2764 .\" -----------------------------------------------------------------
2765 .\" * Define some portability stuff
2766 .\" -----------------------------------------------------------------
2767@@ -52,7 +52,7 @@
2768 .nr an-no-space-flag 1
2769 .nr an-break-flag 1
2770 .br
2771-.B Table\ \&17.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.2
2772+.B Table\ \&18.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.2
2773 .TS
2774 allbox tab(:);
2775 lB lB lB.
2776
2777=== modified file 'man/ndb_size.pl.1'
2778--- man/ndb_size.pl.1 2014-06-03 13:14:25 +0000
2779+++ man/ndb_size.pl.1 2014-08-22 10:00:31 +0000
2780@@ -2,12 +2,12 @@
2781 .\" Title: \fBndb_size.pl\fR
2782 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2783 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2784-.\" Date: 05/11/2014
2785+.\" Date: 07/18/2014
2786 .\" Manual: MySQL Database System
2787 .\" Source: MySQL 5.5
2788 .\" Language: English
2789 .\"
2790-.TH "\FBNDB_SIZE\&.PL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2791+.TH "\FBNDB_SIZE\&.PL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2792 .\" -----------------------------------------------------------------
2793 .\" * Define some portability stuff
2794 .\" -----------------------------------------------------------------
2795@@ -102,7 +102,7 @@
2796 .nr an-no-space-flag 1
2797 .nr an-break-flag 1
2798 .br
2799-.B Table\ \&17.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2
2800+.B Table\ \&18.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2
2801 .TS
2802 allbox tab(:);
2803 lB lB lB.
2804
2805=== modified file 'man/ndb_waiter.1'
2806--- man/ndb_waiter.1 2014-06-03 13:14:25 +0000
2807+++ man/ndb_waiter.1 2014-08-22 10:00:31 +0000
2808@@ -2,12 +2,12 @@
2809 .\" Title: \fBndb_waiter\fR
2810 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2811 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2812-.\" Date: 05/11/2014
2813+.\" Date: 07/18/2014
2814 .\" Manual: MySQL Database System
2815 .\" Source: MySQL 5.5
2816 .\" Language: English
2817 .\"
2818-.TH "\FBNDB_WAITER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2819+.TH "\FBNDB_WAITER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2820 .\" -----------------------------------------------------------------
2821 .\" * Define some portability stuff
2822 .\" -----------------------------------------------------------------
2823@@ -142,7 +142,7 @@
2824 .nr an-no-space-flag 1
2825 .nr an-break-flag 1
2826 .br
2827-.B Table\ \&17.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2
2828+.B Table\ \&18.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2
2829 .TS
2830 allbox tab(:);
2831 lB lB lB.
2832
2833=== modified file 'man/ndbd.8'
2834--- man/ndbd.8 2014-06-03 13:14:25 +0000
2835+++ man/ndbd.8 2014-08-22 10:00:31 +0000
2836@@ -2,12 +2,12 @@
2837 .\" Title: \fBndbd\fR
2838 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2839 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2840-.\" Date: 05/11/2014
2841+.\" Date: 07/18/2014
2842 .\" Manual: MySQL Database System
2843 .\" Source: MySQL 5.5
2844 .\" Language: English
2845 .\"
2846-.TH "\FBNDBD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2847+.TH "\FBNDBD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2848 .\" -----------------------------------------------------------------
2849 .\" * Define some portability stuff
2850 .\" -----------------------------------------------------------------
2851@@ -59,7 +59,7 @@
2852 .nr an-no-space-flag 1
2853 .nr an-break-flag 1
2854 .br
2855-.B Table\ \&17.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.2
2856+.B Table\ \&18.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.2
2857 .TS
2858 allbox tab(:);
2859 lB lB lB.
2860@@ -556,7 +556,7 @@
2861 .IP \(bu 2.3
2862 .\}
2863 MySQL Cluster Disk Data files (see
2864-Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
2865+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
2866 .RE
2867 .sp
2868 This 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\&.
2869@@ -756,7 +756,7 @@
2870 connects 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
2871 START
2872 command in the management client (see
2873-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
2874+Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
2875 .RE
2876 .sp
2877 .RS 4
2878@@ -1163,7 +1163,7 @@
2879 .\}
2880 .PP
2881 See
2882-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
2883+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
2884 \fBndbd\fR(8), describes other options for
2885 \fBndbd\fR\&.
2886 .PP
2887@@ -1189,7 +1189,7 @@
2888 For a machine with many CPUs it is possible to use several
2889 \fBndbd\fR
2890 processes 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
2891-Section\ \&17.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
2892+Section\ \&18.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
2893 .SH "COPYRIGHT"
2894 .br
2895 .PP
2896
2897=== modified file 'man/ndbd_redo_log_reader.1'
2898--- man/ndbd_redo_log_reader.1 2014-06-03 13:14:25 +0000
2899+++ man/ndbd_redo_log_reader.1 2014-08-22 10:00:31 +0000
2900@@ -2,12 +2,12 @@
2901 .\" Title: \fBndbd_redo_log_reader\fR
2902 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2903 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2904-.\" Date: 05/11/2014
2905+.\" Date: 07/18/2014
2906 .\" Manual: MySQL Database System
2907 .\" Source: MySQL 5.5
2908 .\" Language: English
2909 .\"
2910-.TH "\FBNDBD_REDO_LOG_REA" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2911+.TH "\FBNDBD_REDO_LOG_REA" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2912 .\" -----------------------------------------------------------------
2913 .\" * Define some portability stuff
2914 .\" -----------------------------------------------------------------
2915@@ -55,7 +55,7 @@
2916 .nr an-no-space-flag 1
2917 .nr an-break-flag 1
2918 .br
2919-.B Table\ \&17.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.2
2920+.B Table\ \&18.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.2
2921 .TS
2922 allbox tab(:);
2923 lB lB lB.
2924
2925=== modified file 'man/ndbinfo_select_all.1'
2926--- man/ndbinfo_select_all.1 2014-06-03 13:14:25 +0000
2927+++ man/ndbinfo_select_all.1 2014-08-22 10:00:31 +0000
2928@@ -2,12 +2,12 @@
2929 .\" Title: \fBndbinfo_select_all\fR
2930 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2931 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2932-.\" Date: 05/11/2014
2933+.\" Date: 07/18/2014
2934 .\" Manual: MySQL Database System
2935 .\" Source: MySQL 5.5
2936 .\" Language: English
2937 .\"
2938-.TH "\FBNDBINFO_SELECT_AL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2939+.TH "\FBNDBINFO_SELECT_AL" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2940 .\" -----------------------------------------------------------------
2941 .\" * Define some portability stuff
2942 .\" -----------------------------------------------------------------
2943@@ -121,7 +121,7 @@
2944 .nr an-no-space-flag 1
2945 .nr an-break-flag 1
2946 .br
2947-.B Table\ \&17.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2
2948+.B Table\ \&18.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2
2949 .TS
2950 allbox tab(:);
2951 lB lB lB.
2952
2953=== modified file 'man/ndbmtd.8'
2954--- man/ndbmtd.8 2014-06-03 13:14:25 +0000
2955+++ man/ndbmtd.8 2014-08-22 10:00:31 +0000
2956@@ -2,12 +2,12 @@
2957 .\" Title: \fBndbmtd\fR
2958 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2959 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2960-.\" Date: 05/11/2014
2961+.\" Date: 07/18/2014
2962 .\" Manual: MySQL Database System
2963 .\" Source: MySQL 5.5
2964 .\" Language: English
2965 .\"
2966-.TH "\FBNDBMTD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2967+.TH "\FBNDBMTD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2968 .\" -----------------------------------------------------------------
2969 .\" * Define some portability stuff
2970 .\" -----------------------------------------------------------------
2971@@ -59,7 +59,7 @@
2972 also apply to
2973 \fBndbmtd\fR\&. For more information about these options and parameters, see
2974 \fBndbd\fR(8), and
2975-Section\ \&17.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
2976+Section\ \&18.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
2977 .PP
2978 \fBndbmtd\fR
2979 is also file system\-compatible with
2980
2981=== modified file 'man/perror.1'
2982--- man/perror.1 2014-06-03 13:14:25 +0000
2983+++ man/perror.1 2014-08-22 10:00:31 +0000
2984@@ -2,12 +2,12 @@
2985 .\" Title: \fBperror\fR
2986 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2987 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2988-.\" Date: 05/11/2014
2989+.\" Date: 07/18/2014
2990 .\" Manual: MySQL Database System
2991 .\" Source: MySQL 5.5
2992 .\" Language: English
2993 .\"
2994-.TH "\FBPERROR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2995+.TH "\FBPERROR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2996 .\" -----------------------------------------------------------------
2997 .\" * Define some portability stuff
2998 .\" -----------------------------------------------------------------
2999
3000=== modified file 'man/replace.1'
3001--- man/replace.1 2014-06-03 13:14:25 +0000
3002+++ man/replace.1 2014-08-22 10:00:31 +0000
3003@@ -2,12 +2,12 @@
3004 .\" Title: \fBreplace\fR
3005 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3006 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3007-.\" Date: 05/11/2014
3008+.\" Date: 07/18/2014
3009 .\" Manual: MySQL Database System
3010 .\" Source: MySQL 5.5
3011 .\" Language: English
3012 .\"
3013-.TH "\FBREPLACE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3014+.TH "\FBREPLACE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3015 .\" -----------------------------------------------------------------
3016 .\" * Define some portability stuff
3017 .\" -----------------------------------------------------------------
3018
3019=== modified file 'man/resolve_stack_dump.1'
3020--- man/resolve_stack_dump.1 2014-06-03 13:14:25 +0000
3021+++ man/resolve_stack_dump.1 2014-08-22 10:00:31 +0000
3022@@ -2,12 +2,12 @@
3023 .\" Title: \fBresolve_stack_dump\fR
3024 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3025 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3026-.\" Date: 05/11/2014
3027+.\" Date: 07/18/2014
3028 .\" Manual: MySQL Database System
3029 .\" Source: MySQL 5.5
3030 .\" Language: English
3031 .\"
3032-.TH "\FBRESOLVE_STACK_DUM" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3033+.TH "\FBRESOLVE_STACK_DUM" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3034 .\" -----------------------------------------------------------------
3035 .\" * Define some portability stuff
3036 .\" -----------------------------------------------------------------
3037@@ -125,7 +125,7 @@
3038 .RE
3039 .PP
3040 For more information, see
3041-Section\ \&23.4.1.5, \(lqUsing a Stack Trace\(rq\&.
3042+Section\ \&24.4.1.5, \(lqUsing a Stack Trace\(rq\&.
3043 .SH "COPYRIGHT"
3044 .br
3045 .PP
3046
3047=== modified file 'man/resolveip.1'
3048--- man/resolveip.1 2014-06-03 13:14:25 +0000
3049+++ man/resolveip.1 2014-08-22 10:00:31 +0000
3050@@ -2,12 +2,12 @@
3051 .\" Title: \fBresolveip\fR
3052 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3053 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3054-.\" Date: 05/11/2014
3055+.\" Date: 07/18/2014
3056 .\" Manual: MySQL Database System
3057 .\" Source: MySQL 5.5
3058 .\" Language: English
3059 .\"
3060-.TH "\FBRESOLVEIP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3061+.TH "\FBRESOLVEIP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3062 .\" -----------------------------------------------------------------
3063 .\" * Define some portability stuff
3064 .\" -----------------------------------------------------------------
3065
3066=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_slave.test'
3067--- mysql-test/extra/rpl_tests/rpl_stop_slave.test 2010-12-20 14:15:01 +0000
3068+++ mysql-test/extra/rpl_tests/rpl_stop_slave.test 2014-08-22 10:00:31 +0000
3069@@ -42,6 +42,10 @@
3070 connection slave1;
3071 --echo # To resume slave SQL thread
3072 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
3073+# wait for the sql thread to come out of the
3074+# waiting phase before resetting the signals
3075+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and info LIKE '%INSERT INTO t1 VALUES (1)%'
3076+--source include/wait_condition.inc
3077 SET DEBUG_SYNC= 'RESET';
3078
3079 --echo
3080
3081=== added file 'mysql-test/include/stop_dump_threads.inc'
3082--- mysql-test/include/stop_dump_threads.inc 1970-01-01 00:00:00 +0000
3083+++ mysql-test/include/stop_dump_threads.inc 2014-08-22 10:00:31 +0000
3084@@ -0,0 +1,32 @@
3085+# ==== Purpose ====
3086+#
3087+# Stop all dump threads on the server of the current connection.
3088+#
3089+# ==== Usage ====
3090+#
3091+# --source include/stop_dump_threads.inc
3092+
3093+--let $include_filename= stop_dump_threads.inc
3094+--source include/begin_include_file.inc
3095+
3096+
3097+--let $_sdt_show_rpl_debug_info_old= $show_rpl_debug_info
3098+--let $show_rpl_debug_info= 1
3099+--disable_query_log
3100+--disable_result_log
3101+
3102+--let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
3103+
3104+while ($_sdt_dump_thread_id != '')
3105+{
3106+ eval KILL $_sdt_dump_thread_id;
3107+ --let $wait_condition= SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = $_sdt_dump_thread_id
3108+ --source include/wait_condition.inc
3109+
3110+ --let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
3111+}
3112+
3113+--let $show_rpl_debug_info= $_sdt_show_rpl_debug_info_old
3114+
3115+--let $include_filename= stop_dump_threads.inc
3116+--source include/end_include_file.inc
3117
3118=== modified file 'mysql-test/include/uninstall_semisync.inc'
3119--- mysql-test/include/uninstall_semisync.inc 2013-03-29 03:58:31 +0000
3120+++ mysql-test/include/uninstall_semisync.inc 2014-08-22 10:00:31 +0000
3121@@ -13,6 +13,11 @@
3122 UNINSTALL PLUGIN rpl_semi_sync_slave;
3123
3124 --connection master
3125+# After BUG#17638477 fix, uninstallation of rpl_semi_sync_master
3126+# is not allowed when there are semi sync slaves. Hence kill
3127+# all dump threads before uninstalling it.
3128+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
3129+--source include/stop_dump_threads.inc
3130 UNINSTALL PLUGIN rpl_semi_sync_master;
3131 --enable_warnings
3132
3133
3134=== added file 'mysql-test/r/bug71858.result'
3135--- mysql-test/r/bug71858.result 1970-01-01 00:00:00 +0000
3136+++ mysql-test/r/bug71858.result 2014-08-22 10:00:31 +0000
3137@@ -0,0 +1,10 @@
3138+SELECT table_schema, table_name, column_name, column_type FROM INFORMATION_SCHEMA.COLUMNS
3139+WHERE TABLE_NAME IN ( 'ooooooooooooooooooooooooooooooooooooo' 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
3140+'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cc' 'ccccccccccccc' 'wwwwwwwwwwwwwwwwwww' 'rrrrrrrrrrrrrrrr'
3141+'tttttttttttttttttttt' 'yyyyyyyyyyyyyyyyyyy' 'uuuuuuuuuuuuuuuuuuuuuuuuuuuu' 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiii'
3142+'oooooooooooooooooooo' 'ppppppppppppppppppppppppppppp' 'jjjjjjjjjjjj' 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk'
3143+'lllllllllllllllllllllllllllllllllllllll' 'zzzzzzzzzzzzzzz' 'xxxxxxxxxxxxxxxxx' 'cccccccccc'
3144+'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
3145+'nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn' ) AND TABLE_SCHEMA='AA_BBB' AND COLUMN_TYPE='PRI'
3146+ORDER BY 2;
3147+table_schema table_name column_name column_type
3148
3149=== modified file 'mysql-test/r/failed_auth_3909.result'
3150--- mysql-test/r/failed_auth_3909.result 2013-04-30 11:48:24 +0000
3151+++ mysql-test/r/failed_auth_3909.result 2014-08-22 10:00:31 +0000
3152@@ -8,12 +8,12 @@
3153 Warning 1364 Field 'x509_subject' doesn't have a default value
3154 flush privileges;
3155 connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);
3156-ERROR HY000: Plugin 'bar' is not loaded
3157+ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
3158 connect(localhost,u2,,test,MASTER_PORT,MASTER_SOCKET);
3159 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)
3160 connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);
3161 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
3162-ERROR HY000: Plugin 'bar' is not loaded
3163+ERROR 28000: Access denied for user 'u1'@'localhost' (using password: NO)
3164 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: NO)
3165 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
3166 delete from mysql.user where plugin = 'bar';
3167
3168=== modified file 'mysql-test/r/group_min_max.result'
3169--- mysql-test/r/group_min_max.result 2013-05-13 11:45:25 +0000
3170+++ mysql-test/r/group_min_max.result 2014-08-22 10:00:31 +0000
3171@@ -3001,7 +3001,7 @@
3172 0 NULL
3173 EXPLAIN SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
3174 id select_type table type possible_keys key key_len ref rows Extra
3175-1 SIMPLE t2 range NULL a 5 NULL 9 Using index for group-by
3176+1 SIMPLE t2 index NULL a 15 NULL 16 Using index
3177 SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
3178 SUM(DISTINCT a) MAX(b)
3179 1 8
3180@@ -3029,7 +3029,7 @@
3181 168
3182 EXPLAIN SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
3183 id select_type table type possible_keys key key_len ref rows Extra
3184-1 SIMPLE t2 range NULL a 5 NULL 9 Using index for group-by
3185+1 SIMPLE t2 index NULL a 15 NULL 16 Using index
3186 SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
3187 (SUM(DISTINCT a) + MAX(b))
3188 9
3189@@ -3057,3 +3057,55 @@
3190 1 SIMPLE t1 range NULL PRIMARY 5 NULL 9 Using index for group-by (scanning)
3191 drop table t1;
3192 # End of test#50539.
3193+#
3194+# Bug#17217128 - BAD INTERACTION BETWEEN MIN/MAX AND
3195+# "HAVING SUM(DISTINCT)": WRONG RESULTS.
3196+#
3197+CREATE TABLE t (a INT, b INT, KEY(a,b));
3198+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
3199+ANALYZE TABLE t;
3200+Table Op Msg_type Msg_text
3201+test.t analyze status OK
3202+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
3203+a SUM(DISTINCT a) MIN(b)
3204+1 1 0
3205+2 2 2
3206+3 3 2
3207+4 4 4
3208+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
3209+id select_type table type possible_keys key key_len ref rows Extra
3210+1 SIMPLE t index NULL a 10 NULL 7 Using index
3211+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
3212+a SUM(DISTINCT a) MAX(b)
3213+1 1 1
3214+2 2 2
3215+3 3 3
3216+4 4 5
3217+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
3218+id select_type table type possible_keys key key_len ref rows Extra
3219+1 SIMPLE t index NULL a 10 NULL 7 Using index
3220+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
3221+a MAX(b)
3222+1 1
3223+2 2
3224+3 3
3225+4 5
3226+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
3227+id select_type table type possible_keys key key_len ref rows Extra
3228+1 SIMPLE t index NULL a 10 NULL 7 Using index
3229+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
3230+SUM(DISTINCT a) MIN(b) MAX(b)
3231+10 0 5
3232+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
3233+id select_type table type possible_keys key key_len ref rows Extra
3234+1 SIMPLE t index NULL a 10 NULL 7 Using index
3235+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
3236+a SUM(DISTINCT a) MIN(b) MAX(b)
3237+1 1 0 1
3238+2 2 2 2
3239+3 3 2 3
3240+4 4 4 5
3241+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
3242+id select_type table type possible_keys key key_len ref rows Extra
3243+1 SIMPLE t index NULL a 10 NULL 7 Using index
3244+DROP TABLE t;
3245
3246=== modified file 'mysql-test/r/group_min_max_innodb.result'
3247--- mysql-test/r/group_min_max_innodb.result 2013-05-23 08:39:28 +0000
3248+++ mysql-test/r/group_min_max_innodb.result 2014-08-22 10:00:31 +0000
3249@@ -118,3 +118,171 @@
3250 1
3251 DROP TABLE t1;
3252 End of 5.5 tests
3253+#
3254+# Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
3255+#
3256+CREATE TABLE t0 (
3257+i1 INTEGER NOT NULL
3258+);
3259+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
3260+(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
3261+(21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
3262+CREATE TABLE t1 (
3263+c1 CHAR(1) NOT NULL,
3264+i1 INTEGER NOT NULL,
3265+i2 INTEGER NOT NULL,
3266+UNIQUE KEY k1 (c1,i2)
3267+) ENGINE=InnoDB;
3268+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
3269+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
3270+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
3271+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
3272+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
3273+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
3274+CREATE TABLE t2 (
3275+c1 CHAR(1) NOT NULL,
3276+i1 INTEGER NOT NULL,
3277+i2 INTEGER NOT NULL,
3278+UNIQUE KEY k2 (c1,i1,i2)
3279+) ENGINE=InnoDB;
3280+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
3281+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
3282+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
3283+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
3284+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
3285+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
3286+ANALYZE TABLE t1;
3287+ANALYZE TABLE t2;
3288+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
3289+GROUP BY c1;
3290+id select_type table type possible_keys key key_len ref rows Extra
3291+1 SIMPLE t1 range k1 k1 5 NULL 31 Using where; Using index
3292+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
3293+GROUP BY c1;
3294+c1 max(i2)
3295+C 17
3296+F 30
3297+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
3298+GROUP BY c1;
3299+id select_type table type possible_keys key key_len ref rows Extra
3300+1 SIMPLE t1 range k1 k1 5 NULL 31 Using where; Using index
3301+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
3302+GROUP BY c1;
3303+c1 max(i2)
3304+C 30
3305+F 17
3306+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
3307+GROUP BY c1;
3308+id select_type table type possible_keys key key_len ref rows Extra
3309+1 SIMPLE t1 range k1 k1 5 NULL 1 Using where; Using index for group-by
3310+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
3311+GROUP BY c1;
3312+c1 max(i2)
3313+C 17
3314+F 17
3315+EXPLAIN SELECT c1, max(i2) FROM t1
3316+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
3317+GROUP BY c1;
3318+id select_type table type possible_keys key key_len ref rows Extra
3319+1 SIMPLE t1 range k1 k1 5 NULL 3 Using where; Using index
3320+SELECT c1, max(i2) FROM t1
3321+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
3322+GROUP BY c1;
3323+c1 max(i2)
3324+C 30
3325+EXPLAIN SELECT c1, i1, max(i2) FROM t2
3326+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
3327+GROUP BY c1,i1;
3328+id select_type table type possible_keys key key_len ref rows Extra
3329+1 SIMPLE t2 range k2 k2 9 NULL 59 Using where; Using index for group-by
3330+SELECT c1, i1, max(i2) FROM t2
3331+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
3332+GROUP BY c1,i1;
3333+c1 i1 max(i2)
3334+C 17 17
3335+F 17 17
3336+EXPLAIN SELECT c1, i1, max(i2) FROM t2
3337+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
3338+GROUP BY c1,i1;
3339+id select_type table type possible_keys key key_len ref rows Extra
3340+1 SIMPLE t2 range k2 k2 9 NULL 58 Using where; Using index for group-by
3341+SELECT c1, i1, max(i2) FROM t2
3342+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
3343+GROUP BY c1,i1;
3344+c1 i1 max(i2)
3345+C 17 17
3346+F 17 17
3347+EXPLAIN SELECT c1, i1, max(i2) FROM t2
3348+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
3349+GROUP BY c1,i1;
3350+id select_type table type possible_keys key key_len ref rows Extra
3351+1 SIMPLE t2 range k2 k2 5 NULL 181 Using where; Using index for group-by
3352+SELECT c1, i1, max(i2) FROM t2
3353+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
3354+GROUP BY c1,i1;
3355+c1 i1 max(i2)
3356+A 17 17
3357+B 17 17
3358+C 1 1
3359+C 2 2
3360+C 3 3
3361+C 4 4
3362+C 5 5
3363+C 6 6
3364+C 7 7
3365+C 8 8
3366+C 9 9
3367+C 10 10
3368+C 11 11
3369+C 12 12
3370+C 13 13
3371+C 14 14
3372+C 15 15
3373+C 16 16
3374+C 17 17
3375+C 18 18
3376+C 19 19
3377+C 20 20
3378+C 21 21
3379+C 22 22
3380+C 23 23
3381+C 24 24
3382+C 25 25
3383+C 26 26
3384+C 27 27
3385+C 28 28
3386+C 29 29
3387+C 30 30
3388+D 17 17
3389+E 17 17
3390+F 1 1
3391+F 2 2
3392+F 3 3
3393+F 4 4
3394+F 5 5
3395+F 6 6
3396+F 7 7
3397+F 8 8
3398+F 9 9
3399+F 10 10
3400+F 11 11
3401+F 12 12
3402+F 13 13
3403+F 14 14
3404+F 15 15
3405+F 16 16
3406+F 17 17
3407+F 18 18
3408+F 19 19
3409+F 20 20
3410+F 21 21
3411+F 22 22
3412+F 23 23
3413+F 24 24
3414+F 25 25
3415+F 26 26
3416+F 27 27
3417+F 28 28
3418+F 29 29
3419+F 30 30
3420+DROP TABLE t0,t1,t2;
3421
3422=== modified file 'mysql-test/r/mysqld--help-notwin.result'
3423--- mysql-test/r/mysqld--help-notwin.result 2014-01-23 05:14:14 +0000
3424+++ mysql-test/r/mysqld--help-notwin.result 2014-08-22 10:00:31 +0000
3425@@ -792,8 +792,8 @@
3426 --thread-statistics Control TABLE_STATISTICS running, when userstat is
3427 enabled
3428 --time-format=name The TIME format (ignored)
3429- --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
3430- currently supported)
3431+ --timed-mutexes Specify whether to time mutexes. Deprecated, has no
3432+ effect.
3433 --tmp-table-size=# If an internal in-memory temporary table exceeds this
3434 size, MySQL will automatically convert it to an on-disk
3435 MyISAM table
3436
3437=== modified file 'mysql-test/r/mysqld--help-win.result'
3438--- mysql-test/r/mysqld--help-win.result 2014-01-23 05:14:14 +0000
3439+++ mysql-test/r/mysqld--help-win.result 2014-08-22 10:00:31 +0000
3440@@ -750,8 +750,8 @@
3441 one-thread-per-connection, no-threads, pool-of-threads
3442 --thread-stack=# The stack size for each thread
3443 --time-format=name The TIME format (ignored)
3444- --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
3445- currently supported)
3446+ --timed-mutexes Specify whether to time mutexes. Deprecated, has no
3447+ effect.
3448 --tmp-table-size=# If an internal in-memory temporary table exceeds this
3449 size, MySQL will automatically convert it to an on-disk
3450 MyISAM table
3451
3452=== modified file 'mysql-test/r/partition_archive.result'
3453--- mysql-test/r/partition_archive.result 2009-08-11 12:18:26 +0000
3454+++ mysql-test/r/partition_archive.result 2014-08-22 10:00:31 +0000
3455@@ -126,3 +126,29 @@
3456 count(*)
3457 100
3458 drop table t1;
3459+#
3460+#BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
3461+# CORRUPTS FRM
3462+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
3463+PARTITIONS 5;
3464+SHOW CREATE TABLE t1;
3465+Table Create Table
3466+t1 CREATE TABLE `t1` (
3467+ `fld1` int(11) NOT NULL,
3468+ PRIMARY KEY (`fld1`)
3469+) ENGINE=MyISAM DEFAULT CHARSET=latin1
3470+/*!50100 PARTITION BY HASH (fld1)
3471+PARTITIONS 5 */
3472+ALTER TABLE t1 ENGINE= ARCHIVE;
3473+ERROR HY000: Can't create table 'test.#sql-temporary' (errno: 1)
3474+#After the patch, the ENGINE is correctly displayed as MyISAM
3475+SHOW CREATE TABLE t1;
3476+Table Create Table
3477+t1 CREATE TABLE `t1` (
3478+ `fld1` int(11) NOT NULL,
3479+ PRIMARY KEY (`fld1`)
3480+) ENGINE=MyISAM DEFAULT CHARSET=latin1
3481+/*!50100 PARTITION BY HASH (fld1)
3482+PARTITIONS 5 */
3483+#Cleanup.
3484+DROP TABLE t1;
3485
3486=== modified file 'mysql-test/r/partition_pruning.result'
3487--- mysql-test/r/partition_pruning.result 2012-03-14 20:57:15 +0000
3488+++ mysql-test/r/partition_pruning.result 2014-08-22 10:00:31 +0000
3489@@ -3294,3 +3294,117 @@
3490 id select_type table partitions type possible_keys key key_len ref rows Extra
3491 1 SIMPLE t1 p0,p1,p2 ALL NULL NULL NULL NULL 100 Using where
3492 drop table t0, t1;
3493+#
3494+# Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
3495+#
3496+CREATE TABLE t1
3497+(c1 int,
3498+c2 int,
3499+c3 int,
3500+c4 int,
3501+PRIMARY KEY (c1,c2))
3502+PARTITION BY LIST COLUMNS (c2)
3503+(PARTITION p1 VALUES IN (1,2),
3504+PARTITION p2 VALUES IN (3,4));
3505+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
3506+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
3507+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
3508+c1 c2 c3 c4
3509+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
3510+c1 c2 c3 c4
3511+1 1 1 1
3512+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
3513+c1 c2 c3 c4
3514+1 1 1 1
3515+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
3516+c1 c2 c3 c4
3517+1 1 1 1
3518+1 2 1 1
3519+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
3520+c1 c2 c3 c4
3521+1 2 1 1
3522+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
3523+c1 c2 c3 c4
3524+1 1 1 1
3525+1 2 1 1
3526+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
3527+c1 c2 c3 c4
3528+1 1 1 1
3529+1 2 1 1
3530+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
3531+c1 c2 c3 c4
3532+2 3 1 1
3533+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
3534+c1 c2 c3 c4
3535+2 3 1 1
3536+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
3537+c1 c2 c3 c4
3538+2 3 1 1
3539+2 4 1 1
3540+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
3541+c1 c2 c3 c4
3542+2 4 1 1
3543+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
3544+c1 c2 c3 c4
3545+2 3 1 1
3546+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
3547+c1 c2 c3 c4
3548+2 3 1 1
3549+2 4 1 1
3550+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
3551+c1 c2 c3 c4
3552+2 4 1 1
3553+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
3554+c1 c2 c3 c4
3555+2 4 1 1
3556+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
3557+c1 c2 c3 c4
3558+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
3559+id select_type table partitions type possible_keys key key_len ref rows Extra
3560+1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
3561+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
3562+id select_type table partitions type possible_keys key key_len ref rows Extra
3563+1 SIMPLE t1 p1 range PRIMARY PRIMARY 8 NULL 1 Using where
3564+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
3565+id select_type table partitions type possible_keys key key_len ref rows Extra
3566+1 SIMPLE t1 p1 const PRIMARY PRIMARY 8 const,const 1
3567+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
3568+id select_type table partitions type possible_keys key key_len ref rows Extra
3569+1 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3570+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
3571+id select_type table partitions type possible_keys key key_len ref rows Extra
3572+1 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3573+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
3574+id select_type table partitions type possible_keys key key_len ref rows Extra
3575+1 SIMPLE t1 p1 range PRIMARY PRIMARY 8 NULL 1 Using where
3576+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
3577+id select_type table partitions type possible_keys key key_len ref rows Extra
3578+1 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3579+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
3580+id select_type table partitions type possible_keys key key_len ref rows Extra
3581+1 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3582+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
3583+id select_type table partitions type possible_keys key key_len ref rows Extra
3584+1 SIMPLE t1 p2 const PRIMARY PRIMARY 8 const,const 1
3585+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
3586+id select_type table partitions type possible_keys key key_len ref rows Extra
3587+1 SIMPLE t1 p2 range PRIMARY PRIMARY 8 NULL 1 Using where
3588+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
3589+id select_type table partitions type possible_keys key key_len ref rows Extra
3590+1 SIMPLE t1 p2 range PRIMARY PRIMARY 8 NULL 1 Using where
3591+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
3592+id select_type table partitions type possible_keys key key_len ref rows Extra
3593+1 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3594+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
3595+id select_type table partitions type possible_keys key key_len ref rows Extra
3596+1 SIMPLE t1 p1,p2 range PRIMARY PRIMARY 8 NULL 2 Using where
3597+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
3598+id select_type table partitions type possible_keys key key_len ref rows Extra
3599+1 SIMPLE t1 p2 const PRIMARY PRIMARY 8 const,const 1
3600+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
3601+id select_type table partitions type possible_keys key key_len ref rows Extra
3602+1 SIMPLE t1 p2 range PRIMARY PRIMARY 8 NULL 1 Using where
3603+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
3604+id select_type table partitions type possible_keys key key_len ref rows Extra
3605+1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
3606+DROP TABLE t1;
3607
3608=== modified file 'mysql-test/r/percona_bug1289599.result'
3609--- mysql-test/r/percona_bug1289599.result 2014-03-13 18:25:59 +0000
3610+++ mysql-test/r/percona_bug1289599.result 2014-08-22 10:00:31 +0000
3611@@ -1,8 +1,8 @@
3612 update mysql.user set plugin='auth_socket';
3613 flush privileges;
3614 connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
3615-ERROR HY000: Plugin 'auth_socket' is not loaded
3616-ERROR HY000: Plugin 'auth_socket' is not loaded
3617+ERROR 28000: Access denied for user 'USER'@'localhost' (using password: NO)
3618+ERROR 28000: Access denied for user 'USER'@'localhost' (using password: NO)
3619 install plugin auth_socket soname 'auth_socket.so';
3620 connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
3621 Got one of the listed errors
3622
3623=== modified file 'mysql-test/r/plugin.result'
3624--- mysql-test/r/plugin.result 2013-05-19 18:08:06 +0000
3625+++ mysql-test/r/plugin.result 2014-08-22 10:00:31 +0000
3626@@ -143,3 +143,73 @@
3627 @@SESSION.example_double_thdvar
3628 1000.500000
3629 UNINSTALL PLUGIN example;
3630+#
3631+# BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
3632+#
3633+CREATE PROCEDURE p_install()
3634+BEGIN
3635+INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
3636+END
3637+|
3638+CREATE PROCEDURE p_show_vars()
3639+BEGIN
3640+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
3641+END|
3642+connect con1, localhost, root,,;
3643+# Case 18008907_1: Deadlock situation cause by
3644+# con1: has LOCK_system_variables_hash and waits on LOCK_plugin AND
3645+# default: has LOCK_plugin and waits on LOCK_system_variables_hash.
3646+#
3647+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
3648+call p_show_vars();;
3649+connection default;
3650+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
3651+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
3652+call p_install();;
3653+connection con1;
3654+COUNT(*)
3655+#
3656+SET DEBUG_SYNC='RESET';
3657+connection default;
3658+ERROR HY000: Can't open shared library
3659+SET DEBUG_SYNC='RESET';
3660+# Case 18008907_2: Deadlock situation caused by
3661+# default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
3662+# con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
3663+# con2: has LOCK_global_system_variables and waits on LOCK_plugin.
3664+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
3665+call p_show_vars();;
3666+connection con1;
3667+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
3668+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
3669+call p_install();;
3670+connect con2, localhost, root,,;
3671+SET DEBUG_SYNC='now WAIT_FOR create_connection';
3672+connection con1;
3673+ERROR HY000: Can't open shared library
3674+connection default;
3675+COUNT(*)
3676+#
3677+Warnings:
3678+# 1639 debug sync point wait timed out
3679+disconnect con2;
3680+# Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
3681+INSTALL PLUGIN example SONAME 'ha_example.so';
3682+connection con1;
3683+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
3684+call p_show_vars();;
3685+connect con2, localhost, root,,;
3686+SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
3687+UNINSTALL PLUGIN example;;
3688+connection default;
3689+SET DEBUG_SYNC='now SIGNAL go';
3690+connection con1;
3691+COUNT(*)
3692+#
3693+connection con2;
3694+connection default;
3695+DROP PROCEDURE p_show_vars;
3696+DROP PROCEDURE p_install;
3697+SET DEBUG_SYNC='RESET';
3698+disconnect con1;
3699+disconnect con2;
3700
3701=== modified file 'mysql-test/r/plugin_auth_qa_3.result'
3702--- mysql-test/r/plugin_auth_qa_3.result 2010-10-22 08:20:17 +0000
3703+++ mysql-test/r/plugin_auth_qa_3.result 2014-08-22 10:00:31 +0000
3704@@ -6,6 +6,6 @@
3705 current_user() user() @@local.proxy_user @@local.external_user
3706 qa_test_11_dest@% qa_test_11_user@localhost 'qa_test_11_user'@'%' 'qa_test_11_user'@'%'
3707 exec 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
3708-ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: NO)
3709+ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: YES)
3710 DROP USER qa_test_11_user, qa_test_11_dest;
3711 DROP DATABASE test_user_db;
3712
3713=== added file 'mysql-test/r/show_processlist.result'
3714--- mysql-test/r/show_processlist.result 1970-01-01 00:00:00 +0000
3715+++ mysql-test/r/show_processlist.result 2014-08-22 10:00:31 +0000
3716@@ -0,0 +1,47 @@
3717+Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
3718+SHOW BINLOGS
3719+connect connection1,localhost,root,,test,$MASTER_MYPORT,;
3720+connection default;
3721+SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
3722+SHOW PROCESSLIST;
3723+connection connection1;
3724+"Wait_for parked1"
3725+SET DEBUG_SYNC='now WAIT_FOR parked1';
3726+connect connection2,localhost,root,,test,$MASTER_MYPORT,;
3727+connect connection3,localhost,root,,test,$MASTER_MYPORT,;
3728+SET DEBUG_SYNC='now SIGNAL go';
3729+connection default;
3730+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
3731+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3732+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3733+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3734+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3735+SET DEBUG_SYNC='after_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
3736+SHOW PROCESSLIST;
3737+connection connection1;
3738+"Wait_for parked1"
3739+SET DEBUG_SYNC='now WAIT_FOR parked1';
3740+connect connection4,localhost,root,,test,$MASTER_MYPORT,;
3741+connect connection5,localhost,root,,test,$MASTER_MYPORT,;
3742+SET DEBUG_SYNC='now SIGNAL go';
3743+connection default;
3744+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
3745+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3746+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3747+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3748+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3749+SHOW PROCESSLIST;
3750+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
3751+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3752+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3753+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3754+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3755+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3756+<Id> root <Host> test <Command> <Time> <State> <Info> X X X
3757+"Cleanup"
3758+SET DEBUG_SYNC='RESET';
3759+disconnect connection1;
3760+disconnect connection2;
3761+disconnect connection3;
3762+disconnect connection4;
3763+disconnect connection5;
3764
3765=== modified file 'mysql-test/r/union.result'
3766--- mysql-test/r/union.result 2011-07-11 09:27:52 +0000
3767+++ mysql-test/r/union.result 2014-08-22 10:00:31 +0000
3768@@ -1826,3 +1826,37 @@
3769 SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
3770 dev
3771 1
3772+#
3773+# Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
3774+#
3775+SET @old_slow_query_log= @@global.slow_query_log;
3776+SET @old_log_output= @@global.log_output;
3777+SET @old_long_query_time= @@long_query_time;
3778+SET GLOBAL log_output= "TABLE";
3779+SET GLOBAL slow_query_log= ON;
3780+SET SESSION long_query_time= 0;
3781+CREATE TABLE t17059925 (a INT);
3782+CREATE TABLE t2 (b INT);
3783+CREATE TABLE t3 (c INT);
3784+INSERT INTO t17059925 VALUES (1), (2), (3);
3785+INSERT INTO t2 VALUES (4), (5), (6);
3786+INSERT INTO t3 VALUES (7), (8), (9);
3787+TRUNCATE table mysql.slow_log;
3788+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
3789+a
3790+1
3791+2
3792+3
3793+4
3794+5
3795+6
3796+7
3797+8
3798+9
3799+SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
3800+sql_text rows_examined
3801+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3 18
3802+DROP TABLE t17059925, t2, t3;
3803+SET @@long_query_time= @old_long_query_time;
3804+SET @@global.log_output= @old_log_output;
3805+SET @@global.slow_query_log= @old_slow_query_log;
3806
3807=== modified file 'mysql-test/r/variables.result'
3808--- mysql-test/r/variables.result 2013-06-27 15:35:20 +0000
3809+++ mysql-test/r/variables.result 2014-08-22 10:00:31 +0000
3810@@ -188,6 +188,8 @@
3811 @@concurrent_insert
3812 AUTO
3813 set global timed_mutexes=ON;
3814+Warnings:
3815+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
3816 show variables like 'timed_mutexes';
3817 Variable_name Value
3818 timed_mutexes ON
3819@@ -195,6 +197,8 @@
3820 VARIABLE_NAME VARIABLE_VALUE
3821 TIMED_MUTEXES ON
3822 set global timed_mutexes=0;
3823+Warnings:
3824+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
3825 show variables like 'timed_mutexes';
3826 Variable_name Value
3827 timed_mutexes OFF
3828
3829=== modified file 'mysql-test/r/view.result'
3830--- mysql-test/r/view.result 2012-03-14 00:57:03 +0000
3831+++ mysql-test/r/view.result 2014-08-22 10:00:31 +0000
3832@@ -4109,3 +4109,40 @@
3833 DROP DATABASE IF EXISTS nodb;
3834 CREATE VIEW nodb.a AS SELECT 1;
3835 ERROR 42000: Unknown database 'nodb'
3836+#
3837+# BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
3838+# BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
3839+#
3840+CREATE VIEW v1 AS (SELECT '' FROM DUAL);
3841+CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
3842+(SELECT '' FROM DUAL);
3843+CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
3844+(SELECT '' FROM DUAL) UNION ALL
3845+(SELECT '' FROM DUAL);
3846+CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
3847+(SELECT '' AS col2 FROM DUAL) UNION ALL
3848+(SELECT '' FROM DUAL);
3849+# Name for the column in select1 is set properly with or
3850+# without this fix.
3851+SHOW CREATE VIEW v1;
3852+View Create View character_set_client collation_connection
3853+v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select '' AS `Name_exp_1`) latin1 latin1_swedish_ci
3854+# Name for the column in select2 is set with this fix.
3855+# Without this fix, name would not have set for the
3856+# columns in select2.
3857+SHOW CREATE VIEW v2;
3858+View Create View character_set_client collation_connection
3859+v2 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
3860+# Name for the field item in select2 & select3 is set with this fix.
3861+# Without this fix, name would not have set for the
3862+# columns in select2 & select3.
3863+SHOW CREATE VIEW v3;
3864+View Create View character_set_client collation_connection
3865+v3 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
3866+# Name for the field item in select3 is set with this fix.
3867+# Without this fix, name would not have set for the
3868+# columns in select3.
3869+SHOW CREATE VIEW v4;
3870+View Create View character_set_client collation_connection
3871+v4 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
3872+DROP VIEW v1, v2, v3, v4;
3873
3874=== modified file 'mysql-test/suite/binlog/t/binlog_killed.test'
3875--- mysql-test/suite/binlog/t/binlog_killed.test 2010-05-31 09:18:27 +0000
3876+++ mysql-test/suite/binlog/t/binlog_killed.test 2014-08-22 10:00:31 +0000
3877@@ -340,6 +340,14 @@
3878 # common cleanup
3879 #
3880
3881+connection con1;
3882+disconnect con1;
3883+--source include/wait_until_disconnected.inc
3884+connection con2;
3885+disconnect con2;
3886+--source include/wait_until_disconnected.inc
3887+connection default;
3888+
3889 drop table t1,t2,t3;
3890
3891 --echo end of the tests
3892
3893=== added file 'mysql-test/suite/innodb/r/bug71585.result'
3894--- mysql-test/suite/innodb/r/bug71585.result 1970-01-01 00:00:00 +0000
3895+++ mysql-test/suite/innodb/r/bug71585.result 2014-08-22 10:00:31 +0000
3896@@ -0,0 +1,9 @@
3897+CREATE TABLE files (
3898+`PATH` varchar(150) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
3899+`CONTENTS` mediumtext COLLATE utf8_unicode_ci NOT NULL,
3900+PRIMARY KEY (`PATH`)
3901+) ENGINE=innodb DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3902+INSERT INTO `files` (PATH,CONTENTS) VALUES ('X',repeat('0',8104));
3903+update files set path='x' where path='X';
3904+update files set path='X' where path='x';
3905+DROP TABLE files;
3906
3907=== added file 'mysql-test/suite/innodb/r/bug72665.result'
3908--- mysql-test/suite/innodb/r/bug72665.result 1970-01-01 00:00:00 +0000
3909+++ mysql-test/suite/innodb/r/bug72665.result 2014-08-22 10:00:31 +0000
3910@@ -0,0 +1,11 @@
3911+CREATE TABLE t1(c42 tinyblob not null, c45 TEXT, unique(c42 (255)), unique(c45 (255))) ENGINE=InnoDB;
3912+ALTER TABLE t1 MODIFY c45 SET('') NOT NULL;
3913+SHOW CREATE TABLE t1;
3914+Table Create Table
3915+t1 CREATE TABLE `t1` (
3916+ `c42` tinyblob NOT NULL,
3917+ `c45` set('') NOT NULL,
3918+ UNIQUE KEY `c42` (`c42`(255)),
3919+ UNIQUE KEY `c45` (`c45`)
3920+) ENGINE=InnoDB DEFAULT CHARSET=latin1
3921+DROP TABLE t1;
3922
3923=== added file 'mysql-test/suite/innodb/r/innodb-fk.result'
3924--- mysql-test/suite/innodb/r/innodb-fk.result 1970-01-01 00:00:00 +0000
3925+++ mysql-test/suite/innodb/r/innodb-fk.result 2014-08-22 10:00:31 +0000
3926@@ -0,0 +1,35 @@
3927+#
3928+# Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY
3929+# REFERENCES IS SLOW/CRASHES SEMAPHORE
3930+#
3931+create table t1 (f1 int primary key) engine=innodb;
3932+insert into t1 values (5);
3933+insert into t1 values (2882);
3934+insert into t1 values (10);
3935+update t1 set f1 = 28 where f1 = 2882;
3936+select * from fk_120;
3937+f1
3938+5
3939+10
3940+28
3941+select * from fk_1;
3942+f1
3943+5
3944+10
3945+28
3946+select * from fk_50;
3947+f1
3948+5
3949+10
3950+28
3951+drop table t1;
3952+#
3953+# Check if restrict is working fine.
3954+#
3955+create table t1 (f1 int primary key) engine=innodb;
3956+delete from t1 where f1 = 29;
3957+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`fk_29`, CONSTRAINT `pc29` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`))
3958+select * from fk_29;
3959+f1
3960+29
3961+drop table t1;
3962
3963=== added file 'mysql-test/suite/innodb/t/bug71585.test'
3964--- mysql-test/suite/innodb/t/bug71585.test 1970-01-01 00:00:00 +0000
3965+++ mysql-test/suite/innodb/t/bug71585.test 2014-08-22 10:00:31 +0000
3966@@ -0,0 +1,19 @@
3967+--source include/have_innodb.inc
3968+
3969+# Testcase for http://bugs.mysql.com/bug.php?id=71585:
3970+# second UPDATE statement causes
3971+# InnoDB: Assertion failure in thread 140299335526144 in file row0upd.c line 1793
3972+# InnoDB: Failing assertion: !(data[BTR_EXTERN_LEN] & BTR_EXTERN_OWNER_FLAG)
3973+
3974+CREATE TABLE files (
3975+`PATH` varchar(150) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
3976+`CONTENTS` mediumtext COLLATE utf8_unicode_ci NOT NULL,
3977+PRIMARY KEY (`PATH`)
3978+) ENGINE=innodb DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3979+
3980+INSERT INTO `files` (PATH,CONTENTS) VALUES ('X',repeat('0',8104));
3981+
3982+update files set path='x' where path='X';
3983+update files set path='X' where path='x';
3984+
3985+DROP TABLE files;
3986
3987=== added file 'mysql-test/suite/innodb/t/bug72665.test'
3988--- mysql-test/suite/innodb/t/bug72665.test 1970-01-01 00:00:00 +0000
3989+++ mysql-test/suite/innodb/t/bug72665.test 2014-08-22 10:00:31 +0000
3990@@ -0,0 +1,14 @@
3991+--source include/have_innodb.inc
3992+
3993+# Testcase for http://bugs.mysql.com/bug.php?id=72665:
3994+# ALTER TABLE causes
3995+# InnoDB: Assertion failure in thread 4608106496 in file ha_innodb.cc line 7215
3996+# InnoDB: Failing assertion: primary_key_no == -1 || primary_key_no == 0
3997+
3998+CREATE TABLE t1(c42 tinyblob not null, c45 TEXT, unique(c42 (255)), unique(c45 (255))) ENGINE=InnoDB;
3999+
4000+ALTER TABLE t1 MODIFY c45 SET('') NOT NULL;
4001+
4002+SHOW CREATE TABLE t1;
4003+
4004+DROP TABLE t1;
4005
4006=== added file 'mysql-test/suite/innodb/t/innodb-fk.test'
4007--- mysql-test/suite/innodb/t/innodb-fk.test 1970-01-01 00:00:00 +0000
4008+++ mysql-test/suite/innodb/t/innodb-fk.test 2014-08-22 10:00:31 +0000
4009@@ -0,0 +1,86 @@
4010+--source include/have_innodb.inc
4011+--source include/not_embedded.inc
4012+
4013+--echo #
4014+--echo # Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY
4015+--echo # REFERENCES IS SLOW/CRASHES SEMAPHORE
4016+--echo #
4017+
4018+create table t1 (f1 int primary key) engine=innodb;
4019+insert into t1 values (5);
4020+insert into t1 values (2882);
4021+insert into t1 values (10);
4022+
4023+let $fk_tables = 120;
4024+
4025+--disable_query_log
4026+let $i = $fk_tables;
4027+while ($i)
4028+{
4029+ eval create table fk_$i (f1 int primary key,
4030+ constraint pc$i foreign key (f1) references t1(f1)
4031+ on delete cascade on update cascade);
4032+ eval insert into fk_$i values (5);
4033+ eval insert into fk_$i values (2882);
4034+ eval insert into fk_$i values (10);
4035+ dec $i;
4036+}
4037+--enable_query_log
4038+
4039+--source include/restart_mysqld.inc
4040+
4041+update t1 set f1 = 28 where f1 = 2882;
4042+
4043+select * from fk_120;
4044+select * from fk_1;
4045+select * from fk_50;
4046+
4047+--disable_query_log
4048+let $i = $fk_tables;
4049+while ($i)
4050+{
4051+ eval drop table fk_$i;
4052+ dec $i;
4053+}
4054+--enable_query_log
4055+
4056+drop table t1;
4057+
4058+--echo #
4059+--echo # Check if restrict is working fine.
4060+--echo #
4061+
4062+create table t1 (f1 int primary key) engine=innodb;
4063+
4064+let $fk_tables = 30;
4065+
4066+--disable_query_log
4067+let $i = $fk_tables;
4068+while ($i)
4069+{
4070+ eval create table fk_$i (f1 int primary key,
4071+ constraint pc$i foreign key (f1) references t1(f1)
4072+ on delete restrict on update restrict);
4073+ eval insert into t1 values ($i);
4074+ eval insert into fk_$i values ($i);
4075+ dec $i;
4076+}
4077+--enable_query_log
4078+
4079+--source include/restart_mysqld.inc
4080+
4081+--error ER_ROW_IS_REFERENCED_2
4082+delete from t1 where f1 = 29;
4083+select * from fk_29;
4084+
4085+--disable_query_log
4086+let $i = $fk_tables;
4087+while ($i)
4088+{
4089+ eval drop table fk_$i;
4090+ dec $i;
4091+}
4092+--enable_query_log
4093+
4094+drop table t1;
4095+
4096
4097=== modified file 'mysql-test/suite/innodb/t/innodb_bug60196-master.opt'
4098--- mysql-test/suite/innodb/t/innodb_bug60196-master.opt 2013-12-03 00:19:45 +0000
4099+++ mysql-test/suite/innodb/t/innodb_bug60196-master.opt 2014-08-22 10:00:31 +0000
4100@@ -1,1 +1,1 @@
4101---lower-case-table-names=2
4102+--lower-case-table-names=2
4103
4104=== added file 'mysql-test/suite/rpl/r/rpl_4threads_deadlock.result'
4105--- mysql-test/suite/rpl/r/rpl_4threads_deadlock.result 1970-01-01 00:00:00 +0000
4106+++ mysql-test/suite/rpl/r/rpl_4threads_deadlock.result 2014-08-22 10:00:31 +0000
4107@@ -0,0 +1,43 @@
4108+include/master-slave.inc
4109+[connection master]
4110+FLUSH LOGS;
4111+SET @save_debug=@@global.debug;
4112+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
4113+include/stop_slave.inc
4114+include/start_slave.inc
4115+"Wait_for dump_thread_signal"
4116+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
4117+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
4118+SHOW BINARY LOGS;
4119+"Wait_for parked1"
4120+SET DEBUG_SYNC='now WAIT_FOR parked1';
4121+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
4122+PURGE BINARY LOGS BEFORE '9999-12-31';
4123+"Wait_for parked2"
4124+SET DEBUG_SYNC='now WAIT_FOR parked2';
4125+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
4126+SELECT * FROM information_schema.processlist;
4127+"Wait_for parked3"
4128+SET DEBUG_SYNC='now WAIT_FOR parked3';
4129+SET DEBUG_SYNC='now SIGNAL go';
4130+include/stop_slave.inc
4131+include/start_slave.inc
4132+"Wait_for dump_thread_signal"
4133+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
4134+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
4135+SHOW BINARY LOGS;
4136+"Wait_for parked1"
4137+SET DEBUG_SYNC='now WAIT_FOR parked1';
4138+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
4139+PURGE BINARY LOGS BEFORE '9999-12-31';
4140+"Wait_for parked2"
4141+SET DEBUG_SYNC='now WAIT_FOR parked2';
4142+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
4143+SHOW PROCESSLIST;
4144+"Wait_for parked3"
4145+SET DEBUG_SYNC='now WAIT_FOR parked3';
4146+SET DEBUG_SYNC='now SIGNAL go';
4147+"Cleanup"
4148+SET DEBUG_SYNC='RESET';
4149+SET GLOBAL DEBUG=@save_debug;
4150+include/rpl_end.inc
4151
4152=== modified file 'mysql-test/suite/rpl/r/rpl_semi_sync.result'
4153--- mysql-test/suite/rpl/r/rpl_semi_sync.result 2012-10-02 18:05:51 +0000
4154+++ mysql-test/suite/rpl/r/rpl_semi_sync.result 2014-08-22 10:00:31 +0000
4155@@ -386,6 +386,7 @@
4156 include/stop_slave.inc
4157 [ on master ]
4158 set sql_log_bin=0;
4159+include/stop_dump_threads.inc
4160 UNINSTALL PLUGIN rpl_semi_sync_master;
4161 set sql_log_bin=1;
4162 SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
4163@@ -439,9 +440,8 @@
4164 #
4165 # Clean up
4166 #
4167+include/uninstall_semisync.inc
4168 include/stop_slave.inc
4169-UNINSTALL PLUGIN rpl_semi_sync_slave;
4170-UNINSTALL PLUGIN rpl_semi_sync_master;
4171 change master to master_user='root',master_password='';
4172 include/start_slave.inc
4173 drop table t1;
4174
4175=== added file 'mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result'
4176--- mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result 1970-01-01 00:00:00 +0000
4177+++ mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result 2014-08-22 10:00:31 +0000
4178@@ -0,0 +1,36 @@
4179+include/master-slave.inc
4180+[connection master]
4181+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
4182+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
4183+UNINSTALL PLUGIN rpl_semi_sync_slave;
4184+UNINSTALL PLUGIN rpl_semi_sync_master;
4185+CREATE TABLE t1(i int);
4186+INSERT INTO t1 values (1);
4187+DROP TABLE t1;
4188+include/install_semisync.inc
4189+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
4190+UNINSTALL PLUGIN rpl_semi_sync_slave;
4191+ERROR HY000: Unknown error
4192+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
4193+UNINSTALL PLUGIN rpl_semi_sync_master;
4194+ERROR HY000: Unknown error
4195+CREATE TABLE t1(i int);
4196+INSERT INTO t1 values (2);
4197+DROP TABLE t1;
4198+include/assert.inc [semi sync slave status should be ON.]
4199+include/assert.inc [semi sync master status should be ON.]
4200+include/assert.inc [semi sync master clients should be 1.]
4201+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
4202+include/assert.inc [semi sync master clients should be 1.]
4203+UNINSTALL PLUGIN rpl_semi_sync_master;
4204+ERROR HY000: Unknown error
4205+include/stop_slave.inc
4206+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
4207+include/start_slave.inc
4208+UNINSTALL PLUGIN rpl_semi_sync_slave;
4209+include/assert.inc [semi sync master clients should be 0.]
4210+UNINSTALL PLUGIN rpl_semi_sync_master;
4211+CREATE TABLE t1(i int);
4212+INSERT INTO t1 values (3);
4213+DROP TABLE t1;
4214+include/rpl_end.inc
4215
4216=== modified file 'mysql-test/suite/rpl/r/rpl_stop_slave.result'
4217--- mysql-test/suite/rpl/r/rpl_stop_slave.result 2011-03-17 12:12:25 +0000
4218+++ mysql-test/suite/rpl/r/rpl_stop_slave.result 2014-08-22 10:00:31 +0000
4219@@ -93,10 +93,12 @@
4220 CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
4221 CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
4222 INSERT INTO t1 VALUES(1, 1);
4223+include/stop_slave.inc
4224 [connection master]
4225+include/stop_dump_threads.inc
4226 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
4227 [connection slave]
4228-include/restart_slave.inc
4229+include/start_slave.inc
4230 BEGIN;
4231 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
4232 [connection master]
4233@@ -115,8 +117,11 @@
4234 [connection slave]
4235 include/wait_for_slave_to_stop.inc
4236 [connection slave1]
4237+[connection master]
4238+SET GLOBAL debug= '$debug_save';
4239+include/stop_dump_threads.inc
4240+[connection slave1]
4241 include/start_slave.inc
4242 [connection master]
4243 DROP TABLE t1, t2;
4244-SET GLOBAL debug= $debug_save;
4245 include/rpl_end.inc
4246
4247=== added file 'mysql-test/suite/rpl/t/rpl_4threads_deadlock.test'
4248--- mysql-test/suite/rpl/t/rpl_4threads_deadlock.test 1970-01-01 00:00:00 +0000
4249+++ mysql-test/suite/rpl/t/rpl_4threads_deadlock.test 2014-08-22 10:00:31 +0000
4250@@ -0,0 +1,117 @@
4251+###############################################################################
4252+# Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
4253+# SHOW BINLOGS
4254+# Problem: A deadlock was occuring when 4 threads were involved in acquiring
4255+# locks
4256+# Thread 1: Dump thread ( Slave is reconnecting, so on Master, a new dump
4257+# thread is trying kill zombie dump threads. It acquired
4258+# thread's LOCK_thd_data and it is about to acquire
4259+# mysys_var->current_mutex ( which LOCK_log)
4260+# Thread 2: Application thread is executing show binlogs and acquired
4261+# LOCK_log and it is about to acquire LOCK_index.
4262+# Thread 3: Applicaiton thread is executing Purge binary logs and acquired
4263+# LOCK_index and it is about to acquire LOCK_thread_count.
4264+# Thread 4: Application thread is executing show processlist and acquired
4265+# LOCK_thread_count and it is about to acquire zombie dump
4266+# thread's LOCK_thd_data.
4267+# Deadlock : Thread 1 -> Thread 2 -> Thread 3-> Thread 4 -> Thread 1
4268+# The same above deadlock was observed when thread 4 is replaced with another
4269+# thread which is executing 'SELECT * FROM information_schema.processlist'
4270+# command and acquired LOCK_thread_count and it is about to acquire zombie
4271+# dump thread's LOCK_thd_data.
4272+# Fix: Introuced a new lock (Lock_thread_remove) which will guard the thread
4273+# deletion (exit process) and the same lock is used in show processlist
4274+# execution instead of LOCK_thread_count. i.e., After the patch, Server allows
4275+# new threads to join the system but it will not any threads to execute its
4276+# 'cleanup' process. Now the new lock order is: LOCK_thread_remove ->
4277+# LOCK_thd_data -> LOCK_log -> LOCK_index -> LOCK_thread_count Both the above
4278+# scenarios are tested with the below test code and it proves that there is no
4279+# deadlock after the fix.
4280+###############################################################################
4281+--source include/have_debug_sync.inc
4282+--source include/have_binlog_format_statement.inc
4283+--source include/master-slave.inc
4284+
4285+connect(master2,127.0.0.1,root,,test,$MASTER_MYPORT,);
4286+connect(master3,127.0.0.1,root,,test,$MASTER_MYPORT,);
4287+--connection master
4288+# Create atleast one binary log, otherwise purge logs command, show binary
4289+# logs command do not hit the DEBUG_SYNC points.
4290+FLUSH LOGS;
4291+SET @save_debug=@@global.debug;
4292+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
4293+
4294+# Iteration 1 with "SHOW PROCESSLIST command"
4295+# Iteration 2 with "SELECT * FROM information_schema.processlist"
4296+--let $iter=2
4297+while ($iter)
4298+{
4299+ --connection slave
4300+ --source include/stop_slave.inc
4301+ --source include/start_slave.inc
4302+ # Thread 1
4303+ --connection master
4304+ --echo "Wait_for dump_thread_signal"
4305+ SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
4306+
4307+ # Thread 2
4308+ --connection master1
4309+ SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
4310+ --send SHOW BINARY LOGS
4311+
4312+ --connection master
4313+ echo "Wait_for parked1";
4314+ SET DEBUG_SYNC='now WAIT_FOR parked1';
4315+
4316+ # Thread 3
4317+ --connection master2
4318+ SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
4319+ --send PURGE BINARY LOGS BEFORE '9999-12-31'
4320+
4321+ --connection master
4322+ echo "Wait_for parked2";
4323+ SET DEBUG_SYNC='now WAIT_FOR parked2';
4324+
4325+ # Thread 4
4326+ --connection master3
4327+ SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
4328+ if ($iter == 1)
4329+ {
4330+ --let $query=SHOW PROCESSLIST
4331+ }
4332+ if ($iter == 2)
4333+ {
4334+ --let $query=SELECT * FROM information_schema.processlist
4335+ }
4336+ --send_eval $query
4337+
4338+ --connection master
4339+ echo "Wait_for parked3";
4340+ SET DEBUG_SYNC='now WAIT_FOR parked3';
4341+
4342+ --connection master
4343+ SET DEBUG_SYNC='now SIGNAL go';
4344+
4345+ # Output of each command vary depends on other tests ran in suite(output vary
4346+ # in Pb2 runs), so lets ignore output. Anyways, we are interested in seeing
4347+ # that there is no deadlock.
4348+ --disable_result_log
4349+ --connection master1
4350+ --reap
4351+ --connection master2
4352+ --reap
4353+ --connection master3
4354+ --reap
4355+ --enable_result_log
4356+
4357+ --dec $iter
4358+}
4359+
4360+--echo "Cleanup"
4361+--disconnect master2
4362+--disconnect master3
4363+
4364+--connection master
4365+SET DEBUG_SYNC='RESET';
4366+SET GLOBAL DEBUG=@save_debug;
4367+source include/rpl_end.inc;
4368
4369=== modified file 'mysql-test/suite/rpl/t/rpl_semi_sync.test'
4370--- mysql-test/suite/rpl/t/rpl_semi_sync.test 2012-10-02 18:05:51 +0000
4371+++ mysql-test/suite/rpl/t/rpl_semi_sync.test 2014-08-22 10:00:31 +0000
4372@@ -545,6 +545,7 @@
4373 connection master;
4374 echo [ on master ];
4375 set sql_log_bin=0;
4376+--source include/stop_dump_threads.inc
4377 UNINSTALL PLUGIN rpl_semi_sync_master;
4378 set sql_log_bin=1;
4379 enable_query_log;
4380@@ -598,19 +599,10 @@
4381 --echo #
4382 --echo # Clean up
4383 --echo #
4384+--source include/uninstall_semisync.inc
4385
4386 connection slave;
4387 source include/stop_slave.inc;
4388-UNINSTALL PLUGIN rpl_semi_sync_slave;
4389-
4390-connection master;
4391-# The dump thread may still be running on the master, and so the following
4392-# UNINSTALL could generate a warning about the plugin is busy.
4393-disable_warnings;
4394-UNINSTALL PLUGIN rpl_semi_sync_master;
4395-enable_warnings;
4396-
4397-connection slave;
4398 change master to master_user='root',master_password='';
4399 source include/start_slave.inc;
4400
4401
4402=== added file 'mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt'
4403--- mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt 1970-01-01 00:00:00 +0000
4404+++ mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt 2014-08-22 10:00:31 +0000
4405@@ -0,0 +1,1 @@
4406+$SEMISYNC_PLUGIN_OPT
4407
4408=== added file 'mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt'
4409--- mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt 1970-01-01 00:00:00 +0000
4410+++ mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt 2014-08-22 10:00:31 +0000
4411@@ -0,0 +1,1 @@
4412+$SEMISYNC_PLUGIN_OPT
4413
4414=== added file 'mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test'
4415--- mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test 1970-01-01 00:00:00 +0000
4416+++ mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test 2014-08-22 10:00:31 +0000
4417@@ -0,0 +1,145 @@
4418+###############################################################################
4419+# Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
4420+# Problem: Uninstallation of Semi sync plugin should be blocked when it is
4421+# in use.
4422+# Test case: Uninstallation of semi sync should be allowed
4423+# On Master:
4424+# 1) When there is no dump thread
4425+# 2) When there are no semi sync slaves (i.e., async replication).
4426+# On Slave:
4427+# 1) When there is no I/O thread
4428+# 2) When there are no semi sync enabled I/O thread (i.e.,async replication).
4429+###############################################################################
4430+
4431+--source include/have_semisync_plugin.inc
4432+--source include/not_embedded.inc
4433+--source include/have_binlog_format_statement.inc
4434+--source include/master-slave.inc
4435+
4436+###############################################################################
4437+# Case 1: Uninstallation of semi sync plugins should be allowed when it is
4438+# not in use i.e., when asynchronous replication is active.
4439+###############################################################################
4440+# Step 1.1: Install semi sync master plugin on master
4441+--replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_PLUGIN
4442+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
4443+
4444+# Step 1.2: Install semi sync slave plugin on slave
4445+--connection slave
4446+--replace_result $SEMISYNC_SLAVE_PLUGIN SEMISYNC_SLAVE_PLUGIN
4447+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
4448+
4449+# Step 1.3: Uninstallation of semisync plugin on master and slave should be
4450+# allowed at this state as there is no semi sync replication enabled between
4451+# master and slave.
4452+UNINSTALL PLUGIN rpl_semi_sync_slave;
4453+--connection master
4454+UNINSTALL PLUGIN rpl_semi_sync_master;
4455+
4456+# Step 1.4: Check that replication is working fine at the end of the test case.
4457+CREATE TABLE t1(i int);
4458+INSERT INTO t1 values (1);
4459+DROP TABLE t1;
4460+--sync_slave_with_master
4461+
4462+###############################################################################
4463+# Case 2: Uninstallation of semi sync plugins should be disallowed
4464+# when it is in use i.e., when semi sync replication is active
4465+###############################################################################
4466+# Step 2.1: Install and enable semi sync replication between master and slave
4467+--source include/install_semisync.inc
4468+
4469+# Step 2.2: Check that rpl_semi_sync_slave uninstallation on Slave is not
4470+# possible at this state
4471+--connection slave
4472+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
4473+--error ER_UNKNOWN_ERROR
4474+UNINSTALL PLUGIN rpl_semi_sync_slave;
4475+
4476+# Step 2.3: Check that rpl_semi_sync_master uninstallation on Master is not
4477+# possible at this state
4478+--connection master
4479+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
4480+--error ER_UNKNOWN_ERROR
4481+UNINSTALL PLUGIN rpl_semi_sync_master;
4482+
4483+# Step 2.4: Check that replication is working fine at the end of the test case.
4484+CREATE TABLE t1(i int);
4485+INSERT INTO t1 values (2);
4486+DROP TABLE t1;
4487+--sync_slave_with_master
4488+
4489+# Step 2.5: Make sure rpl_semi_sync_master_status on Master and
4490+# rpl_semi_sync_slave_staus on Slave are ON
4491+--let $slave_status=[show status like "Rpl_semi_sync_slave_status", Value, 1]
4492+--let assert_cond= "$slave_status" = "ON"
4493+--let assert_text= semi sync slave status should be ON.
4494+--source include/assert.inc
4495+
4496+--connection master
4497+--let $master_status=[show status like "Rpl_semi_sync_master_status", Value, 1]
4498+--let assert_cond= "$master_status" = "ON"
4499+--let assert_text= semi sync master status should be ON.
4500+--source include/assert.inc
4501+
4502+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
4503+--let assert_cond= $master_clients = 1
4504+--let assert_text= semi sync master clients should be 1.
4505+--source include/assert.inc
4506+
4507+###############################################################################
4508+# Case 3: Uninstallation of semi sync plugin should be disallowed when there
4509+# are semi sync slaves even though rpl_semi_sync_master_enabled= OFF;.
4510+###############################################################################
4511+# Step 3.1: Disable semi sync on master
4512+--connection master
4513+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
4514+
4515+# Step 3.2: Check that still Rpl_semi_sync_master_clients is 1
4516+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
4517+--let assert_cond= $master_clients = 1
4518+--let assert_text= semi sync master clients should be 1.
4519+--source include/assert.inc
4520+
4521+# Step 3.3: Since Rpl_semi_sync_master_clients is 1, uninstallation of
4522+# rpl_semi_sync_master should be disallowed.
4523+--error ER_UNKNOWN_ERROR
4524+UNINSTALL PLUGIN rpl_semi_sync_master;
4525+
4526+###############################################################################
4527+# Case 4: Uninstallation of semi sync plugin should be allowed when it is not
4528+# in use. Same as Case 1 but this case is to check the case after enabling and
4529+# disabling semi sync replication.
4530+###############################################################################
4531+
4532+# Step 4.1: Stop IO thread on slave.
4533+--connection slave
4534+--source include/stop_slave.inc
4535+
4536+# Step 4.2: Disable semi sync on slave.
4537+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
4538+
4539+# Step 4.3: Start IO thread on slave.
4540+--source include/start_slave.inc
4541+
4542+# Step 4.4: Uninstall semi sync plugin, it should be successful now.
4543+UNINSTALL PLUGIN rpl_semi_sync_slave;
4544+
4545+# Step 4.5: On Master, check that semi sync slaves are now '0'.
4546+--connection master
4547+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
4548+--let assert_cond= $master_clients = 0
4549+--let assert_text= semi sync master clients should be 0.
4550+--source include/assert.inc
4551+
4552+# Step 4.6: So uninstalling semi sync plugin should be allowed
4553+UNINSTALL PLUGIN rpl_semi_sync_master;
4554+
4555+# Step 4.7: Check that replication is working fine at the end of the test case
4556+CREATE TABLE t1(i int);
4557+INSERT INTO t1 values (3);
4558+DROP TABLE t1;
4559+--sync_slave_with_master
4560+
4561+# Cleanup
4562+source include/rpl_end.inc;
4563
4564=== modified file 'mysql-test/suite/rpl/t/rpl_stop_slave.test'
4565--- mysql-test/suite/rpl/t/rpl_stop_slave.test 2011-03-17 12:12:25 +0000
4566+++ mysql-test/suite/rpl/t/rpl_stop_slave.test 2014-08-22 10:00:31 +0000
4567@@ -72,14 +72,17 @@
4568 INSERT INTO t1 VALUES(1, 1);
4569
4570 sync_slave_with_master;
4571+--source include/stop_slave.inc
4572
4573 --source include/rpl_connection_master.inc
4574+# make sure that there are no zombie threads
4575+--source include/stop_dump_threads.inc
4576
4577 let $debug_save= `SELECT @@GLOBAL.debug`;
4578 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
4579
4580 --source include/rpl_connection_slave.inc
4581-source include/restart_slave_sql.inc;
4582+--source include/start_slave.inc
4583
4584 BEGIN;
4585 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
4586@@ -91,6 +94,10 @@
4587 UPDATE t1 SET c2 = 3 WHERE c1 = 1;
4588 COMMIT;
4589
4590+# wait for the dump thread reach the sync point
4591+--let $wait_condition= select count(*)=1 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
4592+--source include/wait_condition.inc
4593+
4594 --source include/rpl_connection_slave1.inc
4595 let $show_statement= SHOW PROCESSLIST;
4596 let $field= Info;
4597@@ -103,7 +110,12 @@
4598 ROLLBACK;
4599
4600 --source include/rpl_connection_master.inc
4601+
4602 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
4603+# wait for the dump thread to come out of the
4604+# waiting phase before resetting the signals
4605+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
4606+--source include/wait_condition.inc
4607 SET DEBUG_SYNC= 'RESET';
4608
4609 --source include/rpl_connection_slave.inc
4610@@ -111,9 +123,22 @@
4611
4612 --source include/rpl_connection_slave1.inc
4613 reap;
4614+
4615+# Slave has stopped, thence lets make sure that
4616+# we kill the zombie dump threads. Also, make
4617+# sure that we disable the DBUG_EXECUTE_IF
4618+# that would set the dump thread to wait
4619+--source include/rpl_connection_master.inc
4620+SET GLOBAL debug= '$debug_save';
4621+# make sure that there are no zombie threads
4622+--source include/stop_dump_threads.inc
4623+
4624+--source include/rpl_connection_slave1.inc
4625+# now the dump thread on the master will start
4626+# from a clean slate, i.e. without the
4627+# DBUG_EXECUTE_IF set
4628 source include/start_slave.inc;
4629
4630 --source include/rpl_connection_master.inc
4631 DROP TABLE t1, t2;
4632-SET GLOBAL debug= $debug_save;
4633 --source include/rpl_end.inc
4634
4635=== modified file 'mysql-test/suite/sys_vars/r/timed_mutexes_basic.result'
4636--- mysql-test/suite/sys_vars/r/timed_mutexes_basic.result 2009-10-09 13:34:07 +0000
4637+++ mysql-test/suite/sys_vars/r/timed_mutexes_basic.result 2014-08-22 10:00:31 +0000
4638@@ -4,7 +4,11 @@
4639 0
4640 '#--------------------FN_DYNVARS_177_01------------------------#'
4641 SET @@global.timed_mutexes = 1;
4642+Warnings:
4643+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4644 SET @@global.timed_mutexes = DEFAULT;
4645+Warnings:
4646+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4647 SELECT @@global.timed_mutexes;
4648 @@global.timed_mutexes
4649 0
4650@@ -17,15 +21,21 @@
4651 SELECT global.timed_mutexes;
4652 ERROR 42S02: Unknown table 'global' in field list
4653 SET global timed_mutexes = 1;
4654+Warnings:
4655+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4656 SELECT @@global.timed_mutexes;
4657 @@global.timed_mutexes
4658 1
4659 '#--------------------FN_DYNVARS_177_03------------------------#'
4660 SET @@global.timed_mutexes = 0;
4661+Warnings:
4662+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4663 SELECT @@global.timed_mutexes;
4664 @@global.timed_mutexes
4665 0
4666 SET @@global.timed_mutexes = 1;
4667+Warnings:
4668+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4669 SELECT @@global.timed_mutexes;
4670 @@global.timed_mutexes
4671 1
4672@@ -82,23 +92,33 @@
4673 ON
4674 '#---------------------FN_DYNVARS_177_08-------------------------#'
4675 SET @@global.timed_mutexes = OFF;
4676+Warnings:
4677+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4678 SELECT @@global.timed_mutexes;
4679 @@global.timed_mutexes
4680 0
4681 SET @@global.timed_mutexes = ON;
4682+Warnings:
4683+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4684 SELECT @@global.timed_mutexes;
4685 @@global.timed_mutexes
4686 1
4687 '#---------------------FN_DYNVARS_177_09----------------------#'
4688 SET @@global.timed_mutexes = TRUE;
4689+Warnings:
4690+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4691 SELECT @@global.timed_mutexes;
4692 @@global.timed_mutexes
4693 1
4694 SET @@global.timed_mutexes = FALSE;
4695+Warnings:
4696+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4697 SELECT @@global.timed_mutexes;
4698 @@global.timed_mutexes
4699 0
4700 SET @@global.timed_mutexes = @global_start_value;
4701+Warnings:
4702+Warning 1287 '@@timed_mutexes' is deprecated and will be removed in a future release.
4703 SELECT @@global.timed_mutexes;
4704 @@global.timed_mutexes
4705 0
4706
4707=== added file 'mysql-test/t/bug71858.test'
4708--- mysql-test/t/bug71858.test 1970-01-01 00:00:00 +0000
4709+++ mysql-test/t/bug71858.test 2014-08-22 10:00:31 +0000
4710@@ -0,0 +1,14 @@
4711+# Testcase for http://bugs.mysql.com/bug.php?id=71858 (bug 1286186):
4712+
4713+# mysqld: /home/openxs/bzr/percona-5.6/sql/mdl.h:348:
4714+# void MDL_key::mdl_key_init(MDL_key::enum_mdl_namespace, const char*, const char*): Assertion `strlen(db) <= (64*3) && strlen(name) <= (64*3)' failed.
4715+
4716+SELECT table_schema, table_name, column_name, column_type FROM INFORMATION_SCHEMA.COLUMNS
4717+ WHERE TABLE_NAME IN ( 'ooooooooooooooooooooooooooooooooooooo' 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
4718+'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cc' 'ccccccccccccc' 'wwwwwwwwwwwwwwwwwww' 'rrrrrrrrrrrrrrrr'
4719+'tttttttttttttttttttt' 'yyyyyyyyyyyyyyyyyyy' 'uuuuuuuuuuuuuuuuuuuuuuuuuuuu' 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiii'
4720+'oooooooooooooooooooo' 'ppppppppppppppppppppppppppppp' 'jjjjjjjjjjjj' 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk'
4721+'lllllllllllllllllllllllllllllllllllllll' 'zzzzzzzzzzzzzzz' 'xxxxxxxxxxxxxxxxx' 'cccccccccc'
4722+'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
4723+'nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn' ) AND TABLE_SCHEMA='AA_BBB' AND COLUMN_TYPE='PRI'
4724+ORDER BY 2;
4725
4726=== modified file 'mysql-test/t/failed_auth_3909.test'
4727--- mysql-test/t/failed_auth_3909.test 2013-04-30 11:48:24 +0000
4728+++ mysql-test/t/failed_auth_3909.test 2014-08-22 10:00:31 +0000
4729@@ -3,15 +3,12 @@
4730 #
4731 # MDEV-3909 remote user enumeration
4732 #
4733-# verify that for some failed login attemps (with wrong user names)
4734-# the server requests a plugin
4735-#
4736 optimize table mysql.user;
4737 insert mysql.user (user,plugin) values ('foo','bar'),('bar','bar'),('baz','bar');
4738 flush privileges;
4739
4740 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
4741---error ER_PLUGIN_IS_NOT_LOADED
4742+--error ER_ACCESS_DENIED_ERROR
4743 connect (fail,localhost,u1);
4744
4745 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
4746@@ -22,7 +19,7 @@
4747 --error ER_ACCESS_DENIED_ERROR
4748 connect (fail,localhost,u2,password);
4749
4750---error ER_PLUGIN_IS_NOT_LOADED
4751+--error ER_ACCESS_DENIED_ERROR
4752 change_user u1;
4753
4754 --error ER_ACCESS_DENIED_ERROR
4755
4756=== modified file 'mysql-test/t/group_min_max.test'
4757--- mysql-test/t/group_min_max.test 2013-05-13 11:45:25 +0000
4758+++ mysql-test/t/group_min_max.test 2014-08-22 10:00:31 +0000
4759@@ -1243,3 +1243,27 @@
4760 drop table t1;
4761 --echo # End of test#50539.
4762
4763+--echo #
4764+--echo # Bug#17217128 - BAD INTERACTION BETWEEN MIN/MAX AND
4765+--echo # "HAVING SUM(DISTINCT)": WRONG RESULTS.
4766+--echo #
4767+
4768+CREATE TABLE t (a INT, b INT, KEY(a,b));
4769+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
4770+ANALYZE TABLE t;
4771+
4772+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
4773+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
4774+
4775+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
4776+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
4777+
4778+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
4779+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
4780+
4781+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
4782+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
4783+
4784+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
4785+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
4786+DROP TABLE t;
4787
4788=== modified file 'mysql-test/t/group_min_max_innodb.test'
4789--- mysql-test/t/group_min_max_innodb.test 2011-10-19 12:07:14 +0000
4790+++ mysql-test/t/group_min_max_innodb.test 2014-08-22 10:00:31 +0000
4791@@ -137,3 +137,96 @@
4792 DROP TABLE t1;
4793
4794 --echo End of 5.5 tests
4795+
4796+--echo #
4797+--echo # Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
4798+--echo #
4799+
4800+CREATE TABLE t0 (
4801+ i1 INTEGER NOT NULL
4802+);
4803+
4804+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
4805+ (11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
4806+ (21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
4807+
4808+CREATE TABLE t1 (
4809+ c1 CHAR(1) NOT NULL,
4810+ i1 INTEGER NOT NULL,
4811+ i2 INTEGER NOT NULL,
4812+ UNIQUE KEY k1 (c1,i2)
4813+) ENGINE=InnoDB;
4814+
4815+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
4816+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
4817+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
4818+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
4819+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
4820+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
4821+
4822+CREATE TABLE t2 (
4823+ c1 CHAR(1) NOT NULL,
4824+ i1 INTEGER NOT NULL,
4825+ i2 INTEGER NOT NULL,
4826+ UNIQUE KEY k2 (c1,i1,i2)
4827+) ENGINE=InnoDB;
4828+
4829+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
4830+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
4831+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
4832+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
4833+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
4834+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
4835+
4836+-- disable_result_log
4837+ANALYZE TABLE t1;
4838+ANALYZE TABLE t2;
4839+-- enable_result_log
4840+
4841+let query=
4842+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
4843+GROUP BY c1;
4844+eval EXPLAIN $query;
4845+eval $query;
4846+
4847+let query=
4848+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
4849+GROUP BY c1;
4850+eval EXPLAIN $query;
4851+eval $query;
4852+
4853+let query=
4854+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
4855+GROUP BY c1;
4856+eval EXPLAIN $query;
4857+eval $query;
4858+
4859+let query=
4860+SELECT c1, max(i2) FROM t1
4861+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
4862+GROUP BY c1;
4863+eval EXPLAIN $query;
4864+eval $query;
4865+
4866+let query=
4867+SELECT c1, i1, max(i2) FROM t2
4868+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
4869+GROUP BY c1,i1;
4870+eval EXPLAIN $query;
4871+eval $query;
4872+
4873+let query=
4874+SELECT c1, i1, max(i2) FROM t2
4875+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
4876+GROUP BY c1,i1;
4877+eval EXPLAIN $query;
4878+eval $query;
4879+
4880+let query=
4881+SELECT c1, i1, max(i2) FROM t2
4882+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
4883+GROUP BY c1,i1;
4884+eval EXPLAIN $query;
4885+eval $query;
4886+
4887+DROP TABLE t0,t1,t2;
4888
4889=== modified file 'mysql-test/t/long_tmpdir-master.sh'
4890--- mysql-test/t/long_tmpdir-master.sh 2007-06-11 19:06:20 +0000
4891+++ mysql-test/t/long_tmpdir-master.sh 2014-08-22 10:00:31 +0000
4892@@ -1,3 +1,5 @@
4893+#! /bin/bash
4894+
4895 d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
4896 test -d "$d" || mkdir "$d"
4897 rm -f "$d"/*
4898
4899=== modified file 'mysql-test/t/lowercase_mixed_tmpdir-master.sh'
4900--- mysql-test/t/lowercase_mixed_tmpdir-master.sh 2007-04-30 21:16:46 +0000
4901+++ mysql-test/t/lowercase_mixed_tmpdir-master.sh 2014-08-22 10:00:31 +0000
4902@@ -1,3 +1,5 @@
4903+#! /bin/bash
4904+
4905 # This test requires a non-lowercase tmpdir directory on a case-sensitive
4906 # filesystem.
4907
4908
4909=== modified file 'mysql-test/t/lowercase_table4-master.opt'
4910--- mysql-test/t/lowercase_table4-master.opt 2013-12-03 00:23:27 +0000
4911+++ mysql-test/t/lowercase_table4-master.opt 2014-08-22 10:00:31 +0000
4912@@ -1,1 +1,1 @@
4913---lower-case-table-names=2
4914+--lower-case-table-names=2
4915
4916=== modified file 'mysql-test/t/partition_archive.test'
4917--- mysql-test/t/partition_archive.test 2009-08-11 12:18:26 +0000
4918+++ mysql-test/t/partition_archive.test 2014-08-22 10:00:31 +0000
4919@@ -126,3 +126,21 @@
4920 select count(*) from t1;
4921 drop table t1;
4922
4923+
4924+--echo #
4925+--echo #BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
4926+--echo # CORRUPTS FRM
4927+
4928+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
4929+PARTITIONS 5;
4930+SHOW CREATE TABLE t1;
4931+
4932+--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
4933+--error ER_CANT_CREATE_TABLE
4934+ALTER TABLE t1 ENGINE= ARCHIVE;
4935+
4936+--echo #After the patch, the ENGINE is correctly displayed as MyISAM
4937+SHOW CREATE TABLE t1;
4938+
4939+--echo #Cleanup.
4940+DROP TABLE t1;
4941
4942=== modified file 'mysql-test/t/partition_pruning.test'
4943--- mysql-test/t/partition_pruning.test 2010-09-13 13:56:56 +0000
4944+++ mysql-test/t/partition_pruning.test 2014-08-22 10:00:31 +0000
4945@@ -1410,3 +1410,51 @@
4946 explain partitions select * from t1 where a between 10 and 10+33;
4947
4948 drop table t0, t1;
4949+
4950+--echo #
4951+--echo # Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
4952+--echo #
4953+CREATE TABLE t1
4954+(c1 int,
4955+ c2 int,
4956+ c3 int,
4957+ c4 int,
4958+ PRIMARY KEY (c1,c2))
4959+PARTITION BY LIST COLUMNS (c2)
4960+(PARTITION p1 VALUES IN (1,2),
4961+ PARTITION p2 VALUES IN (3,4));
4962+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
4963+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
4964+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
4965+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
4966+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
4967+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
4968+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
4969+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
4970+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
4971+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
4972+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
4973+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
4974+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
4975+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
4976+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
4977+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
4978+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
4979+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
4980+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
4981+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
4982+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
4983+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
4984+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
4985+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
4986+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
4987+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
4988+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
4989+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
4990+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
4991+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
4992+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
4993+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
4994+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
4995+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
4996+DROP TABLE t1;
4997
4998=== modified file 'mysql-test/t/percona_bug1289599.test'
4999--- mysql-test/t/percona_bug1289599.test 2014-03-13 18:25:59 +0000
5000+++ mysql-test/t/percona_bug1289599.test 2014-08-22 10:00:31 +0000
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches