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

Proposed by Laurynas Biveinis on 2014-06-03
Status: Merged
Approved by: Sergei Glushchenko on 2014-06-11
Approved revision: 666
Merged at revision: 671
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.5.38
Merge into: lp:percona-server/5.5
Diff against target: 4573 lines (+1830/-359)
103 files modified
CMakeLists.txt (+4/-3)
VERSION (+2/-2)
include/errmsg.h (+4/-2)
libmysql/errmsg.c (+3/-1)
libmysql/libmysql.c (+5/-1)
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 (+96/-6)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+2/-2)
man/mysql-stress-test.pl.1 (+3/-3)
man/mysql-test-run.pl.1 (+4/-4)
man/mysql.1 (+102/-10)
man/mysql.server.1 (+2/-2)
man/mysql_client_test.1 (+3/-3)
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 (+100/-16)
man/mysql_plugin.1 (+2/-2)
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 (+100/-6)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+100/-6)
man/mysqlbinlog.1 (+100/-6)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+100/-6)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+2/-2)
man/mysqld_safe.1 (+2/-2)
man/mysqldump.1 (+102/-10)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+2/-2)
man/mysqlimport.1 (+100/-6)
man/mysqlshow.1 (+100/-6)
man/mysqlslap.1 (+115/-21)
man/mysqltest.1 (+4/-4)
man/ndb-common-options.1 (+2/-2)
man/ndb_blob_tool.1 (+3/-4)
man/ndb_config.1 (+4/-4)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+3/-3)
man/ndb_desc.1 (+4/-5)
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 (+4/-6)
man/ndb_mgm.1 (+2/-2)
man/ndb_mgmd.8 (+2/-2)
man/ndb_print_backup_file.1 (+4/-5)
man/ndb_print_schema_file.1 (+4/-5)
man/ndb_print_sys_file.1 (+4/-5)
man/ndb_restore.1 (+2/-2)
man/ndb_select_all.1 (+4/-5)
man/ndb_select_count.1 (+4/-4)
man/ndb_show_tables.1 (+3/-3)
man/ndb_size.pl.1 (+4/-4)
man/ndb_waiter.1 (+4/-4)
man/ndbd.8 (+2/-2)
man/ndbd_redo_log_reader.1 (+3/-3)
man/ndbinfo_select_all.1 (+2/-2)
man/ndbmtd.8 (+2/-2)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+2/-2)
man/resolveip.1 (+2/-2)
mysql-test/collections/default.experimental (+0/-1)
mysql-test/r/have_cp1251.require (+1/-1)
mysql-test/r/have_cp866.require (+1/-1)
mysql-test/r/have_koi8r.require (+1/-1)
mysql-test/r/loaddata.result (+12/-0)
mysql-test/r/outfile_loaddata.result (+16/-8)
mysql-test/suite/binlog/r/binlog_truncate_kill.result (+33/-0)
mysql-test/suite/binlog/t/binlog_truncate_kill.test (+56/-0)
mysql-test/suite/rpl/r/rpl_row_create_select.result (+28/-0)
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test (+1/-3)
mysql-test/suite/rpl/t/rpl_row_create_select.test (+28/-0)
mysql-test/t/loaddata.test (+21/-0)
mysql-test/t/outfile_loaddata.test (+4/-0)
mysys/my_thr_init.c (+3/-0)
packaging/rpm-oel/mysql.spec.in (+82/-7)
packaging/solaris/CMakeLists.txt (+5/-1)
sql-common/client.c (+16/-6)
sql/field.cc (+3/-6)
sql/item_func.cc (+6/-4)
sql/sql_load.cc (+40/-24)
sql/sql_select.cc (+5/-0)
sql/sql_show.cc (+58/-7)
sql/sql_string.cc (+36/-0)
sql/sql_string.h (+3/-0)
sql/sql_truncate.cc (+38/-13)
sql/sql_truncate.h (+8/-2)
sql/sql_union.cc (+29/-0)
storage/archive/ha_archive.cc (+3/-1)
storage/innobase/row/row0ins.c (+10/-7)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.5.38
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) g2 2014-06-03 Approve on 2014-06-11
Review via email: mp+221892@code.launchpad.net

Description of the change

Merge MySQL 5.5.38, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.38.

Revert ours and take the upstream fix for bug 1274827 aka
http://bugs.mysql.com/bug.php?id=71089.

Import man pages from mysql-5.5.38.tar.gz.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1003/

To post a comment you must log in.

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-03-27 15:42:21 +0000
3+++ CMakeLists.txt 2014-06-03 14:43:23 +0000
4@@ -19,9 +19,10 @@
5 CMAKE_POLICY(VERSION 2.8)
6 endif()
7
8-# fix for http://bugs.mysql.com/bug.php?id=71089
9-IF(NOT(CMAKE_VERSION VERSION_LESS "2.8.12"))
10- CMAKE_POLICY(SET CMP0022 OLD)
11+# We use PROPERTIES LINK_INTERFACE_LIBRARIES. See cmake --help-policy CMP0022
12+IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
13+ CMAKE_VERSION VERSION_GREATER "2.8.12")
14+ CMAKE_POLICY(SET CMP0022 OLD)
15 ENDIF()
16
17 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
18
19=== modified file 'VERSION'
20--- VERSION 2014-03-27 15:42:21 +0000
21+++ VERSION 2014-06-03 14:43:23 +0000
22@@ -1,4 +1,4 @@
23 MYSQL_VERSION_MAJOR=5
24 MYSQL_VERSION_MINOR=5
25-MYSQL_VERSION_PATCH=37
26-MYSQL_VERSION_EXTRA=-35.0
27+MYSQL_VERSION_PATCH=38
28+MYSQL_VERSION_EXTRA=-35.2
29
30=== modified file 'include/errmsg.h'
31--- include/errmsg.h 2013-06-26 07:01:13 +0000
32+++ include/errmsg.h 2014-06-03 14:43:23 +0000
33@@ -1,7 +1,7 @@
34 #ifndef ERRMSG_INCLUDED
35 #define ERRMSG_INCLUDED
36
37-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
38+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
39
40 This program is free software; you can redistribute it and/or modify
41 it under the terms of the GNU General Public License as published by
42@@ -33,7 +33,9 @@
43 #define CR_MIN_ERROR 2000 /* For easier client code */
44 #define CR_MAX_ERROR 2999
45 #if !defined(ER)
46-#define ER(X) client_errors[(X)-CR_MIN_ERROR]
47+#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
48+ client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR])
49+
50 #endif
51 #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */
52
53
54=== modified file 'libmysql/errmsg.c'
55--- libmysql/errmsg.c 2013-06-26 07:01:13 +0000
56+++ libmysql/errmsg.c 2014-06-03 14:43:23 +0000
57@@ -1,4 +1,4 @@
58-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
59+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
60
61 This program is free software; you can redistribute it and/or modify
62 it under the terms of the GNU General Public License as published by
63@@ -106,6 +106,8 @@
64
65 void init_client_errs(void)
66 {
67+ compile_time_assert(array_elements(client_errors) ==
68+ (CR_ERROR_LAST - CR_ERROR_FIRST + 2));
69 (void) my_error_register(get_client_errmsgs, CR_ERROR_FIRST, CR_ERROR_LAST);
70 }
71
72
73=== modified file 'libmysql/libmysql.c'
74--- libmysql/libmysql.c 2014-02-03 04:39:37 +0000
75+++ libmysql/libmysql.c 2014-06-03 14:43:23 +0000
76@@ -1,4 +1,4 @@
77-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
78+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
79
80 This program is free software; you can redistribute it and/or modify
81 it under the terms of the GNU General Public License as published by
82@@ -1316,6 +1316,10 @@
83 res= net_realloc(net, buf_length + length);
84 if (res)
85 {
86+ if (net->last_errno == ER_OUT_OF_RESOURCES)
87+ net->last_errno= CR_OUT_OF_MEMORY;
88+ else if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
89+ net->last_errno= CR_NET_PACKET_TOO_LARGE;
90 strmov(net->sqlstate, unknown_sqlstate);
91 strmov(net->last_error, ER(net->last_errno));
92 }
93
94=== modified file 'man/comp_err.1'
95--- man/comp_err.1 2014-03-27 15:42:21 +0000
96+++ man/comp_err.1 2014-06-03 14:43:23 +0000
97@@ -2,12 +2,12 @@
98 .\" Title: \fBcomp_err\fR
99 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
100 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
101-.\" Date: 03/14/2014
102+.\" Date: 05/11/2014
103 .\" Manual: MySQL Database System
104 .\" Source: MySQL 5.5
105 .\" Language: English
106 .\"
107-.TH "\FBCOMP_ERR\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
108+.TH "\FBCOMP_ERR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
109 .\" -----------------------------------------------------------------
110 .\" * Define some portability stuff
111 .\" -----------------------------------------------------------------
112
113=== modified file 'man/innochecksum.1'
114--- man/innochecksum.1 2014-03-27 15:42:21 +0000
115+++ man/innochecksum.1 2014-06-03 14:43:23 +0000
116@@ -2,12 +2,12 @@
117 .\" Title: \fBinnochecksum\fR
118 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
119 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
120-.\" Date: 03/14/2014
121+.\" Date: 05/11/2014
122 .\" Manual: MySQL Database System
123 .\" Source: MySQL 5.5
124 .\" Language: English
125 .\"
126-.TH "\FBINNOCHECKSUM\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
127+.TH "\FBINNOCHECKSUM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
128 .\" -----------------------------------------------------------------
129 .\" * Define some portability stuff
130 .\" -----------------------------------------------------------------
131
132=== modified file 'man/msql2mysql.1'
133--- man/msql2mysql.1 2014-03-27 15:42:21 +0000
134+++ man/msql2mysql.1 2014-06-03 14:43:23 +0000
135@@ -2,12 +2,12 @@
136 .\" Title: \fBmsql2mysql\fR
137 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
138 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
139-.\" Date: 03/14/2014
140+.\" Date: 05/11/2014
141 .\" Manual: MySQL Database System
142 .\" Source: MySQL 5.5
143 .\" Language: English
144 .\"
145-.TH "\FBMSQL2MYSQL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
146+.TH "\FBMSQL2MYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
147 .\" -----------------------------------------------------------------
148 .\" * Define some portability stuff
149 .\" -----------------------------------------------------------------
150
151=== modified file 'man/my_print_defaults.1'
152--- man/my_print_defaults.1 2014-03-27 15:42:21 +0000
153+++ man/my_print_defaults.1 2014-06-03 14:43:23 +0000
154@@ -2,12 +2,12 @@
155 .\" Title: \fBmy_print_defaults\fR
156 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
157 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
158-.\" Date: 03/14/2014
159+.\" Date: 05/11/2014
160 .\" Manual: MySQL Database System
161 .\" Source: MySQL 5.5
162 .\" Language: English
163 .\"
164-.TH "\FBMY_PRINT_DEFAULTS" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
165+.TH "\FBMY_PRINT_DEFAULTS" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
166 .\" -----------------------------------------------------------------
167 .\" * Define some portability stuff
168 .\" -----------------------------------------------------------------
169
170=== modified file 'man/myisam_ftdump.1'
171--- man/myisam_ftdump.1 2014-03-27 15:42:21 +0000
172+++ man/myisam_ftdump.1 2014-06-03 14:43:23 +0000
173@@ -2,12 +2,12 @@
174 .\" Title: \fBmyisam_ftdump\fR
175 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
176 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
177-.\" Date: 03/14/2014
178+.\" Date: 05/11/2014
179 .\" Manual: MySQL Database System
180 .\" Source: MySQL 5.5
181 .\" Language: English
182 .\"
183-.TH "\FBMYISAM_FTDUMP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
184+.TH "\FBMYISAM_FTDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
185 .\" -----------------------------------------------------------------
186 .\" * Define some portability stuff
187 .\" -----------------------------------------------------------------
188
189=== modified file 'man/myisamchk.1'
190--- man/myisamchk.1 2014-03-27 15:42:21 +0000
191+++ man/myisamchk.1 2014-06-03 14:43:23 +0000
192@@ -2,12 +2,12 @@
193 .\" Title: \fBmyisamchk\fR
194 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
195 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
196-.\" Date: 03/14/2014
197+.\" Date: 05/11/2014
198 .\" Manual: MySQL Database System
199 .\" Source: MySQL 5.5
200 .\" Language: English
201 .\"
202-.TH "\FBMYISAMCHK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
203+.TH "\FBMYISAMCHK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
204 .\" -----------------------------------------------------------------
205 .\" * Define some portability stuff
206 .\" -----------------------------------------------------------------
207@@ -249,10 +249,8 @@
208 \fBmyisamchk\fR
209 supports the following options, which can be specified on the command line or in the
210 [myisamchk]
211-group of an option file\&.
212-\fBmyisamchk\fR
213-also supports the options for processing option files described at
214-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
215+group of an option file\&. For information about option files, see
216+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
217 .SH "MYISAMCHK GENERAL OPTIONS"
218 .\" options: myisamchk
219 .\" myisamchk: options
220@@ -320,6 +318,98 @@
221 .sp -1
222 .IP \(bu 2.3
223 .\}
224+.\" myisamchk: defaults-extra-file option
225+.\" defaults-extra-file option: myisamchk
226+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
227+.sp
228+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
229+\fIfile_name\fR
230+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
231+.RE
232+.sp
233+.RS 4
234+.ie n \{\
235+\h'-04'\(bu\h'+03'\c
236+.\}
237+.el \{\
238+.sp -1
239+.IP \(bu 2.3
240+.\}
241+.\" myisamchk: defaults-file option
242+.\" defaults-file option: myisamchk
243+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
244+.sp
245+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
246+\fIfile_name\fR
247+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
248+.RE
249+.sp
250+.RS 4
251+.ie n \{\
252+\h'-04'\(bu\h'+03'\c
253+.\}
254+.el \{\
255+.sp -1
256+.IP \(bu 2.3
257+.\}
258+.\" myisamchk: defaults-group-suffix option
259+.\" defaults-group-suffix option: myisamchk
260+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
261+.sp
262+Read not only the usual option groups, but also groups with the usual names and a suffix of
263+\fIstr\fR\&. For example,
264+\fBmyisamchk\fR
265+normally reads the
266+[myisamchk]
267+group\&. If the
268+\fB\-\-defaults\-group\-suffix=_other\fR
269+option is given,
270+\fBmyisamchk\fR
271+also reads the
272+[myisamchk_other]
273+group\&.
274+.RE
275+.sp
276+.RS 4
277+.ie n \{\
278+\h'-04'\(bu\h'+03'\c
279+.\}
280+.el \{\
281+.sp -1
282+.IP \(bu 2.3
283+.\}
284+.\" myisamchk: no-defaults option
285+.\" no-defaults option: myisamchk
286+\fB\-\-no\-defaults\fR
287+.sp
288+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
289+\fB\-\-no\-defaults\fR
290+can be used to prevent them from being read\&.
291+.RE
292+.sp
293+.RS 4
294+.ie n \{\
295+\h'-04'\(bu\h'+03'\c
296+.\}
297+.el \{\
298+.sp -1
299+.IP \(bu 2.3
300+.\}
301+.\" myisamchk: print-defaults option
302+.\" print-defaults option: myisamchk
303+\fB\-\-print\-defaults\fR
304+.sp
305+Print the program name and all options that it gets from option files\&.
306+.RE
307+.sp
308+.RS 4
309+.ie n \{\
310+\h'-04'\(bu\h'+03'\c
311+.\}
312+.el \{\
313+.sp -1
314+.IP \(bu 2.3
315+.\}
316 .\" myisamchk: silent option
317 .\" silent option: myisamchk
318 \fB\-\-silent\fR,
319
320=== modified file 'man/myisamlog.1'
321--- man/myisamlog.1 2014-03-27 15:42:21 +0000
322+++ man/myisamlog.1 2014-06-03 14:43:23 +0000
323@@ -2,12 +2,12 @@
324 .\" Title: \fBmyisamlog\fR
325 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
326 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
327-.\" Date: 03/14/2014
328+.\" Date: 05/11/2014
329 .\" Manual: MySQL Database System
330 .\" Source: MySQL 5.5
331 .\" Language: English
332 .\"
333-.TH "\FBMYISAMLOG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
334+.TH "\FBMYISAMLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
335 .\" -----------------------------------------------------------------
336 .\" * Define some portability stuff
337 .\" -----------------------------------------------------------------
338
339=== modified file 'man/myisampack.1'
340--- man/myisampack.1 2014-03-27 15:42:21 +0000
341+++ man/myisampack.1 2014-06-03 14:43:23 +0000
342@@ -2,12 +2,12 @@
343 .\" Title: \fBmyisampack\fR
344 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
345 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
346-.\" Date: 03/14/2014
347+.\" Date: 05/11/2014
348 .\" Manual: MySQL Database System
349 .\" Source: MySQL 5.5
350 .\" Language: English
351 .\"
352-.TH "\FBMYISAMPACK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
353+.TH "\FBMYISAMPACK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
354 .\" -----------------------------------------------------------------
355 .\" * Define some portability stuff
356 .\" -----------------------------------------------------------------
357
358=== modified file 'man/mysql-stress-test.pl.1'
359--- man/mysql-stress-test.pl.1 2014-03-27 15:42:21 +0000
360+++ man/mysql-stress-test.pl.1 2014-06-03 14:43:23 +0000
361@@ -2,12 +2,12 @@
362 .\" Title: \fBmysql-stress-test.pl\fR
363 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
364 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
365-.\" Date: 03/10/2014
366+.\" Date: 05/06/2014
367 .\" Manual: MySQL Database System
368 .\" Source: MySQL
369 .\" Language: English
370 .\"
371-.TH "\FBMYSQL\-STRESS\-TE" "1" "03/10/2014" "MySQL" "MySQL Database System"
372+.TH "\FBMYSQL\-STRESS\-TE" "1" "05/06/2014" "MySQL" "MySQL Database System"
373 .\" -----------------------------------------------------------------
374 .\" * Define some portability stuff
375 .\" -----------------------------------------------------------------
376@@ -498,7 +498,7 @@
377 .SH "COPYRIGHT"
378 .br
379 .PP
380-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
381+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
382 .PP
383 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
384 .PP
385
386=== modified file 'man/mysql-test-run.pl.1'
387--- man/mysql-test-run.pl.1 2014-03-27 15:42:21 +0000
388+++ man/mysql-test-run.pl.1 2014-06-03 14:43:23 +0000
389@@ -2,12 +2,12 @@
390 .\" Title: \fBmysql-test-run.pl\fR
391 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
392 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
393-.\" Date: 03/10/2014
394+.\" Date: 05/06/2014
395 .\" Manual: MySQL Database System
396 .\" Source: MySQL
397 .\" Language: English
398 .\"
399-.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/10/2014" "MySQL" "MySQL Database System"
400+.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/06/2014" "MySQL" "MySQL Database System"
401 .\" -----------------------------------------------------------------
402 .\" * Define some portability stuff
403 .\" -----------------------------------------------------------------
404@@ -1582,7 +1582,7 @@
405 was added in MySQL 5\&.1\&.45 as a more logical alternative to
406 \fB\-\-build\-thread\fR\&. If both are used,
407 \fB\-\-port\-base\fR
408-takes presedence\&.
409+takes precedence\&.
410 .RE
411 .sp
412 .RS 4
413@@ -2551,7 +2551,7 @@
414 .SH "COPYRIGHT"
415 .br
416 .PP
417-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
418+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
419 .PP
420 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
421 .PP
422
423=== modified file 'man/mysql.1'
424--- man/mysql.1 2014-03-27 15:42:21 +0000
425+++ man/mysql.1 2014-06-03 14:43:23 +0000
426@@ -2,12 +2,12 @@
427 .\" Title: \fBmysql\fR
428 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
429 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
430-.\" Date: 03/14/2014
431+.\" Date: 05/11/2014
432 .\" Manual: MySQL Database System
433 .\" Source: MySQL 5.5
434 .\" Language: English
435 .\"
436-.TH "\FBMYSQL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
437+.TH "\FBMYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
438 .\" -----------------------------------------------------------------
439 .\" * Define some portability stuff
440 .\" -----------------------------------------------------------------
441@@ -121,10 +121,8 @@
442 [mysql]
443 and
444 [client]
445-groups of an option file\&.
446-\fBmysql\fR
447-also supports the options for processing option files described at
448-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
449+groups of an option file\&. For information about option files, see
450+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
451 .sp
452 .RS 4
453 .ie n \{\
454@@ -426,6 +424,70 @@
455 .sp -1
456 .IP \(bu 2.3
457 .\}
458+.\" mysql: defaults-extra-file option
459+.\" defaults-extra-file option: mysql
460+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
461+.sp
462+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
463+\fIfile_name\fR
464+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
465+.RE
466+.sp
467+.RS 4
468+.ie n \{\
469+\h'-04'\(bu\h'+03'\c
470+.\}
471+.el \{\
472+.sp -1
473+.IP \(bu 2.3
474+.\}
475+.\" mysql: defaults-file option
476+.\" defaults-file option: mysql
477+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
478+.sp
479+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
480+\fIfile_name\fR
481+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
482+.RE
483+.sp
484+.RS 4
485+.ie n \{\
486+\h'-04'\(bu\h'+03'\c
487+.\}
488+.el \{\
489+.sp -1
490+.IP \(bu 2.3
491+.\}
492+.\" mysql: defaults-group-suffix option
493+.\" defaults-group-suffix option: mysql
494+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
495+.sp
496+Read not only the usual option groups, but also groups with the usual names and a suffix of
497+\fIstr\fR\&. For example,
498+\fBmysql\fR
499+normally reads the
500+[client]
501+and
502+[mysql]
503+groups\&. If the
504+\fB\-\-defaults\-group\-suffix=_other\fR
505+option is given,
506+\fBmysql\fR
507+also reads the
508+[client_other]
509+and
510+[mysql_other]
511+groups\&.
512+.RE
513+.sp
514+.RS 4
515+.ie n \{\
516+\h'-04'\(bu\h'+03'\c
517+.\}
518+.el \{\
519+.sp -1
520+.IP \(bu 2.3
521+.\}
522 .\" mysql: delimiter option
523 .\" delimiter option: mysql
524 \fB\-\-delimiter=\fR\fB\fIstr\fR\fR
525@@ -684,6 +746,23 @@
526 .sp -1
527 .IP \(bu 2.3
528 .\}
529+.\" mysql: no-defaults option
530+.\" no-defaults option: mysql
531+\fB\-\-no\-defaults\fR
532+.sp
533+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
534+\fB\-\-no\-defaults\fR
535+can be used to prevent them from being read\&.
536+.RE
537+.sp
538+.RS 4
539+.ie n \{\
540+\h'-04'\(bu\h'+03'\c
541+.\}
542+.el \{\
543+.sp -1
544+.IP \(bu 2.3
545+.\}
546 .\" mysql: no-named-commands option
547 .\" no-named-commands option: mysql
548 \fB\-\-no\-named\-commands\fR,
549@@ -954,6 +1033,21 @@
550 .sp -1
551 .IP \(bu 2.3
552 .\}
553+.\" mysql: print-defaults option
554+.\" print-defaults option: mysql
555+\fB\-\-print\-defaults\fR
556+.sp
557+Print the program name and all options that it gets from option files\&.
558+.RE
559+.sp
560+.RS 4
561+.ie n \{\
562+\h'-04'\(bu\h'+03'\c
563+.\}
564+.el \{\
565+.sp -1
566+.IP \(bu 2.3
567+.\}
568 .\" mysql: prompt option
569 .\" prompt option: mysql
570 \fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
571@@ -2575,8 +2669,7 @@
572 in your home directory\&. To specify a different file, set the value of the
573 MYSQL_HISTFILE
574 environment variable\&.
575- How Logging Occurs
576-.PP
577+How Logging Occurs.PP
578 Statement logging occurs as follows:
579 .sp
580 .RS 4
581@@ -2663,8 +2756,7 @@
582 .RE
583 .\}
584 .sp
585- Controlling the History File
586-.PP
587+Controlling the History File.PP
588 The
589 \&.mysql_history
590 file should be protected with a restrictive access mode because sensitive information might be written to it, such as the text of SQL statements that contain passwords\&. See
591
592=== modified file 'man/mysql.server.1'
593--- man/mysql.server.1 2014-03-27 15:42:21 +0000
594+++ man/mysql.server.1 2014-06-03 14:43:23 +0000
595@@ -2,12 +2,12 @@
596 .\" Title: \fBmysql.server\fR
597 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
598 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
599-.\" Date: 03/14/2014
600+.\" Date: 05/11/2014
601 .\" Manual: MySQL Database System
602 .\" Source: MySQL 5.5
603 .\" Language: English
604 .\"
605-.TH "\FBMYSQL\&.SERVER\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
606+.TH "\FBMYSQL\&.SERVER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
607 .\" -----------------------------------------------------------------
608 .\" * Define some portability stuff
609 .\" -----------------------------------------------------------------
610
611=== modified file 'man/mysql_client_test.1'
612--- man/mysql_client_test.1 2014-03-27 15:42:21 +0000
613+++ man/mysql_client_test.1 2014-06-03 14:43:23 +0000
614@@ -2,12 +2,12 @@
615 .\" Title: \fBmysql_client_test\fR
616 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
617 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
618-.\" Date: 03/10/2014
619+.\" Date: 05/06/2014
620 .\" Manual: MySQL Database System
621 .\" Source: MySQL
622 .\" Language: English
623 .\"
624-.TH "\FBMYSQL_CLIENT_TEST" "1" "03/10/2014" "MySQL" "MySQL Database System"
625+.TH "\FBMYSQL_CLIENT_TEST" "1" "05/06/2014" "MySQL" "MySQL Database System"
626 .\" -----------------------------------------------------------------
627 .\" * Define some portability stuff
628 .\" -----------------------------------------------------------------
629@@ -335,7 +335,7 @@
630 .SH "COPYRIGHT"
631 .br
632 .PP
633-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
634+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
635 .PP
636 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
637 .PP
638
639=== modified file 'man/mysql_config.1'
640--- man/mysql_config.1 2014-03-27 15:42:21 +0000
641+++ man/mysql_config.1 2014-06-03 14:43:23 +0000
642@@ -2,12 +2,12 @@
643 .\" Title: \fBmysql_config\fR
644 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
645 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
646-.\" Date: 03/14/2014
647+.\" Date: 05/11/2014
648 .\" Manual: MySQL Database System
649 .\" Source: MySQL 5.5
650 .\" Language: English
651 .\"
652-.TH "\FBMYSQL_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
653+.TH "\FBMYSQL_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
654 .\" -----------------------------------------------------------------
655 .\" * Define some portability stuff
656 .\" -----------------------------------------------------------------
657
658=== modified file 'man/mysql_convert_table_format.1'
659--- man/mysql_convert_table_format.1 2014-03-27 15:42:21 +0000
660+++ man/mysql_convert_table_format.1 2014-06-03 14:43:23 +0000
661@@ -2,12 +2,12 @@
662 .\" Title: \fBmysql_convert_table_format\fR
663 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
664 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
665-.\" Date: 03/14/2014
666+.\" Date: 05/11/2014
667 .\" Manual: MySQL Database System
668 .\" Source: MySQL 5.5
669 .\" Language: English
670 .\"
671-.TH "\FBMYSQL_CONVERT_TAB" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
672+.TH "\FBMYSQL_CONVERT_TAB" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
673 .\" -----------------------------------------------------------------
674 .\" * Define some portability stuff
675 .\" -----------------------------------------------------------------
676
677=== modified file 'man/mysql_find_rows.1'
678--- man/mysql_find_rows.1 2014-03-27 15:42:21 +0000
679+++ man/mysql_find_rows.1 2014-06-03 14:43:23 +0000
680@@ -2,12 +2,12 @@
681 .\" Title: \fBmysql_find_rows\fR
682 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
683 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
684-.\" Date: 03/14/2014
685+.\" Date: 05/11/2014
686 .\" Manual: MySQL Database System
687 .\" Source: MySQL 5.5
688 .\" Language: English
689 .\"
690-.TH "\FBMYSQL_FIND_ROWS\F" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
691+.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
692 .\" -----------------------------------------------------------------
693 .\" * Define some portability stuff
694 .\" -----------------------------------------------------------------
695
696=== modified file 'man/mysql_fix_extensions.1'
697--- man/mysql_fix_extensions.1 2014-03-27 15:42:21 +0000
698+++ man/mysql_fix_extensions.1 2014-06-03 14:43:23 +0000
699@@ -2,12 +2,12 @@
700 .\" Title: \fBmysql_fix_extensions\fR
701 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
702 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
703-.\" Date: 03/14/2014
704+.\" Date: 05/11/2014
705 .\" Manual: MySQL Database System
706 .\" Source: MySQL 5.5
707 .\" Language: English
708 .\"
709-.TH "\FBMYSQL_FIX_EXTENSI" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
710+.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
711 .\" -----------------------------------------------------------------
712 .\" * Define some portability stuff
713 .\" -----------------------------------------------------------------
714
715=== modified file 'man/mysql_install_db.1'
716--- man/mysql_install_db.1 2014-03-27 15:42:21 +0000
717+++ man/mysql_install_db.1 2014-06-03 14:43:23 +0000
718@@ -2,12 +2,12 @@
719 .\" Title: \fBmysql_install_db\fR
720 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
721 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
722-.\" Date: 03/14/2014
723+.\" Date: 05/11/2014
724 .\" Manual: MySQL Database System
725 .\" Source: MySQL 5.5
726 .\" Language: English
727 .\"
728-.TH "\FBMYSQL_INSTALL_DB\" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
729+.TH "\FBMYSQL_INSTALL_DB\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
730 .\" -----------------------------------------------------------------
731 .\" * Define some portability stuff
732 .\" -----------------------------------------------------------------
733@@ -56,7 +56,7 @@
734 .\}
735 .PP
736 Because the MySQL server,
737-\fBmysqld\fR, needs to access the data directory when it runs later, you should either run
738+\fBmysqld\fR, must access the data directory when it runs later, you should either run
739 \fBmysql_install_db\fR
740 from the same system account that will be used for running
741 \fBmysqld\fR
742@@ -85,15 +85,7 @@
743 .if n \{\
744 .RE
745 .\}
746-.PP
747-\fBmysql_install_db\fR
748-needs to invoke
749-\fBmysqld\fR
750-with the
751-\fB\-\-bootstrap\fR
752-and
753-\fB\-\-skip\-grant\-tables\fR
754-options\&.
755+.sp
756 .if n \{\
757 .sp
758 .\}
759@@ -130,9 +122,21 @@
760 group\&.) Other options are passed to
761 \fBmysqld\fR\&. For information about option files, see
762 Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
763-\fBmysql_install_db\fR
764-also supports the options for processing option files described at
765-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
766+.sp
767+.RS 4
768+.ie n \{\
769+\h'-04'\(bu\h'+03'\c
770+.\}
771+.el \{\
772+.sp -1
773+.IP \(bu 2.3
774+.\}
775+.\" mysql_install_db: help option
776+.\" help option: mysql_install_db
777+\fB\-\-help\fR
778+.sp
779+Display a help message and exit\&.
780+.RE
781 .sp
782 .RS 4
783 .ie n \{\
784@@ -157,6 +161,38 @@
785 .sp -1
786 .IP \(bu 2.3
787 .\}
788+.\" mysql_install_db: builddir option
789+.\" builddir option: mysql_install_db
790+\fB\-\-builddir=\fR\fB\fIpath\fR\fR
791+.sp
792+For use with
793+\fB\-\-srcdir\fR
794+and out\-of\-source builds\&. Set this to the location of the directory where the built files reside\&.
795+.RE
796+.sp
797+.RS 4
798+.ie n \{\
799+\h'-04'\(bu\h'+03'\c
800+.\}
801+.el \{\
802+.sp -1
803+.IP \(bu 2.3
804+.\}
805+.\" mysql_install_db: cross-bootstrap option
806+.\" cross-bootstrap option: mysql_install_db
807+\fB\-\-cross\-bootstrap\fR
808+.sp
809+For internal use\&. This option is used for building system tables on one host intended for another\&.
810+.RE
811+.sp
812+.RS 4
813+.ie n \{\
814+\h'-04'\(bu\h'+03'\c
815+.\}
816+.el \{\
817+.sp -1
818+.IP \(bu 2.3
819+.\}
820 .\" mysql_install_db: datadir option
821 .\" datadir option: mysql_install_db
822 .\" mysql_install_db: ldata option
823@@ -175,13 +211,61 @@
824 .sp -1
825 .IP \(bu 2.3
826 .\}
827+.\" defaults-extra-file option
828+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
829+.sp
830+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
831+\fIfile_name\fR
832+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
833+.RE
834+.sp
835+.RS 4
836+.ie n \{\
837+\h'-04'\(bu\h'+03'\c
838+.\}
839+.el \{\
840+.sp -1
841+.IP \(bu 2.3
842+.\}
843+.\" defaults-file option
844+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
845+.sp
846+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
847+\fIfile_name\fR
848+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
849+.RE
850+.sp
851+.RS 4
852+.ie n \{\
853+\h'-04'\(bu\h'+03'\c
854+.\}
855+.el \{\
856+.sp -1
857+.IP \(bu 2.3
858+.\}
859 .\" mysql_install_db: force option
860 .\" force option: mysql_install_db
861 \fB\-\-force\fR
862 .sp
863 Cause
864 \fBmysql_install_db\fR
865-to run even if DNS does not work\&. Grant table entries that normally use host names will use IP addresses\&.
866+to run even if DNS does not work\&. Grant table entries normally created using host names will use IP addresses instead\&.
867+.RE
868+.sp
869+.RS 4
870+.ie n \{\
871+\h'-04'\(bu\h'+03'\c
872+.\}
873+.el \{\
874+.sp -1
875+.IP \(bu 2.3
876+.\}
877+.\" no-defaults option
878+\fB\-\-no\-defaults\fR
879+.sp
880+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
881+\fB\-\-no\-defaults\fR
882+can be used to prevent them from being read\&.
883 .RE
884 .sp
885 .RS 4
886
887=== modified file 'man/mysql_plugin.1'
888--- man/mysql_plugin.1 2014-03-27 15:42:21 +0000
889+++ man/mysql_plugin.1 2014-06-03 14:43:23 +0000
890@@ -2,12 +2,12 @@
891 .\" Title: \fBmysql_plugin\fR
892 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
893 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
894-.\" Date: 03/14/2014
895+.\" Date: 05/11/2014
896 .\" Manual: MySQL Database System
897 .\" Source: MySQL 5.5
898 .\" Language: English
899 .\"
900-.TH "\FBMYSQL_PLUGIN\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
901+.TH "\FBMYSQL_PLUGIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
902 .\" -----------------------------------------------------------------
903 .\" * Define some portability stuff
904 .\" -----------------------------------------------------------------
905
906=== modified file 'man/mysql_secure_installation.1'
907--- man/mysql_secure_installation.1 2014-03-27 15:42:21 +0000
908+++ man/mysql_secure_installation.1 2014-06-03 14:43:23 +0000
909@@ -2,12 +2,12 @@
910 .\" Title: \fBmysql_secure_installation\fR
911 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
912 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
913-.\" Date: 03/14/2014
914+.\" Date: 05/11/2014
915 .\" Manual: MySQL Database System
916 .\" Source: MySQL 5.5
917 .\" Language: English
918 .\"
919-.TH "\FBMYSQL_SECURE_INST" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
920+.TH "\FBMYSQL_SECURE_INST" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
921 .\" -----------------------------------------------------------------
922 .\" * Define some portability stuff
923 .\" -----------------------------------------------------------------
924
925=== modified file 'man/mysql_setpermission.1'
926--- man/mysql_setpermission.1 2014-03-27 15:42:21 +0000
927+++ man/mysql_setpermission.1 2014-06-03 14:43:23 +0000
928@@ -2,12 +2,12 @@
929 .\" Title: \fBmysql_setpermission\fR
930 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
931 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
932-.\" Date: 03/14/2014
933+.\" Date: 05/11/2014
934 .\" Manual: MySQL Database System
935 .\" Source: MySQL 5.5
936 .\" Language: English
937 .\"
938-.TH "\FBMYSQL_SETPERMISSI" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
939+.TH "\FBMYSQL_SETPERMISSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
940 .\" -----------------------------------------------------------------
941 .\" * Define some portability stuff
942 .\" -----------------------------------------------------------------
943
944=== modified file 'man/mysql_tzinfo_to_sql.1'
945--- man/mysql_tzinfo_to_sql.1 2014-03-27 15:42:21 +0000
946+++ man/mysql_tzinfo_to_sql.1 2014-06-03 14:43:23 +0000
947@@ -2,12 +2,12 @@
948 .\" Title: \fBmysql_tzinfo_to_sql\fR
949 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
950 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
951-.\" Date: 03/14/2014
952+.\" Date: 05/11/2014
953 .\" Manual: MySQL Database System
954 .\" Source: MySQL 5.5
955 .\" Language: English
956 .\"
957-.TH "\FBMYSQL_TZINFO_TO_S" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
958+.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
959 .\" -----------------------------------------------------------------
960 .\" * Define some portability stuff
961 .\" -----------------------------------------------------------------
962
963=== modified file 'man/mysql_upgrade.1'
964--- man/mysql_upgrade.1 2014-03-27 15:42:21 +0000
965+++ man/mysql_upgrade.1 2014-06-03 14:43:23 +0000
966@@ -2,12 +2,12 @@
967 .\" Title: \fBmysql_upgrade\fR
968 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
969 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
970-.\" Date: 03/14/2014
971+.\" Date: 05/11/2014
972 .\" Manual: MySQL Database System
973 .\" Source: MySQL 5.5
974 .\" Language: English
975 .\"
976-.TH "\FBMYSQL_UPGRADE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
977+.TH "\FBMYSQL_UPGRADE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
978 .\" -----------------------------------------------------------------
979 .\" * Define some portability stuff
980 .\" -----------------------------------------------------------------
981@@ -207,10 +207,8 @@
982 groups of an option file\&. Other options are passed to
983 \fBmysqlcheck\fR\&. For example, it might be necessary to specify the
984 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
985-option\&.
986-\fBmysql_upgrade\fR
987-also supports the options for processing option files described at
988-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
989+option\&. For information about option files, see
990+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
991 .sp
992 .RS 4
993 .ie n \{\
994@@ -334,6 +332,70 @@
995 .sp -1
996 .IP \(bu 2.3
997 .\}
998+.\" mysql_upgrade: defaults-extra-file option
999+.\" defaults-extra-file option: mysql_upgrade
1000+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
1001+.sp
1002+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1003+\fIfile_name\fR
1004+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1005+.RE
1006+.sp
1007+.RS 4
1008+.ie n \{\
1009+\h'-04'\(bu\h'+03'\c
1010+.\}
1011+.el \{\
1012+.sp -1
1013+.IP \(bu 2.3
1014+.\}
1015+.\" mysql_upgrade: defaults-file option
1016+.\" defaults-file option: mysql_upgrade
1017+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
1018+.sp
1019+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1020+\fIfile_name\fR
1021+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1022+.RE
1023+.sp
1024+.RS 4
1025+.ie n \{\
1026+\h'-04'\(bu\h'+03'\c
1027+.\}
1028+.el \{\
1029+.sp -1
1030+.IP \(bu 2.3
1031+.\}
1032+.\" mysql_upgrade: defaults-group-suffix option
1033+.\" defaults-group-suffix option: mysql_upgrade
1034+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
1035+.sp
1036+Read not only the usual option groups, but also groups with the usual names and a suffix of
1037+\fIstr\fR\&. For example,
1038+\fBmysql_upgrade\fR
1039+normally reads the
1040+[client]
1041+and
1042+[mysql_upgrade]
1043+groups\&. If the
1044+\fB\-\-defaults\-group\-suffix=_other\fR
1045+option is given,
1046+\fBmysql_upgrade\fR
1047+also reads the
1048+[client_other]
1049+and
1050+[mysql_upgrade_other]
1051+groups\&.
1052+.RE
1053+.sp
1054+.RS 4
1055+.ie n \{\
1056+\h'-04'\(bu\h'+03'\c
1057+.\}
1058+.el \{\
1059+.sp -1
1060+.IP \(bu 2.3
1061+.\}
1062 .\" mysql_upgrade: force option
1063 .\" force option: mysql_upgrade
1064 \fB\-\-force\fR
1065@@ -355,6 +417,23 @@
1066 .sp -1
1067 .IP \(bu 2.3
1068 .\}
1069+.\" mysql_upgrade: no-defaults option
1070+.\" no-defaults option: mysql_upgrade
1071+\fB\-\-no\-defaults\fR
1072+.sp
1073+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
1074+\fB\-\-no\-defaults\fR
1075+can be used to prevent them from being read\&.
1076+.RE
1077+.sp
1078+.RS 4
1079+.ie n \{\
1080+\h'-04'\(bu\h'+03'\c
1081+.\}
1082+.el \{\
1083+.sp -1
1084+.IP \(bu 2.3
1085+.\}
1086 .\" mysql_upgrade: plugin-dir option
1087 .\" plugin-dir option: mysql_upgrade
1088 \fB\-\-plugin\-dir=\fR\fB\fIpath\fR\fR
1089@@ -377,6 +456,21 @@
1090 .sp -1
1091 .IP \(bu 2.3
1092 .\}
1093+.\" mysql_upgrade: print-defaults option
1094+.\" print-defaults option: mysql_upgrade
1095+\fB\-\-print\-defaults\fR
1096+.sp
1097+Print the program name and all options that it gets from option files\&.
1098+.RE
1099+.sp
1100+.RS 4
1101+.ie n \{\
1102+\h'-04'\(bu\h'+03'\c
1103+.\}
1104+.el \{\
1105+.sp -1
1106+.IP \(bu 2.3
1107+.\}
1108 .\" mysql_upgrade: tmpdir option
1109 .\" tmpdir option: mysql_upgrade
1110 \fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
1111
1112=== modified file 'man/mysql_waitpid.1'
1113--- man/mysql_waitpid.1 2014-03-27 15:42:21 +0000
1114+++ man/mysql_waitpid.1 2014-06-03 14:43:23 +0000
1115@@ -2,12 +2,12 @@
1116 .\" Title: \fBmysql_waitpid\fR
1117 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1118 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1119-.\" Date: 03/14/2014
1120+.\" Date: 05/11/2014
1121 .\" Manual: MySQL Database System
1122 .\" Source: MySQL 5.5
1123 .\" Language: English
1124 .\"
1125-.TH "\FBMYSQL_WAITPID\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1126+.TH "\FBMYSQL_WAITPID\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1127 .\" -----------------------------------------------------------------
1128 .\" * Define some portability stuff
1129 .\" -----------------------------------------------------------------
1130
1131=== modified file 'man/mysql_zap.1'
1132--- man/mysql_zap.1 2014-03-27 15:42:21 +0000
1133+++ man/mysql_zap.1 2014-06-03 14:43:23 +0000
1134@@ -2,12 +2,12 @@
1135 .\" Title: \fBmysql_zap\fR
1136 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1137 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1138-.\" Date: 03/14/2014
1139+.\" Date: 05/11/2014
1140 .\" Manual: MySQL Database System
1141 .\" Source: MySQL 5.5
1142 .\" Language: English
1143 .\"
1144-.TH "\FBMYSQL_ZAP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1145+.TH "\FBMYSQL_ZAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1146 .\" -----------------------------------------------------------------
1147 .\" * Define some portability stuff
1148 .\" -----------------------------------------------------------------
1149
1150=== modified file 'man/mysqlaccess.1'
1151--- man/mysqlaccess.1 2014-03-27 15:42:21 +0000
1152+++ man/mysqlaccess.1 2014-06-03 14:43:23 +0000
1153@@ -2,12 +2,12 @@
1154 .\" Title: \fBmysqlaccess\fR
1155 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1156 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1157-.\" Date: 03/14/2014
1158+.\" Date: 05/11/2014
1159 .\" Manual: MySQL Database System
1160 .\" Source: MySQL 5.5
1161 .\" Language: English
1162 .\"
1163-.TH "\FBMYSQLACCESS\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1164+.TH "\FBMYSQLACCESS\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1165 .\" -----------------------------------------------------------------
1166 .\" * Define some portability stuff
1167 .\" -----------------------------------------------------------------
1168
1169=== modified file 'man/mysqladmin.1'
1170--- man/mysqladmin.1 2014-03-27 15:42:21 +0000
1171+++ man/mysqladmin.1 2014-06-03 14:43:23 +0000
1172@@ -2,12 +2,12 @@
1173 .\" Title: \fBmysqladmin\fR
1174 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1175 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1176-.\" Date: 03/14/2014
1177+.\" Date: 05/11/2014
1178 .\" Manual: MySQL Database System
1179 .\" Source: MySQL 5.5
1180 .\" Language: English
1181 .\"
1182-.TH "\FBMYSQLADMIN\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1183+.TH "\FBMYSQLADMIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1184 .\" -----------------------------------------------------------------
1185 .\" * Define some portability stuff
1186 .\" -----------------------------------------------------------------
1187@@ -609,10 +609,8 @@
1188 [mysqladmin]
1189 and
1190 [client]
1191-groups of an option file\&.
1192-\fBmysqladmin\fR
1193-also supports the options for processing option files described at
1194-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1195+groups of an option file\&. For information about option files, see
1196+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1197 .sp
1198 .RS 4
1199 .ie n \{\
1200@@ -793,6 +791,70 @@
1201 .sp -1
1202 .IP \(bu 2.3
1203 .\}
1204+.\" mysqladmin: defaults-extra-file option
1205+.\" defaults-extra-file option: mysqladmin
1206+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
1207+.sp
1208+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1209+\fIfile_name\fR
1210+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1211+.RE
1212+.sp
1213+.RS 4
1214+.ie n \{\
1215+\h'-04'\(bu\h'+03'\c
1216+.\}
1217+.el \{\
1218+.sp -1
1219+.IP \(bu 2.3
1220+.\}
1221+.\" mysqladmin: defaults-file option
1222+.\" defaults-file option: mysqladmin
1223+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
1224+.sp
1225+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1226+\fIfile_name\fR
1227+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1228+.RE
1229+.sp
1230+.RS 4
1231+.ie n \{\
1232+\h'-04'\(bu\h'+03'\c
1233+.\}
1234+.el \{\
1235+.sp -1
1236+.IP \(bu 2.3
1237+.\}
1238+.\" mysqladmin: defaults-group-suffix option
1239+.\" defaults-group-suffix option: mysqladmin
1240+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
1241+.sp
1242+Read not only the usual option groups, but also groups with the usual names and a suffix of
1243+\fIstr\fR\&. For example,
1244+\fBmysqladmin\fR
1245+normally reads the
1246+[client]
1247+and
1248+[mysqladmin]
1249+groups\&. If the
1250+\fB\-\-defaults\-group\-suffix=_other\fR
1251+option is given,
1252+\fBmysqladmin\fR
1253+also reads the
1254+[client_other]
1255+and
1256+[mysqladmin_other]
1257+groups\&.
1258+.RE
1259+.sp
1260+.RS 4
1261+.ie n \{\
1262+\h'-04'\(bu\h'+03'\c
1263+.\}
1264+.el \{\
1265+.sp -1
1266+.IP \(bu 2.3
1267+.\}
1268 .\" mysqladmin: enable-cleartext-plugin option
1269 .\" enable-cleartext-plugin option: mysqladmin
1270 \fB\-\-enable\-cleartext\-plugin\fR
1271@@ -861,6 +923,23 @@
1272 .sp -1
1273 .IP \(bu 2.3
1274 .\}
1275+.\" mysqladmin: no-defaults option
1276+.\" no-defaults option: mysqladmin
1277+\fB\-\-no\-defaults\fR
1278+.sp
1279+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
1280+\fB\-\-no\-defaults\fR
1281+can be used to prevent them from being read\&.
1282+.RE
1283+.sp
1284+.RS 4
1285+.ie n \{\
1286+\h'-04'\(bu\h'+03'\c
1287+.\}
1288+.el \{\
1289+.sp -1
1290+.IP \(bu 2.3
1291+.\}
1292 .\" mysqladmin: password option
1293 .\" password option: mysqladmin
1294 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
1295@@ -944,6 +1023,21 @@
1296 .sp -1
1297 .IP \(bu 2.3
1298 .\}
1299+.\" mysqladmin: print-defaults option
1300+.\" print-defaults option: mysqladmin
1301+\fB\-\-print\-defaults\fR
1302+.sp
1303+Print the program name and all options that it gets from option files\&.
1304+.RE
1305+.sp
1306+.RS 4
1307+.ie n \{\
1308+\h'-04'\(bu\h'+03'\c
1309+.\}
1310+.el \{\
1311+.sp -1
1312+.IP \(bu 2.3
1313+.\}
1314 .\" mysqladmin: protocol option
1315 .\" protocol option: mysqladmin
1316 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
1317
1318=== modified file 'man/mysqlbinlog.1'
1319--- man/mysqlbinlog.1 2014-03-27 15:42:21 +0000
1320+++ man/mysqlbinlog.1 2014-06-03 14:43:23 +0000
1321@@ -2,12 +2,12 @@
1322 .\" Title: \fBmysqlbinlog\fR
1323 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1324 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1325-.\" Date: 03/14/2014
1326+.\" Date: 05/11/2014
1327 .\" Manual: MySQL Database System
1328 .\" Source: MySQL 5.5
1329 .\" Language: English
1330 .\"
1331-.TH "\FBMYSQLBINLOG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1332+.TH "\FBMYSQLBINLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1333 .\" -----------------------------------------------------------------
1334 .\" * Define some portability stuff
1335 .\" -----------------------------------------------------------------
1336@@ -133,10 +133,8 @@
1337 [mysqlbinlog]
1338 and
1339 [client]
1340-groups of an option file\&.
1341-\fBmysqlbinlog\fR
1342-also supports the options for processing option files described at
1343-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1344+groups of an option file\&. For information about option files, see
1345+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1346 .sp
1347 .RS 4
1348 .ie n \{\
1349@@ -563,6 +561,70 @@
1350 .sp -1
1351 .IP \(bu 2.3
1352 .\}
1353+.\" mysqlbinlog: defaults-extra-file option
1354+.\" defaults-extra-file option: mysqlbinlog
1355+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
1356+.sp
1357+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1358+\fIfile_name\fR
1359+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1360+.RE
1361+.sp
1362+.RS 4
1363+.ie n \{\
1364+\h'-04'\(bu\h'+03'\c
1365+.\}
1366+.el \{\
1367+.sp -1
1368+.IP \(bu 2.3
1369+.\}
1370+.\" mysqlbinlog: defaults-file option
1371+.\" defaults-file option: mysqlbinlog
1372+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
1373+.sp
1374+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1375+\fIfile_name\fR
1376+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1377+.RE
1378+.sp
1379+.RS 4
1380+.ie n \{\
1381+\h'-04'\(bu\h'+03'\c
1382+.\}
1383+.el \{\
1384+.sp -1
1385+.IP \(bu 2.3
1386+.\}
1387+.\" mysqlbinlog: defaults-group-suffix option
1388+.\" defaults-group-suffix option: mysqlbinlog
1389+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
1390+.sp
1391+Read not only the usual option groups, but also groups with the usual names and a suffix of
1392+\fIstr\fR\&. For example,
1393+\fBmysqlbinlog\fR
1394+normally reads the
1395+[client]
1396+and
1397+[mysqlbinlog]
1398+groups\&. If the
1399+\fB\-\-defaults\-group\-suffix=_other\fR
1400+option is given,
1401+\fBmysqlbinlog\fR
1402+also reads the
1403+[client_other]
1404+and
1405+[mysqlbinlog_other]
1406+groups\&.
1407+.RE
1408+.sp
1409+.RS 4
1410+.ie n \{\
1411+\h'-04'\(bu\h'+03'\c
1412+.\}
1413+.el \{\
1414+.sp -1
1415+.IP \(bu 2.3
1416+.\}
1417 .\" mysqlbinlog: disable-log-bin option
1418 .\" disable-log-bin option: mysqlbinlog
1419 \fB\-\-disable\-log\-bin\fR,
1420@@ -697,6 +759,23 @@
1421 .sp -1
1422 .IP \(bu 2.3
1423 .\}
1424+.\" mysqlbinlog: no-defaults option
1425+.\" no-defaults option: mysqlbinlog
1426+\fB\-\-no\-defaults\fR
1427+.sp
1428+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
1429+\fB\-\-no\-defaults\fR
1430+can be used to prevent them from being read\&.
1431+.RE
1432+.sp
1433+.RS 4
1434+.ie n \{\
1435+\h'-04'\(bu\h'+03'\c
1436+.\}
1437+.el \{\
1438+.sp -1
1439+.IP \(bu 2.3
1440+.\}
1441 .\" mysqlbinlog: offset option
1442 .\" offset option: mysqlbinlog
1443 \fB\-\-offset=\fR\fB\fIN\fR\fR,
1444@@ -801,6 +880,21 @@
1445 .sp -1
1446 .IP \(bu 2.3
1447 .\}
1448+.\" mysqlbinlog: print-defaults option
1449+.\" print-defaults option: mysqlbinlog
1450+\fB\-\-print\-defaults\fR
1451+.sp
1452+Print the program name and all options that it gets from option files\&.
1453+.RE
1454+.sp
1455+.RS 4
1456+.ie n \{\
1457+\h'-04'\(bu\h'+03'\c
1458+.\}
1459+.el \{\
1460+.sp -1
1461+.IP \(bu 2.3
1462+.\}
1463 .\" mysqlbinlog: protocol option
1464 .\" protocol option: mysqlbinlog
1465 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
1466
1467=== modified file 'man/mysqlbug.1'
1468--- man/mysqlbug.1 2014-03-27 15:42:21 +0000
1469+++ man/mysqlbug.1 2014-06-03 14:43:23 +0000
1470@@ -2,12 +2,12 @@
1471 .\" Title: \fBmysqlbug\fR
1472 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1473 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1474-.\" Date: 03/14/2014
1475+.\" Date: 05/11/2014
1476 .\" Manual: MySQL Database System
1477 .\" Source: MySQL 5.5
1478 .\" Language: English
1479 .\"
1480-.TH "\FBMYSQLBUG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1481+.TH "\FBMYSQLBUG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1482 .\" -----------------------------------------------------------------
1483 .\" * Define some portability stuff
1484 .\" -----------------------------------------------------------------
1485
1486=== modified file 'man/mysqlcheck.1'
1487--- man/mysqlcheck.1 2014-03-27 15:42:21 +0000
1488+++ man/mysqlcheck.1 2014-06-03 14:43:23 +0000
1489@@ -2,12 +2,12 @@
1490 .\" Title: \fBmysqlcheck\fR
1491 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1492 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1493-.\" Date: 03/14/2014
1494+.\" Date: 05/11/2014
1495 .\" Manual: MySQL Database System
1496 .\" Source: MySQL 5.5
1497 .\" Language: English
1498 .\"
1499-.TH "\FBMYSQLCHECK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1500+.TH "\FBMYSQLCHECK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1501 .\" -----------------------------------------------------------------
1502 .\" * Define some portability stuff
1503 .\" -----------------------------------------------------------------
1504@@ -204,10 +204,8 @@
1505 [mysqlcheck]
1506 and
1507 [client]
1508-groups of an option file\&.
1509-\fBmysqlcheck\fR
1510-also supports the options for processing option files described at
1511-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1512+groups of an option file\&. For information about option files, see
1513+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1514 .sp
1515 .RS 4
1516 .ie n \{\
1517@@ -490,6 +488,70 @@
1518 .sp -1
1519 .IP \(bu 2.3
1520 .\}
1521+.\" mysqlcheck: defaults-extra-file option
1522+.\" defaults-extra-file option: mysqlcheck
1523+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
1524+.sp
1525+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1526+\fIfile_name\fR
1527+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1528+.RE
1529+.sp
1530+.RS 4
1531+.ie n \{\
1532+\h'-04'\(bu\h'+03'\c
1533+.\}
1534+.el \{\
1535+.sp -1
1536+.IP \(bu 2.3
1537+.\}
1538+.\" mysqlcheck: defaults-file option
1539+.\" defaults-file option: mysqlcheck
1540+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
1541+.sp
1542+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1543+\fIfile_name\fR
1544+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1545+.RE
1546+.sp
1547+.RS 4
1548+.ie n \{\
1549+\h'-04'\(bu\h'+03'\c
1550+.\}
1551+.el \{\
1552+.sp -1
1553+.IP \(bu 2.3
1554+.\}
1555+.\" mysqlcheck: defaults-group-suffix option
1556+.\" defaults-group-suffix option: mysqlcheck
1557+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
1558+.sp
1559+Read not only the usual option groups, but also groups with the usual names and a suffix of
1560+\fIstr\fR\&. For example,
1561+\fBmysqlcheck\fR
1562+normally reads the
1563+[client]
1564+and
1565+[mysqlcheck]
1566+groups\&. If the
1567+\fB\-\-defaults\-group\-suffix=_other\fR
1568+option is given,
1569+\fBmysqlcheck\fR
1570+also reads the
1571+[client_other]
1572+and
1573+[mysqlcheck_other]
1574+groups\&.
1575+.RE
1576+.sp
1577+.RS 4
1578+.ie n \{\
1579+\h'-04'\(bu\h'+03'\c
1580+.\}
1581+.el \{\
1582+.sp -1
1583+.IP \(bu 2.3
1584+.\}
1585 .\" mysqlcheck: extended option
1586 .\" extended option: mysqlcheck
1587 \fB\-\-extended\fR,
1588@@ -622,6 +684,23 @@
1589 .sp -1
1590 .IP \(bu 2.3
1591 .\}
1592+.\" mysqlcheck: no-defaults option
1593+.\" no-defaults option: mysqlcheck
1594+\fB\-\-no\-defaults\fR
1595+.sp
1596+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
1597+\fB\-\-no\-defaults\fR
1598+can be used to prevent them from being read\&.
1599+.RE
1600+.sp
1601+.RS 4
1602+.ie n \{\
1603+\h'-04'\(bu\h'+03'\c
1604+.\}
1605+.el \{\
1606+.sp -1
1607+.IP \(bu 2.3
1608+.\}
1609 .\" mysqlcheck: optimize option
1610 .\" optimize option: mysqlcheck
1611 \fB\-\-optimize\fR,
1612@@ -721,6 +800,21 @@
1613 .sp -1
1614 .IP \(bu 2.3
1615 .\}
1616+.\" mysqlcheck: print-defaults option
1617+.\" print-defaults option: mysqlcheck
1618+\fB\-\-print\-defaults\fR
1619+.sp
1620+Print the program name and all options that it gets from option files\&.
1621+.RE
1622+.sp
1623+.RS 4
1624+.ie n \{\
1625+\h'-04'\(bu\h'+03'\c
1626+.\}
1627+.el \{\
1628+.sp -1
1629+.IP \(bu 2.3
1630+.\}
1631 .\" mysqlcheck: protocol option
1632 .\" protocol option: mysqlcheck
1633 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
1634
1635=== modified file 'man/mysqld.8'
1636--- man/mysqld.8 2014-03-27 15:42:21 +0000
1637+++ man/mysqld.8 2014-06-03 14:43:23 +0000
1638@@ -2,12 +2,12 @@
1639 .\" Title: \fBmysqld\fR
1640 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1641 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1642-.\" Date: 03/14/2014
1643+.\" Date: 05/11/2014
1644 .\" Manual: MySQL Database System
1645 .\" Source: MySQL 5.5
1646 .\" Language: English
1647 .\"
1648-.TH "\FBMYSQLD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1649+.TH "\FBMYSQLD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1650 .\" -----------------------------------------------------------------
1651 .\" * Define some portability stuff
1652 .\" -----------------------------------------------------------------
1653
1654=== modified file 'man/mysqld_multi.1'
1655--- man/mysqld_multi.1 2014-03-27 15:42:21 +0000
1656+++ man/mysqld_multi.1 2014-06-03 14:43:23 +0000
1657@@ -2,12 +2,12 @@
1658 .\" Title: \fBmysqld_multi\fR
1659 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1660 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1661-.\" Date: 03/14/2014
1662+.\" Date: 05/11/2014
1663 .\" Manual: MySQL Database System
1664 .\" Source: MySQL 5.5
1665 .\" Language: English
1666 .\"
1667-.TH "\FBMYSQLD_MULTI\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1668+.TH "\FBMYSQLD_MULTI\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1669 .\" -----------------------------------------------------------------
1670 .\" * Define some portability stuff
1671 .\" -----------------------------------------------------------------
1672
1673=== modified file 'man/mysqld_safe.1'
1674--- man/mysqld_safe.1 2014-03-27 15:42:21 +0000
1675+++ man/mysqld_safe.1 2014-06-03 14:43:23 +0000
1676@@ -2,12 +2,12 @@
1677 .\" Title: \fBmysqld_safe\fR
1678 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1679 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1680-.\" Date: 03/14/2014
1681+.\" Date: 05/11/2014
1682 .\" Manual: MySQL Database System
1683 .\" Source: MySQL 5.5
1684 .\" Language: English
1685 .\"
1686-.TH "\FBMYSQLD_SAFE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1687+.TH "\FBMYSQLD_SAFE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1688 .\" -----------------------------------------------------------------
1689 .\" * Define some portability stuff
1690 .\" -----------------------------------------------------------------
1691
1692=== modified file 'man/mysqldump.1'
1693--- man/mysqldump.1 2014-03-27 15:42:21 +0000
1694+++ man/mysqldump.1 2014-06-03 14:43:23 +0000
1695@@ -2,12 +2,12 @@
1696 .\" Title: \fBmysqldump\fR
1697 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1698 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1699-.\" Date: 03/14/2014
1700+.\" Date: 05/11/2014
1701 .\" Manual: MySQL Database System
1702 .\" Source: MySQL 5.5
1703 .\" Language: English
1704 .\"
1705-.TH "\FBMYSQLDUMP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1706+.TH "\FBMYSQLDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1707 .\" -----------------------------------------------------------------
1708 .\" * Define some portability stuff
1709 .\" -----------------------------------------------------------------
1710@@ -75,8 +75,7 @@
1711 tables, you can also use
1712 \fBmysqlhotcopy\fR
1713 for this purpose\&.
1714- Performance and Scalability Considerations
1715-.PP
1716+Performance and Scalability Considerations.PP
1717 mysqldump
1718 advantages include the convenience and flexibility of viewing or even editing the output before restoring\&. You can clone databases for development and DBA work, or produce slight variations of an existing database for testing\&. It is not intended as a fast or scalable solution for backing up substantial amounts of data\&. With large data sizes, even if the backup step takes a reasonable time, restoring the data can be very slow because replaying the SQL statements involves disk I/O for insertion, index creation, and so on\&.
1719 .PP
1720@@ -150,8 +149,7 @@
1721 For additional information about
1722 \fBmysqldump\fR, see
1723 Section\ \&7.4, \(lqUsing mysqldump for Backups\(rq\&.
1724- Syntax
1725-.PP
1726+Syntax.PP
1727 There are in general three ways to use
1728 \fBmysqldump\fR\(emin order to dump a set of one or more tables, a set of one or more complete databases, or an entire MySQL server\(emas shown here:
1729 .sp
1730@@ -345,10 +343,8 @@
1731 [mysqldump]
1732 and
1733 [client]
1734-groups of an option file\&.
1735-\fBmysqldump\fR
1736-also supports the options for processing option files described at
1737-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1738+groups of an option file\&. For information about option files, see
1739+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1740 .sp
1741 .RS 4
1742 .ie n \{\
1743@@ -820,6 +816,70 @@
1744 .sp -1
1745 .IP \(bu 2.3
1746 .\}
1747+.\" mysqldump: defaults-extra-file option
1748+.\" defaults-extra-file option: mysqldump
1749+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
1750+.sp
1751+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1752+\fIfile_name\fR
1753+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1754+.RE
1755+.sp
1756+.RS 4
1757+.ie n \{\
1758+\h'-04'\(bu\h'+03'\c
1759+.\}
1760+.el \{\
1761+.sp -1
1762+.IP \(bu 2.3
1763+.\}
1764+.\" mysqldump: defaults-file option
1765+.\" defaults-file option: mysqldump
1766+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
1767+.sp
1768+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1769+\fIfile_name\fR
1770+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1771+.RE
1772+.sp
1773+.RS 4
1774+.ie n \{\
1775+\h'-04'\(bu\h'+03'\c
1776+.\}
1777+.el \{\
1778+.sp -1
1779+.IP \(bu 2.3
1780+.\}
1781+.\" mysqldump: defaults-group-suffix option
1782+.\" defaults-group-suffix option: mysqldump
1783+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
1784+.sp
1785+Read not only the usual option groups, but also groups with the usual names and a suffix of
1786+\fIstr\fR\&. For example,
1787+\fBmysqldump\fR
1788+normally reads the
1789+[client]
1790+and
1791+[mysqldump]
1792+groups\&. If the
1793+\fB\-\-defaults\-group\-suffix=_other\fR
1794+option is given,
1795+\fBmysqldump\fR
1796+also reads the
1797+[client_other]
1798+and
1799+[mysqldump_other]
1800+groups\&.
1801+.RE
1802+.sp
1803+.RS 4
1804+.ie n \{\
1805+\h'-04'\(bu\h'+03'\c
1806+.\}
1807+.el \{\
1808+.sp -1
1809+.IP \(bu 2.3
1810+.\}
1811 .\" mysqldump: delayed-insert option
1812 .\" delayed-insert option: mysqldump
1813 \fB\-\-delayed\-insert\fR
1814@@ -1597,6 +1657,23 @@
1815 .sp -1
1816 .IP \(bu 2.3
1817 .\}
1818+.\" mysqldump: no-defaults option
1819+.\" no-defaults option: mysqldump
1820+\fB\-\-no\-defaults\fR
1821+.sp
1822+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
1823+\fB\-\-no\-defaults\fR
1824+can be used to prevent them from being read\&.
1825+.RE
1826+.sp
1827+.RS 4
1828+.ie n \{\
1829+\h'-04'\(bu\h'+03'\c
1830+.\}
1831+.el \{\
1832+.sp -1
1833+.IP \(bu 2.3
1834+.\}
1835 .\" mysqldump: no-set-names option
1836 .\" no-set-names option: mysqldump
1837 \fB\-\-no\-set\-names\fR,
1838@@ -1764,6 +1841,21 @@
1839 .sp -1
1840 .IP \(bu 2.3
1841 .\}
1842+.\" mysqldump: print-defaults option
1843+.\" print-defaults option: mysqldump
1844+\fB\-\-print\-defaults\fR
1845+.sp
1846+Print the program name and all options that it gets from option files\&.
1847+.RE
1848+.sp
1849+.RS 4
1850+.ie n \{\
1851+\h'-04'\(bu\h'+03'\c
1852+.\}
1853+.el \{\
1854+.sp -1
1855+.IP \(bu 2.3
1856+.\}
1857 .\" mysqldump: protocol option
1858 .\" protocol option: mysqldump
1859 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
1860
1861=== modified file 'man/mysqldumpslow.1'
1862--- man/mysqldumpslow.1 2014-03-27 15:42:21 +0000
1863+++ man/mysqldumpslow.1 2014-06-03 14:43:23 +0000
1864@@ -2,12 +2,12 @@
1865 .\" Title: \fBmysqldumpslow\fR
1866 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1867 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1868-.\" Date: 03/14/2014
1869+.\" Date: 05/11/2014
1870 .\" Manual: MySQL Database System
1871 .\" Source: MySQL 5.5
1872 .\" Language: English
1873 .\"
1874-.TH "\FBMYSQLDUMPSLOW\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1875+.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1876 .\" -----------------------------------------------------------------
1877 .\" * Define some portability stuff
1878 .\" -----------------------------------------------------------------
1879
1880=== modified file 'man/mysqlhotcopy.1'
1881--- man/mysqlhotcopy.1 2014-03-27 15:42:21 +0000
1882+++ man/mysqlhotcopy.1 2014-06-03 14:43:23 +0000
1883@@ -2,12 +2,12 @@
1884 .\" Title: \fBmysqlhotcopy\fR
1885 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1886 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1887-.\" Date: 03/14/2014
1888+.\" Date: 05/11/2014
1889 .\" Manual: MySQL Database System
1890 .\" Source: MySQL 5.5
1891 .\" Language: English
1892 .\"
1893-.TH "\FBMYSQLHOTCOPY\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1894+.TH "\FBMYSQLHOTCOPY\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1895 .\" -----------------------------------------------------------------
1896 .\" * Define some portability stuff
1897 .\" -----------------------------------------------------------------
1898
1899=== modified file 'man/mysqlimport.1'
1900--- man/mysqlimport.1 2014-03-27 15:42:21 +0000
1901+++ man/mysqlimport.1 2014-06-03 14:43:23 +0000
1902@@ -2,12 +2,12 @@
1903 .\" Title: \fBmysqlimport\fR
1904 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1905 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1906-.\" Date: 03/14/2014
1907+.\" Date: 05/11/2014
1908 .\" Manual: MySQL Database System
1909 .\" Source: MySQL 5.5
1910 .\" Language: English
1911 .\"
1912-.TH "\FBMYSQLIMPORT\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1913+.TH "\FBMYSQLIMPORT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1914 .\" -----------------------------------------------------------------
1915 .\" * Define some portability stuff
1916 .\" -----------------------------------------------------------------
1917@@ -78,10 +78,8 @@
1918 [mysqlimport]
1919 and
1920 [client]
1921-groups of an option file\&.
1922-\fBmysqlimport\fR
1923-also supports the options for processing option files described at
1924-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
1925+groups of an option file\&. For information about option files, see
1926+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
1927 .sp
1928 .RS 4
1929 .ie n \{\
1930@@ -260,6 +258,70 @@
1931 .sp -1
1932 .IP \(bu 2.3
1933 .\}
1934+.\" mysqlimport: defaults-extra-file option
1935+.\" defaults-extra-file option: mysqlimport
1936+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
1937+.sp
1938+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1939+\fIfile_name\fR
1940+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1941+.RE
1942+.sp
1943+.RS 4
1944+.ie n \{\
1945+\h'-04'\(bu\h'+03'\c
1946+.\}
1947+.el \{\
1948+.sp -1
1949+.IP \(bu 2.3
1950+.\}
1951+.\" mysqlimport: defaults-file option
1952+.\" defaults-file option: mysqlimport
1953+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
1954+.sp
1955+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
1956+\fIfile_name\fR
1957+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
1958+.RE
1959+.sp
1960+.RS 4
1961+.ie n \{\
1962+\h'-04'\(bu\h'+03'\c
1963+.\}
1964+.el \{\
1965+.sp -1
1966+.IP \(bu 2.3
1967+.\}
1968+.\" mysqlimport: defaults-group-suffix option
1969+.\" defaults-group-suffix option: mysqlimport
1970+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
1971+.sp
1972+Read not only the usual option groups, but also groups with the usual names and a suffix of
1973+\fIstr\fR\&. For example,
1974+\fBmysqlimport\fR
1975+normally reads the
1976+[client]
1977+and
1978+[mysqlimport]
1979+groups\&. If the
1980+\fB\-\-defaults\-group\-suffix=_other\fR
1981+option is given,
1982+\fBmysqlimport\fR
1983+also reads the
1984+[client_other]
1985+and
1986+[mysqlimport_other]
1987+groups\&.
1988+.RE
1989+.sp
1990+.RS 4
1991+.ie n \{\
1992+\h'-04'\(bu\h'+03'\c
1993+.\}
1994+.el \{\
1995+.sp -1
1996+.IP \(bu 2.3
1997+.\}
1998 .\" mysqlimport: delete option
1999 .\" delete option: mysqlimport
2000 \fB\-\-delete\fR,
2001@@ -445,6 +507,23 @@
2002 .sp -1
2003 .IP \(bu 2.3
2004 .\}
2005+.\" mysqlimport: no-defaults option
2006+.\" no-defaults option: mysqlimport
2007+\fB\-\-no\-defaults\fR
2008+.sp
2009+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
2010+\fB\-\-no\-defaults\fR
2011+can be used to prevent them from being read\&.
2012+.RE
2013+.sp
2014+.RS 4
2015+.ie n \{\
2016+\h'-04'\(bu\h'+03'\c
2017+.\}
2018+.el \{\
2019+.sp -1
2020+.IP \(bu 2.3
2021+.\}
2022 .\" mysqlimport: password option
2023 .\" password option: mysqlimport
2024 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
2025@@ -528,6 +607,21 @@
2026 .sp -1
2027 .IP \(bu 2.3
2028 .\}
2029+.\" mysqlimport: print-defaults option
2030+.\" print-defaults option: mysqlimport
2031+\fB\-\-print\-defaults\fR
2032+.sp
2033+Print the program name and all options that it gets from option files\&.
2034+.RE
2035+.sp
2036+.RS 4
2037+.ie n \{\
2038+\h'-04'\(bu\h'+03'\c
2039+.\}
2040+.el \{\
2041+.sp -1
2042+.IP \(bu 2.3
2043+.\}
2044 .\" mysqlimport: protocol option
2045 .\" protocol option: mysqlimport
2046 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
2047
2048=== modified file 'man/mysqlshow.1'
2049--- man/mysqlshow.1 2014-03-27 15:42:21 +0000
2050+++ man/mysqlshow.1 2014-06-03 14:43:23 +0000
2051@@ -2,12 +2,12 @@
2052 .\" Title: \fBmysqlshow\fR
2053 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2054 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2055-.\" Date: 03/14/2014
2056+.\" Date: 05/11/2014
2057 .\" Manual: MySQL Database System
2058 .\" Source: MySQL 5.5
2059 .\" Language: English
2060 .\"
2061-.TH "\FBMYSQLSHOW\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2062+.TH "\FBMYSQLSHOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2063 .\" -----------------------------------------------------------------
2064 .\" * Define some portability stuff
2065 .\" -----------------------------------------------------------------
2066@@ -125,10 +125,8 @@
2067 [mysqlshow]
2068 and
2069 [client]
2070-groups of an option file\&.
2071-\fBmysqlshow\fR
2072-also supports the options for processing option files described at
2073-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
2074+groups of an option file\&. For information about option files, see
2075+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
2076 .sp
2077 .RS 4
2078 .ie n \{\
2079@@ -307,6 +305,70 @@
2080 .sp -1
2081 .IP \(bu 2.3
2082 .\}
2083+.\" mysqlshow: defaults-extra-file option
2084+.\" defaults-extra-file option: mysqlshow
2085+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
2086+.sp
2087+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
2088+\fIfile_name\fR
2089+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
2090+.RE
2091+.sp
2092+.RS 4
2093+.ie n \{\
2094+\h'-04'\(bu\h'+03'\c
2095+.\}
2096+.el \{\
2097+.sp -1
2098+.IP \(bu 2.3
2099+.\}
2100+.\" mysqlshow: defaults-file option
2101+.\" defaults-file option: mysqlshow
2102+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
2103+.sp
2104+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
2105+\fIfile_name\fR
2106+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
2107+.RE
2108+.sp
2109+.RS 4
2110+.ie n \{\
2111+\h'-04'\(bu\h'+03'\c
2112+.\}
2113+.el \{\
2114+.sp -1
2115+.IP \(bu 2.3
2116+.\}
2117+.\" mysqlshow: defaults-group-suffix option
2118+.\" defaults-group-suffix option: mysqlshow
2119+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
2120+.sp
2121+Read not only the usual option groups, but also groups with the usual names and a suffix of
2122+\fIstr\fR\&. For example,
2123+\fBmysqlshow\fR
2124+normally reads the
2125+[client]
2126+and
2127+[mysqlshow]
2128+groups\&. If the
2129+\fB\-\-defaults\-group\-suffix=_other\fR
2130+option is given,
2131+\fBmysqlshow\fR
2132+also reads the
2133+[client_other]
2134+and
2135+[mysqlshow_other]
2136+groups\&.
2137+.RE
2138+.sp
2139+.RS 4
2140+.ie n \{\
2141+\h'-04'\(bu\h'+03'\c
2142+.\}
2143+.el \{\
2144+.sp -1
2145+.IP \(bu 2.3
2146+.\}
2147 .\" mysqlshow: host option
2148 .\" host option: mysqlshow
2149 \fB\-\-host=\fR\fB\fIhost_name\fR\fR,
2150@@ -339,6 +401,23 @@
2151 .sp -1
2152 .IP \(bu 2.3
2153 .\}
2154+.\" mysqlshow: no-defaults option
2155+.\" no-defaults option: mysqlshow
2156+\fB\-\-no\-defaults\fR
2157+.sp
2158+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
2159+\fB\-\-no\-defaults\fR
2160+can be used to prevent them from being read\&.
2161+.RE
2162+.sp
2163+.RS 4
2164+.ie n \{\
2165+\h'-04'\(bu\h'+03'\c
2166+.\}
2167+.el \{\
2168+.sp -1
2169+.IP \(bu 2.3
2170+.\}
2171 .\" mysqlshow: password option
2172 .\" password option: mysqlshow
2173 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
2174@@ -422,6 +501,21 @@
2175 .sp -1
2176 .IP \(bu 2.3
2177 .\}
2178+.\" mysqlshow: print-defaults option
2179+.\" print-defaults option: mysqlshow
2180+\fB\-\-print\-defaults\fR
2181+.sp
2182+Print the program name and all options that it gets from option files\&.
2183+.RE
2184+.sp
2185+.RS 4
2186+.ie n \{\
2187+\h'-04'\(bu\h'+03'\c
2188+.\}
2189+.el \{\
2190+.sp -1
2191+.IP \(bu 2.3
2192+.\}
2193 .\" mysqlshow: protocol option
2194 .\" protocol option: mysqlshow
2195 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
2196
2197=== modified file 'man/mysqlslap.1'
2198--- man/mysqlslap.1 2014-03-27 15:42:21 +0000
2199+++ man/mysqlslap.1 2014-06-03 14:43:23 +0000
2200@@ -2,12 +2,12 @@
2201 .\" Title: \fBmysqlslap\fR
2202 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2203 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2204-.\" Date: 03/14/2014
2205+.\" Date: 05/11/2014
2206 .\" Manual: MySQL Database System
2207 .\" Source: MySQL 5.5
2208 .\" Language: English
2209 .\"
2210-.TH "\FBMYSQLSLAP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2211+.TH "\FBMYSQLSLAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2212 .\" -----------------------------------------------------------------
2213 .\" * Define some portability stuff
2214 .\" -----------------------------------------------------------------
2215@@ -162,10 +162,8 @@
2216 [mysqlslap]
2217 and
2218 [client]
2219-groups of an option file\&.
2220-\fBmysqlslap\fR
2221-also supports the options for processing option files described at
2222-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
2223+groups of an option file\&. For information about option files, see
2224+Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
2225 .sp
2226 .RS 4
2227 .ie n \{\
2228@@ -527,6 +525,70 @@
2229 .sp -1
2230 .IP \(bu 2.3
2231 .\}
2232+.\" mysqlslap: defaults-extra-file option
2233+.\" defaults-extra-file option: mysqlslap
2234+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
2235+.sp
2236+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
2237+\fIfile_name\fR
2238+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
2239+.RE
2240+.sp
2241+.RS 4
2242+.ie n \{\
2243+\h'-04'\(bu\h'+03'\c
2244+.\}
2245+.el \{\
2246+.sp -1
2247+.IP \(bu 2.3
2248+.\}
2249+.\" mysqlslap: defaults-file option
2250+.\" defaults-file option: mysqlslap
2251+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
2252+.sp
2253+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
2254+\fIfile_name\fR
2255+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
2256+.RE
2257+.sp
2258+.RS 4
2259+.ie n \{\
2260+\h'-04'\(bu\h'+03'\c
2261+.\}
2262+.el \{\
2263+.sp -1
2264+.IP \(bu 2.3
2265+.\}
2266+.\" mysqlslap: defaults-group-suffix option
2267+.\" defaults-group-suffix option: mysqlslap
2268+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
2269+.sp
2270+Read not only the usual option groups, but also groups with the usual names and a suffix of
2271+\fIstr\fR\&. For example,
2272+\fBmysqlslap\fR
2273+normally reads the
2274+[client]
2275+and
2276+[mysqlslap]
2277+groups\&. If the
2278+\fB\-\-defaults\-group\-suffix=_other\fR
2279+option is given,
2280+\fBmysqlslap\fR
2281+also reads the
2282+[client_other]
2283+and
2284+[mysqlslap_other]
2285+groups\&.
2286+.RE
2287+.sp
2288+.RS 4
2289+.ie n \{\
2290+\h'-04'\(bu\h'+03'\c
2291+.\}
2292+.el \{\
2293+.sp -1
2294+.IP \(bu 2.3
2295+.\}
2296 .\" mysqlslap: delimiter option
2297 .\" delimiter option: mysqlslap
2298 \fB\-\-delimiter=\fR\fB\fIstr\fR\fR,
2299@@ -643,6 +705,23 @@
2300 .sp -1
2301 .IP \(bu 2.3
2302 .\}
2303+.\" mysqlslap: no-defaults option
2304+.\" no-defaults option: mysqlslap
2305+\fB\-\-no\-defaults\fR
2306+.sp
2307+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
2308+\fB\-\-no\-defaults\fR
2309+can be used to prevent them from being read\&.
2310+.RE
2311+.sp
2312+.RS 4
2313+.ie n \{\
2314+\h'-04'\(bu\h'+03'\c
2315+.\}
2316+.el \{\
2317+.sp -1
2318+.IP \(bu 2.3
2319+.\}
2320 .\" mysqlslap: number-char-cols option
2321 .\" number-char-cols option: mysqlslap
2322 \fB\-\-number\-char\-cols=\fR\fB\fIN\fR\fR,
2323@@ -828,21 +907,6 @@
2324 .sp -1
2325 .IP \(bu 2.3
2326 .\}
2327-.\" mysqlslap: shared-memory-base-name option
2328-.\" shared-memory-base-name option: mysqlslap
2329-\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
2330-.sp
2331-On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. This option applies only if the server supports shared\-memory connections\&.
2332-.RE
2333-.sp
2334-.RS 4
2335-.ie n \{\
2336-\h'-04'\(bu\h'+03'\c
2337-.\}
2338-.el \{\
2339-.sp -1
2340-.IP \(bu 2.3
2341-.\}
2342 .\" mysqlslap: post-system option
2343 .\" post-system option: mysqlslap
2344 \fB\-\-post\-system=\fR\fB\fIstr\fR\fR
2345@@ -892,6 +956,21 @@
2346 .sp -1
2347 .IP \(bu 2.3
2348 .\}
2349+.\" mysqlslap: print-defaults option
2350+.\" print-defaults option: mysqlslap
2351+\fB\-\-print\-defaults\fR
2352+.sp
2353+Print the program name and all options that it gets from option files\&.
2354+.RE
2355+.sp
2356+.RS 4
2357+.ie n \{\
2358+\h'-04'\(bu\h'+03'\c
2359+.\}
2360+.el \{\
2361+.sp -1
2362+.IP \(bu 2.3
2363+.\}
2364 .\" mysqlslap: protocol option
2365 .\" protocol option: mysqlslap
2366 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
2367@@ -926,6 +1005,21 @@
2368 .sp -1
2369 .IP \(bu 2.3
2370 .\}
2371+.\" mysqlslap: shared-memory-base-name option
2372+.\" shared-memory-base-name option: mysqlslap
2373+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
2374+.sp
2375+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. This option applies only if the server supports shared\-memory connections\&.
2376+.RE
2377+.sp
2378+.RS 4
2379+.ie n \{\
2380+\h'-04'\(bu\h'+03'\c
2381+.\}
2382+.el \{\
2383+.sp -1
2384+.IP \(bu 2.3
2385+.\}
2386 .\" mysqlslap: silent option
2387 .\" silent option: mysqlslap
2388 \fB\-\-silent\fR,
2389
2390=== modified file 'man/mysqltest.1'
2391--- man/mysqltest.1 2014-03-27 15:42:21 +0000
2392+++ man/mysqltest.1 2014-06-03 14:43:23 +0000
2393@@ -2,12 +2,12 @@
2394 .\" Title: \fBmysqltest\fR
2395 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2396 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2397-.\" Date: 03/10/2014
2398+.\" Date: 05/06/2014
2399 .\" Manual: MySQL Database System
2400 .\" Source: MySQL
2401 .\" Language: English
2402 .\"
2403-.TH "\FBMYSQLTEST\FR" "1" "03/10/2014" "MySQL" "MySQL Database System"
2404+.TH "\FBMYSQLTEST\FR" "1" "05/06/2014" "MySQL" "MySQL Database System"
2405 .\" -----------------------------------------------------------------
2406 .\" * Define some portability stuff
2407 .\" -----------------------------------------------------------------
2408@@ -909,7 +909,7 @@
2409 .SH "COPYRIGHT"
2410 .br
2411 .PP
2412-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
2413+Copyright \(co 2006, 2014, Oracle and/or its affiliates. All rights reserved.
2414 .PP
2415 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
2416 .PP
2417@@ -921,7 +921,7 @@
2418 .IP " 1." 4
2419 The SHA-256 Authentication Plugin
2420 .RS 4
2421-\%http://dev.mysql.com/doc/refman/5.6/en/sha256-authentication-plugin.html
2422+\%http://dev.mysql.com/doc/refman/5.7/en/sha256-authentication-plugin.html
2423 .RE
2424 .SH "SEE ALSO"
2425 For more information, please refer to the MySQL Reference Manual,
2426
2427=== modified file 'man/ndb-common-options.1'
2428--- man/ndb-common-options.1 2014-03-27 15:42:21 +0000
2429+++ man/ndb-common-options.1 2014-06-03 14:43:23 +0000
2430@@ -2,12 +2,12 @@
2431 .\" Title: Options Common to MySQL Cluster Programs
2432 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2433 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2434-.\" Date: 03/14/2014
2435+.\" Date: 05/11/2014
2436 .\" Manual: MySQL Database System
2437 .\" Source: MySQL 5.5
2438 .\" Language: English
2439 .\"
2440-.TH "OPTIONS COMMON TO MY" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2441+.TH "OPTIONS COMMON TO MY" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2442 .\" -----------------------------------------------------------------
2443 .\" * Define some portability stuff
2444 .\" -----------------------------------------------------------------
2445
2446=== modified file 'man/ndb_blob_tool.1'
2447--- man/ndb_blob_tool.1 2014-03-27 15:42:21 +0000
2448+++ man/ndb_blob_tool.1 2014-06-03 14:43:23 +0000
2449@@ -2,12 +2,12 @@
2450 .\" Title: \fBndb_blob_tool\fR
2451 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2452 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2453-.\" Date: 03/14/2014
2454+.\" Date: 05/11/2014
2455 .\" Manual: MySQL Database System
2456 .\" Source: MySQL 5.5
2457 .\" Language: English
2458 .\"
2459-.TH "\FBNDB_BLOB_TOOL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2460+.TH "\FBNDB_BLOB_TOOL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2461 .\" -----------------------------------------------------------------
2462 .\" * Define some portability stuff
2463 .\" -----------------------------------------------------------------
2464@@ -386,8 +386,7 @@
2465 .sp 1
2466 Provide extra information in the tool\*(Aqs output regarding its progress\&.
2467 .RE
2468- Example
2469-.PP
2470+Example.PP
2471 First we create an
2472 NDB
2473 table in the
2474
2475=== modified file 'man/ndb_config.1'
2476--- man/ndb_config.1 2014-03-27 15:42:21 +0000
2477+++ man/ndb_config.1 2014-06-03 14:43:23 +0000
2478@@ -2,12 +2,12 @@
2479 .\" Title: \fBndb_config\fR
2480 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2481 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2482-.\" Date: 03/14/2014
2483+.\" Date: 05/11/2014
2484 .\" Manual: MySQL Database System
2485 .\" Source: MySQL 5.5
2486 .\" Language: English
2487 .\"
2488-.TH "\FBNDB_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2489+.TH "\FBNDB_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2490 .\" -----------------------------------------------------------------
2491 .\" * Define some portability stuff
2492 .\" -----------------------------------------------------------------
2493@@ -1230,7 +1230,7 @@
2494 .\}
2495 .nf
2496 shell> \fBndb_config \-\-configinfo \-\-xml\fR
2497-<configvariables protocolversion="1" ndbversionstring="5\&.5\&.36\-ndb\-7\&.2\&.16"
2498+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.37\-ndb\-7\&.2\&.17"
2499 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
2500 ndbversionbuild="6">
2501 <section name="SYSTEM">
2502@@ -1384,7 +1384,7 @@
2503 \fB\-\-configinfo\fR
2504 serves no purpose\&.
2505 .RE
2506- Examples
2507+Examples
2508 .sp
2509 .RS 4
2510 .ie n \{\
2511
2512=== modified file 'man/ndb_cpcd.1'
2513--- man/ndb_cpcd.1 2014-03-27 15:42:21 +0000
2514+++ man/ndb_cpcd.1 2014-06-03 14:43:23 +0000
2515@@ -2,12 +2,12 @@
2516 .\" Title: \fBndb_cpcd\fR
2517 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2518 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2519-.\" Date: 03/14/2014
2520+.\" Date: 05/11/2014
2521 .\" Manual: MySQL Database System
2522 .\" Source: MySQL 5.5
2523 .\" Language: English
2524 .\"
2525-.TH "\FBNDB_CPCD\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2526+.TH "\FBNDB_CPCD\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2527 .\" -----------------------------------------------------------------
2528 .\" * Define some portability stuff
2529 .\" -----------------------------------------------------------------
2530
2531=== modified file 'man/ndb_delete_all.1'
2532--- man/ndb_delete_all.1 2014-03-27 15:42:21 +0000
2533+++ man/ndb_delete_all.1 2014-06-03 14:43:23 +0000
2534@@ -2,12 +2,12 @@
2535 .\" Title: \fBndb_delete_all\fR
2536 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2537 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2538-.\" Date: 03/14/2014
2539+.\" Date: 05/11/2014
2540 .\" Manual: MySQL Database System
2541 .\" Source: MySQL 5.5
2542 .\" Language: English
2543 .\"
2544-.TH "\FBNDB_DELETE_ALL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2545+.TH "\FBNDB_DELETE_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2546 .\" -----------------------------------------------------------------
2547 .\" * Define some portability stuff
2548 .\" -----------------------------------------------------------------
2549@@ -42,7 +42,7 @@
2550 DELETE
2551 or even
2552 TRUNCATE TABLE\&.
2553- Usage
2554+Usage
2555 .sp
2556 .if n \{\
2557 .RS 4
2558
2559=== modified file 'man/ndb_desc.1'
2560--- man/ndb_desc.1 2014-03-27 15:42:21 +0000
2561+++ man/ndb_desc.1 2014-06-03 14:43:23 +0000
2562@@ -2,12 +2,12 @@
2563 .\" Title: \fBndb_desc\fR
2564 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2565 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2566-.\" Date: 03/14/2014
2567+.\" Date: 05/11/2014
2568 .\" Manual: MySQL Database System
2569 .\" Source: MySQL 5.5
2570 .\" Language: English
2571 .\"
2572-.TH "\FBNDB_DESC\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2573+.TH "\FBNDB_DESC\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2574 .\" -----------------------------------------------------------------
2575 .\" * Define some portability stuff
2576 .\" -----------------------------------------------------------------
2577@@ -39,7 +39,7 @@
2578 provides a detailed description of one or more
2579 NDB
2580 tables\&.
2581- Usage
2582+Usage
2583 .sp
2584 .if n \{\
2585 .RS 4
2586@@ -63,8 +63,7 @@
2587 .RE
2588 .\}
2589 .sp
2590- Sample Output
2591-.PP
2592+Sample Output.PP
2593 MySQL table creation and population statements:
2594 .sp
2595 .if n \{\
2596
2597=== modified file 'man/ndb_drop_index.1'
2598--- man/ndb_drop_index.1 2014-03-27 15:42:21 +0000
2599+++ man/ndb_drop_index.1 2014-06-03 14:43:23 +0000
2600@@ -2,12 +2,12 @@
2601 .\" Title: \fBndb_drop_index\fR
2602 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2603 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2604-.\" Date: 03/14/2014
2605+.\" Date: 05/11/2014
2606 .\" Manual: MySQL Database System
2607 .\" Source: MySQL 5.5
2608 .\" Language: English
2609 .\"
2610-.TH "\FBNDB_DROP_INDEX\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2611+.TH "\FBNDB_DROP_INDEX\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2612 .\" -----------------------------------------------------------------
2613 .\" * Define some portability stuff
2614 .\" -----------------------------------------------------------------
2615@@ -40,7 +40,7 @@
2616 NDB
2617 table\&.
2618 \fIIt is recommended that you use this utility only as an example for writing NDB API applications\fR\(emsee the Warning later in this section for details\&.
2619- Usage
2620+Usage
2621 .sp
2622 .if n \{\
2623 .RS 4
2624@@ -123,7 +123,7 @@
2625 Reading table information for completion of table and column names
2626 You can turn off this feature to get a quicker startup with \-A
2627 Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
2628-Your MySQL connection id is 7 to server version: 5\&.5\&.36\-ndb\-7\&.2\&.16
2629+Your MySQL connection id is 7 to server version: 5\&.5\&.37\-ndb\-7\&.2\&.17
2630 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
2631 mysql> \fBSHOW TABLES;\fR
2632 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
2633
2634=== modified file 'man/ndb_drop_table.1'
2635--- man/ndb_drop_table.1 2014-03-27 15:42:21 +0000
2636+++ man/ndb_drop_table.1 2014-06-03 14:43:23 +0000
2637@@ -2,12 +2,12 @@
2638 .\" Title: \fBndb_drop_table\fR
2639 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2640 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2641-.\" Date: 03/14/2014
2642+.\" Date: 05/11/2014
2643 .\" Manual: MySQL Database System
2644 .\" Source: MySQL 5.5
2645 .\" Language: English
2646 .\"
2647-.TH "\FBNDB_DROP_TABLE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2648+.TH "\FBNDB_DROP_TABLE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2649 .\" -----------------------------------------------------------------
2650 .\" * Define some portability stuff
2651 .\" -----------------------------------------------------------------
2652@@ -45,7 +45,7 @@
2653 statement on an
2654 NDB
2655 table\&.
2656- Usage
2657+Usage
2658 .sp
2659 .if n \{\
2660 .RS 4
2661
2662=== modified file 'man/ndb_error_reporter.1'
2663--- man/ndb_error_reporter.1 2014-03-27 15:42:21 +0000
2664+++ man/ndb_error_reporter.1 2014-06-03 14:43:23 +0000
2665@@ -2,12 +2,12 @@
2666 .\" Title: \fBndb_error_reporter\fR
2667 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2668 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2669-.\" Date: 03/14/2014
2670+.\" Date: 05/11/2014
2671 .\" Manual: MySQL Database System
2672 .\" Source: MySQL 5.5
2673 .\" Language: English
2674 .\"
2675-.TH "\FBNDB_ERROR_REPORTE" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2676+.TH "\FBNDB_ERROR_REPORTE" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2677 .\" -----------------------------------------------------------------
2678 .\" * Define some portability stuff
2679 .\" -----------------------------------------------------------------
2680@@ -113,7 +113,7 @@
2681 T}
2682 .TE
2683 .sp 1
2684- Usage
2685+Usage
2686 .sp
2687 .if n \{\
2688 .RS 4
2689
2690=== modified file 'man/ndb_index_stat.1'
2691--- man/ndb_index_stat.1 2014-03-27 15:42:21 +0000
2692+++ man/ndb_index_stat.1 2014-06-03 14:43:23 +0000
2693@@ -2,12 +2,12 @@
2694 .\" Title: \fBndb_index_stat\fR
2695 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2696 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2697-.\" Date: 03/14/2014
2698+.\" Date: 05/11/2014
2699 .\" Manual: MySQL Database System
2700 .\" Source: MySQL 5.5
2701 .\" Language: English
2702 .\"
2703-.TH "\FBNDB_INDEX_STAT\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2704+.TH "\FBNDB_INDEX_STAT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2705 .\" -----------------------------------------------------------------
2706 .\" * Define some portability stuff
2707 .\" -----------------------------------------------------------------
2708@@ -37,8 +37,7 @@
2709 .PP
2710 \fBndb_index_stat\fR
2711 \&.\&.\&.
2712- Usage
2713-.PP
2714+Usage.PP
2715 To obtain basic index statistics about a given
2716 NDB
2717 table, invoke
2718@@ -108,8 +107,7 @@
2719 .RE
2720 .\}
2721 .sp
2722- Options
2723-.PP
2724+Options.PP
2725 The following table includes options that are specific to the MySQL Cluster
2726 \fBndb_index_stat\fR
2727 utility\&. Additional descriptions are listed following the table\&. For options common to most MySQL Cluster programs (including
2728
2729=== modified file 'man/ndb_mgm.1'
2730--- man/ndb_mgm.1 2014-03-27 15:42:21 +0000
2731+++ man/ndb_mgm.1 2014-06-03 14:43:23 +0000
2732@@ -2,12 +2,12 @@
2733 .\" Title: \fBndb_mgm\fR
2734 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2735 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2736-.\" Date: 03/14/2014
2737+.\" Date: 05/11/2014
2738 .\" Manual: MySQL Database System
2739 .\" Source: MySQL 5.5
2740 .\" Language: English
2741 .\"
2742-.TH "\FBNDB_MGM\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2743+.TH "\FBNDB_MGM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2744 .\" -----------------------------------------------------------------
2745 .\" * Define some portability stuff
2746 .\" -----------------------------------------------------------------
2747
2748=== modified file 'man/ndb_mgmd.8'
2749--- man/ndb_mgmd.8 2014-03-27 15:42:21 +0000
2750+++ man/ndb_mgmd.8 2014-06-03 14:43:23 +0000
2751@@ -2,12 +2,12 @@
2752 .\" Title: \fBndb_mgmd\fR
2753 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2754 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2755-.\" Date: 03/14/2014
2756+.\" Date: 05/11/2014
2757 .\" Manual: MySQL Database System
2758 .\" Source: MySQL 5.5
2759 .\" Language: English
2760 .\"
2761-.TH "\FBNDB_MGMD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2762+.TH "\FBNDB_MGMD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2763 .\" -----------------------------------------------------------------
2764 .\" * Define some portability stuff
2765 .\" -----------------------------------------------------------------
2766
2767=== modified file 'man/ndb_print_backup_file.1'
2768--- man/ndb_print_backup_file.1 2014-03-27 15:42:21 +0000
2769+++ man/ndb_print_backup_file.1 2014-06-03 14:43:23 +0000
2770@@ -2,12 +2,12 @@
2771 .\" Title: \fBndb_print_backup_file\fR
2772 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2773 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2774-.\" Date: 03/14/2014
2775+.\" Date: 05/11/2014
2776 .\" Manual: MySQL Database System
2777 .\" Source: MySQL 5.5
2778 .\" Language: English
2779 .\"
2780-.TH "\FBNDB_PRINT_BACKUP_" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2781+.TH "\FBNDB_PRINT_BACKUP_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2782 .\" -----------------------------------------------------------------
2783 .\" * Define some portability stuff
2784 .\" -----------------------------------------------------------------
2785@@ -37,7 +37,7 @@
2786 .PP
2787 \fBndb_print_backup_file\fR
2788 obtains diagnostic information from a cluster backup file\&.
2789- Usage
2790+Usage
2791 .sp
2792 .if n \{\
2793 .RS 4
2794@@ -68,8 +68,7 @@
2795 utilities that are intended to be run on a management server host or to connect to a management server)
2796 \fBndb_print_backup_file\fR
2797 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
2798- Additional Options
2799-.PP
2800+Additional Options.PP
2801 None\&.
2802 .SH "COPYRIGHT"
2803 .br
2804
2805=== modified file 'man/ndb_print_schema_file.1'
2806--- man/ndb_print_schema_file.1 2014-03-27 15:42:21 +0000
2807+++ man/ndb_print_schema_file.1 2014-06-03 14:43:23 +0000
2808@@ -2,12 +2,12 @@
2809 .\" Title: \fBndb_print_schema_file\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: 03/14/2014
2813+.\" Date: 05/11/2014
2814 .\" Manual: MySQL Database System
2815 .\" Source: MySQL 5.5
2816 .\" Language: English
2817 .\"
2818-.TH "\FBNDB_PRINT_SCHEMA_" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2819+.TH "\FBNDB_PRINT_SCHEMA_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2820 .\" -----------------------------------------------------------------
2821 .\" * Define some portability stuff
2822 .\" -----------------------------------------------------------------
2823@@ -37,7 +37,7 @@
2824 .PP
2825 \fBndb_print_schema_file\fR
2826 obtains diagnostic information from a cluster schema file\&.
2827- Usage
2828+Usage
2829 .sp
2830 .if n \{\
2831 .RS 4
2832@@ -62,8 +62,7 @@
2833 utilities that are intended to be run on a management server host or to connect to a management server)
2834 \fBndb_schema_backup_file\fR
2835 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
2836- Additional Options
2837-.PP
2838+Additional Options.PP
2839 None\&.
2840 .SH "COPYRIGHT"
2841 .br
2842
2843=== modified file 'man/ndb_print_sys_file.1'
2844--- man/ndb_print_sys_file.1 2014-03-27 15:42:21 +0000
2845+++ man/ndb_print_sys_file.1 2014-06-03 14:43:23 +0000
2846@@ -2,12 +2,12 @@
2847 .\" Title: \fBndb_print_sys_file\fR
2848 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2849 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2850-.\" Date: 03/14/2014
2851+.\" Date: 05/11/2014
2852 .\" Manual: MySQL Database System
2853 .\" Source: MySQL 5.5
2854 .\" Language: English
2855 .\"
2856-.TH "\FBNDB_PRINT_SYS_FIL" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2857+.TH "\FBNDB_PRINT_SYS_FIL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2858 .\" -----------------------------------------------------------------
2859 .\" * Define some portability stuff
2860 .\" -----------------------------------------------------------------
2861@@ -37,7 +37,7 @@
2862 .PP
2863 \fBndb_print_sys_file\fR
2864 obtains diagnostic information from a MySQL Cluster system file\&.
2865- Usage
2866+Usage
2867 .sp
2868 .if n \{\
2869 .RS 4
2870@@ -65,8 +65,7 @@
2871 utilities that are intended to be run on a management server host or to connect to a management server)
2872 \fBndb_print_backup_file\fR
2873 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
2874- Additional Options
2875-.PP
2876+Additional Options.PP
2877 None\&.
2878 .SH "COPYRIGHT"
2879 .br
2880
2881=== modified file 'man/ndb_restore.1'
2882--- man/ndb_restore.1 2014-03-27 15:42:21 +0000
2883+++ man/ndb_restore.1 2014-06-03 14:43:23 +0000
2884@@ -2,12 +2,12 @@
2885 .\" Title: \fBndb_restore\fR
2886 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2887 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2888-.\" Date: 03/14/2014
2889+.\" Date: 05/11/2014
2890 .\" Manual: MySQL Database System
2891 .\" Source: MySQL 5.5
2892 .\" Language: English
2893 .\"
2894-.TH "\FBNDB_RESTORE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2895+.TH "\FBNDB_RESTORE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2896 .\" -----------------------------------------------------------------
2897 .\" * Define some portability stuff
2898 .\" -----------------------------------------------------------------
2899
2900=== modified file 'man/ndb_select_all.1'
2901--- man/ndb_select_all.1 2014-03-27 15:42:21 +0000
2902+++ man/ndb_select_all.1 2014-06-03 14:43:23 +0000
2903@@ -2,12 +2,12 @@
2904 .\" Title: \fBndb_select_all\fR
2905 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2906 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2907-.\" Date: 03/14/2014
2908+.\" Date: 05/11/2014
2909 .\" Manual: MySQL Database System
2910 .\" Source: MySQL 5.5
2911 .\" Language: English
2912 .\"
2913-.TH "\FBNDB_SELECT_ALL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2914+.TH "\FBNDB_SELECT_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2915 .\" -----------------------------------------------------------------
2916 .\" * Define some portability stuff
2917 .\" -----------------------------------------------------------------
2918@@ -40,7 +40,7 @@
2919 NDB
2920 table to
2921 stdout\&.
2922- Usage
2923+Usage
2924 .sp
2925 .if n \{\
2926 .RS 4
2927@@ -505,8 +505,7 @@
2928 .sp
2929 Causes any table data to be omitted\&.
2930 .RE
2931- Sample Output
2932-.PP
2933+Sample Output.PP
2934 Output from a MySQL
2935 SELECT
2936 statement:
2937
2938=== modified file 'man/ndb_select_count.1'
2939--- man/ndb_select_count.1 2014-03-27 15:42:21 +0000
2940+++ man/ndb_select_count.1 2014-06-03 14:43:23 +0000
2941@@ -2,12 +2,12 @@
2942 .\" Title: \fBndb_select_count\fR
2943 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2944 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2945-.\" Date: 03/14/2014
2946+.\" Date: 05/11/2014
2947 .\" Manual: MySQL Database System
2948 .\" Source: MySQL 5.5
2949 .\" Language: English
2950 .\"
2951-.TH "\FBNDB_SELECT_COUNT\" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2952+.TH "\FBNDB_SELECT_COUNT\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2953 .\" -----------------------------------------------------------------
2954 .\" * Define some portability stuff
2955 .\" -----------------------------------------------------------------
2956@@ -40,7 +40,7 @@
2957 NDB
2958 tables\&. With a single table, the result is equivalent to that obtained by using the MySQL statement
2959 SELECT COUNT(*) FROM \fItbl_name\fR\&.
2960- Usage
2961+Usage
2962 .sp
2963 .if n \{\
2964 .RS 4
2965@@ -114,7 +114,7 @@
2966 .PP
2967 You can obtain row counts from multiple tables in the same database by listing the table names separated by spaces when invoking this command, as shown under
2968 \fBSample Output\fR\&.
2969- Sample Output
2970+Sample Output
2971 .sp
2972 .if n \{\
2973 .RS 4
2974
2975=== modified file 'man/ndb_show_tables.1'
2976--- man/ndb_show_tables.1 2014-03-27 15:42:21 +0000
2977+++ man/ndb_show_tables.1 2014-06-03 14:43:23 +0000
2978@@ -2,12 +2,12 @@
2979 .\" Title: \fBndb_show_tables\fR
2980 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2981 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2982-.\" Date: 03/14/2014
2983+.\" Date: 05/11/2014
2984 .\" Manual: MySQL Database System
2985 .\" Source: MySQL 5.5
2986 .\" Language: English
2987 .\"
2988-.TH "\FBNDB_SHOW_TABLES\F" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2989+.TH "\FBNDB_SHOW_TABLES\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2990 .\" -----------------------------------------------------------------
2991 .\" * Define some portability stuff
2992 .\" -----------------------------------------------------------------
2993@@ -136,7 +136,7 @@
2994 T}
2995 .TE
2996 .sp 1
2997- Usage
2998+Usage
2999 .sp
3000 .if n \{\
3001 .RS 4
3002
3003=== modified file 'man/ndb_size.pl.1'
3004--- man/ndb_size.pl.1 2014-03-27 15:42:21 +0000
3005+++ man/ndb_size.pl.1 2014-06-03 14:43:23 +0000
3006@@ -2,12 +2,12 @@
3007 .\" Title: \fBndb_size.pl\fR
3008 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3009 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3010-.\" Date: 03/14/2014
3011+.\" Date: 05/11/2014
3012 .\" Manual: MySQL Database System
3013 .\" Source: MySQL 5.5
3014 .\" Language: English
3015 .\"
3016-.TH "\FBNDB_SIZE\&.PL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3017+.TH "\FBNDB_SIZE\&.PL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3018 .\" -----------------------------------------------------------------
3019 .\" * Define some portability stuff
3020 .\" -----------------------------------------------------------------
3021@@ -38,7 +38,7 @@
3022 This is a Perl script that can be used to estimate the amount of space that would be required by a MySQL database if it were converted to use the
3023 NDBCLUSTER
3024 storage engine\&. Unlike the other utilities discussed in this section, it does not require access to a MySQL Cluster (in fact, there is no reason for it to do so)\&. However, it does need to access the MySQL server on which the database to be tested resides\&.
3025- Requirements
3026+Requirements
3027 .sp
3028 .RS 4
3029 .ie n \{\
3030@@ -228,7 +228,7 @@
3031 T}
3032 .TE
3033 .sp 1
3034- Usage
3035+Usage
3036 .sp
3037 .if n \{\
3038 .RS 4
3039
3040=== modified file 'man/ndb_waiter.1'
3041--- man/ndb_waiter.1 2014-03-27 15:42:21 +0000
3042+++ man/ndb_waiter.1 2014-06-03 14:43:23 +0000
3043@@ -2,12 +2,12 @@
3044 .\" Title: \fBndb_waiter\fR
3045 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3046 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3047-.\" Date: 03/14/2014
3048+.\" Date: 05/11/2014
3049 .\" Manual: MySQL Database System
3050 .\" Source: MySQL 5.5
3051 .\" Language: English
3052 .\"
3053-.TH "\FBNDB_WAITER\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3054+.TH "\FBNDB_WAITER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3055 .\" -----------------------------------------------------------------
3056 .\" * Define some portability stuff
3057 .\" -----------------------------------------------------------------
3058@@ -223,7 +223,7 @@
3059 T}
3060 .TE
3061 .sp 1
3062- Usage
3063+Usage
3064 .sp
3065 .if n \{\
3066 .RS 4
3067@@ -234,7 +234,7 @@
3068 .if n \{\
3069 .RE
3070 .\}
3071- Additional Options
3072+Additional Options
3073 .sp
3074 .RS 4
3075 .ie n \{\
3076
3077=== modified file 'man/ndbd.8'
3078--- man/ndbd.8 2014-03-27 15:42:21 +0000
3079+++ man/ndbd.8 2014-06-03 14:43:23 +0000
3080@@ -2,12 +2,12 @@
3081 .\" Title: \fBndbd\fR
3082 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3083 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3084-.\" Date: 03/14/2014
3085+.\" Date: 05/11/2014
3086 .\" Manual: MySQL Database System
3087 .\" Source: MySQL 5.5
3088 .\" Language: English
3089 .\"
3090-.TH "\FBNDBD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3091+.TH "\FBNDBD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3092 .\" -----------------------------------------------------------------
3093 .\" * Define some portability stuff
3094 .\" -----------------------------------------------------------------
3095
3096=== modified file 'man/ndbd_redo_log_reader.1'
3097--- man/ndbd_redo_log_reader.1 2014-03-27 15:42:21 +0000
3098+++ man/ndbd_redo_log_reader.1 2014-06-03 14:43:23 +0000
3099@@ -2,12 +2,12 @@
3100 .\" Title: \fBndbd_redo_log_reader\fR
3101 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3102 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3103-.\" Date: 03/14/2014
3104+.\" Date: 05/11/2014
3105 .\" Manual: MySQL Database System
3106 .\" Source: MySQL 5.5
3107 .\" Language: English
3108 .\"
3109-.TH "\FBNDBD_REDO_LOG_REA" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3110+.TH "\FBNDBD_REDO_LOG_REA" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3111 .\" -----------------------------------------------------------------
3112 .\" * Define some portability stuff
3113 .\" -----------------------------------------------------------------
3114@@ -99,7 +99,7 @@
3115 T}
3116 .TE
3117 .sp 1
3118- Usage
3119+Usage
3120 .sp
3121 .if n \{\
3122 .RS 4
3123
3124=== modified file 'man/ndbinfo_select_all.1'
3125--- man/ndbinfo_select_all.1 2014-03-27 15:42:21 +0000
3126+++ man/ndbinfo_select_all.1 2014-06-03 14:43:23 +0000
3127@@ -2,12 +2,12 @@
3128 .\" Title: \fBndbinfo_select_all\fR
3129 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3130 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3131-.\" Date: 03/14/2014
3132+.\" Date: 05/11/2014
3133 .\" Manual: MySQL Database System
3134 .\" Source: MySQL 5.5
3135 .\" Language: English
3136 .\"
3137-.TH "\FBNDBINFO_SELECT_AL" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3138+.TH "\FBNDBINFO_SELECT_AL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3139 .\" -----------------------------------------------------------------
3140 .\" * Define some portability stuff
3141 .\" -----------------------------------------------------------------
3142
3143=== modified file 'man/ndbmtd.8'
3144--- man/ndbmtd.8 2014-03-27 15:42:21 +0000
3145+++ man/ndbmtd.8 2014-06-03 14:43:23 +0000
3146@@ -2,12 +2,12 @@
3147 .\" Title: \fBndbmtd\fR
3148 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3149 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3150-.\" Date: 03/14/2014
3151+.\" Date: 05/11/2014
3152 .\" Manual: MySQL Database System
3153 .\" Source: MySQL 5.5
3154 .\" Language: English
3155 .\"
3156-.TH "\FBNDBMTD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3157+.TH "\FBNDBMTD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3158 .\" -----------------------------------------------------------------
3159 .\" * Define some portability stuff
3160 .\" -----------------------------------------------------------------
3161
3162=== modified file 'man/perror.1'
3163--- man/perror.1 2014-03-27 15:42:21 +0000
3164+++ man/perror.1 2014-06-03 14:43:23 +0000
3165@@ -2,12 +2,12 @@
3166 .\" Title: \fBperror\fR
3167 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3168 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3169-.\" Date: 03/14/2014
3170+.\" Date: 05/11/2014
3171 .\" Manual: MySQL Database System
3172 .\" Source: MySQL 5.5
3173 .\" Language: English
3174 .\"
3175-.TH "\FBPERROR\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3176+.TH "\FBPERROR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3177 .\" -----------------------------------------------------------------
3178 .\" * Define some portability stuff
3179 .\" -----------------------------------------------------------------
3180
3181=== modified file 'man/replace.1'
3182--- man/replace.1 2014-03-27 15:42:21 +0000
3183+++ man/replace.1 2014-06-03 14:43:23 +0000
3184@@ -2,12 +2,12 @@
3185 .\" Title: \fBreplace\fR
3186 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3187 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3188-.\" Date: 03/14/2014
3189+.\" Date: 05/11/2014
3190 .\" Manual: MySQL Database System
3191 .\" Source: MySQL 5.5
3192 .\" Language: English
3193 .\"
3194-.TH "\FBREPLACE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3195+.TH "\FBREPLACE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3196 .\" -----------------------------------------------------------------
3197 .\" * Define some portability stuff
3198 .\" -----------------------------------------------------------------
3199
3200=== modified file 'man/resolve_stack_dump.1'
3201--- man/resolve_stack_dump.1 2014-03-27 15:42:21 +0000
3202+++ man/resolve_stack_dump.1 2014-06-03 14:43:23 +0000
3203@@ -2,12 +2,12 @@
3204 .\" Title: \fBresolve_stack_dump\fR
3205 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3206 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3207-.\" Date: 03/14/2014
3208+.\" Date: 05/11/2014
3209 .\" Manual: MySQL Database System
3210 .\" Source: MySQL 5.5
3211 .\" Language: English
3212 .\"
3213-.TH "\FBRESOLVE_STACK_DUM" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3214+.TH "\FBRESOLVE_STACK_DUM" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3215 .\" -----------------------------------------------------------------
3216 .\" * Define some portability stuff
3217 .\" -----------------------------------------------------------------
3218
3219=== modified file 'man/resolveip.1'
3220--- man/resolveip.1 2014-03-27 15:42:21 +0000
3221+++ man/resolveip.1 2014-06-03 14:43:23 +0000
3222@@ -2,12 +2,12 @@
3223 .\" Title: \fBresolveip\fR
3224 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3225 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3226-.\" Date: 03/14/2014
3227+.\" Date: 05/11/2014
3228 .\" Manual: MySQL Database System
3229 .\" Source: MySQL 5.5
3230 .\" Language: English
3231 .\"
3232-.TH "\FBRESOLVEIP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
3233+.TH "\FBRESOLVEIP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
3234 .\" -----------------------------------------------------------------
3235 .\" * Define some portability stuff
3236 .\" -----------------------------------------------------------------
3237
3238=== modified file 'mysql-test/collections/default.experimental'
3239--- mysql-test/collections/default.experimental 2013-09-19 08:22:01 +0000
3240+++ mysql-test/collections/default.experimental 2014-06-03 14:43:23 +0000
3241@@ -13,7 +13,6 @@
3242 main.sp @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
3243 main.wait_timeout @solaris # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris
3244
3245-rpl.rpl_innodb_bug28430 # Bug#11754425
3246 rpl.rpl_row_sp011 @solaris # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun
3247 rpl.rpl_spec_variables @solaris # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS'
3248
3249
3250=== modified file 'mysql-test/r/have_cp1251.require'
3251--- mysql-test/r/have_cp1251.require 2007-06-28 17:34:54 +0000
3252+++ mysql-test/r/have_cp1251.require 2014-06-03 14:43:23 +0000
3253@@ -1,2 +1,2 @@
3254 Collation Charset Id Default Compiled Sortlen
3255-cp1251_general_ci cp1251 51 Yes 0
3256+cp1251_general_ci cp1251 51 Yes Yes 1
3257
3258=== modified file 'mysql-test/r/have_cp866.require'
3259--- mysql-test/r/have_cp866.require 2007-06-28 17:34:54 +0000
3260+++ mysql-test/r/have_cp866.require 2014-06-03 14:43:23 +0000
3261@@ -1,2 +1,2 @@
3262 Collation Charset Id Default Compiled Sortlen
3263-cp866_general_ci cp866 36 Yes 0
3264+cp866_general_ci cp866 36 Yes Yes 1
3265
3266=== modified file 'mysql-test/r/have_koi8r.require'
3267--- mysql-test/r/have_koi8r.require 2007-06-28 17:34:54 +0000
3268+++ mysql-test/r/have_koi8r.require 2014-06-03 14:43:23 +0000
3269@@ -1,2 +1,2 @@
3270 Collation Charset Id Default Compiled Sortlen
3271-koi8r_general_ci koi8r 7 Yes 0
3272+koi8r_general_ci koi8r 7 Yes Yes 1
3273
3274=== modified file 'mysql-test/r/loaddata.result'
3275--- mysql-test/r/loaddata.result 2012-09-26 20:36:08 +0000
3276+++ mysql-test/r/loaddata.result 2014-06-03 14:43:23 +0000
3277@@ -520,3 +520,15 @@
3278 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
3279 drop table t1;
3280 End of 5.1 tests
3281+#
3282+# Bug#11759519 INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATA LOCAL AND IMPORT ERRORS
3283+#
3284+SET @old_mode= @@sql_mode;
3285+CREATE TABLE t1 (fld1 INT);
3286+SET sql_mode='strict_all_tables';
3287+# Without fix, load data hangs forever.
3288+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
3289+FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
3290+Got one of the listed errors
3291+SET @@sql_mode= @old_mode;
3292+DROP TABLE t1;
3293
3294=== modified file 'mysql-test/r/outfile_loaddata.result'
3295--- mysql-test/r/outfile_loaddata.result 2010-05-08 22:03:35 +0000
3296+++ mysql-test/r/outfile_loaddata.result 2014-06-03 14:43:23 +0000
3297@@ -143,15 +143,16 @@
3298 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ';
3299 Warnings:
3300 Warning 1638 Non-ASCII separator arguments are not fully supported
3301-Warning 1265 Data truncated for column 'a' at row 1
3302-Warning 1261 Row 1 doesn't contain data for all columns
3303-Warning 1261 Row 1 doesn't contain data for all columns
3304-Warning 1265 Data truncated for column 'a' at row 2
3305-Warning 1261 Row 2 doesn't contain data for all columns
3306-Warning 1261 Row 2 doesn't contain data for all columns
3307 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
3308 a b c
3309-1 NULL NULL
3310+1 ABC-АБВ DEF-ÂÃÄ
3311+2 NULL NULL
3312+SELECT * FROM t1;
3313+a b c
3314+1 ABC-АБВ DEF-ÂÃÄ
3315+2 NULL NULL
3316+SELECT * FROM t2;
3317+a b c
3318 1 ABC-АБВ DEF-ÂÃÄ
3319 2 NULL NULL
3320 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ъ';
3321@@ -181,7 +182,14 @@
3322 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
3323 a b c
3324 1 ABC-АБВ DEF-ÂÃÄ
3325-1 ABC-АБВ DEF-ÂÃÄÑŠ2
3326+2 NULL NULL
3327+SELECT * FROM t1;
3328+a b c
3329+1 ABC-АБВ DEF-ÂÃÄ
3330+2 NULL NULL
3331+SELECT * FROM t2;
3332+a b c
3333+1 ABC-АБВ DEF-ÂÃÄ
3334 2 NULL NULL
3335 # Default (binary) charset:
3336 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FROM t1;
3337
3338=== added file 'mysql-test/suite/binlog/r/binlog_truncate_kill.result'
3339--- mysql-test/suite/binlog/r/binlog_truncate_kill.result 1970-01-01 00:00:00 +0000
3340+++ mysql-test/suite/binlog/r/binlog_truncate_kill.result 2014-06-03 14:43:23 +0000
3341@@ -0,0 +1,33 @@
3342+RESET MASTER;
3343+connection default;
3344+CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
3345+INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
3346+SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
3347+TRUNCATE t1;
3348+connect con1,localhost,root,,;
3349+SET DEBUG_SYNC = "now wait_for truncate_before_lock";
3350+SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
3351+((@id := id) - id)
3352+0
3353+KILL QUERY @id;
3354+connection default;
3355+ERROR 70100: Query execution was interrupted
3356+connection con1;
3357+show binlog events from <binlog_start>;
3358+Log_name Pos Event_type Server_id End_log_pos Info
3359+master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB
3360+master-bin.000001 # Query # # BEGIN
3361+master-bin.000001 # Intvar # # INSERT_ID=1
3362+master-bin.000001 # Query # # use `test`; INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10)
3363+master-bin.000001 # Xid # # COMMIT /* XID */
3364+disconnect con1;
3365+connection default;
3366+SELECT * FROM t1;
3367+id a b
3368+1 1 2
3369+2 2 4
3370+3 3 6
3371+4 4 8
3372+5 5 10
3373+DROP TABLE t1;
3374+SET DEBUG_SYNC= 'RESET';
3375
3376=== added file 'mysql-test/suite/binlog/t/binlog_truncate_kill.test'
3377--- mysql-test/suite/binlog/t/binlog_truncate_kill.test 1970-01-01 00:00:00 +0000
3378+++ mysql-test/suite/binlog/t/binlog_truncate_kill.test 2014-06-03 14:43:23 +0000
3379@@ -0,0 +1,56 @@
3380+###############################################################################
3381+# Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG WRITTEN WHILE
3382+# ROWS REMAINS
3383+#
3384+# Problem:
3385+# ========
3386+# When truncate table fails while using transactional based engines even
3387+# though the operation errors out we still continue and log it to binlog.
3388+# Because of this master has data but the truncate will be written to binary
3389+# log which will cause inconsistency.
3390+#
3391+# Test:
3392+# =====
3393+# Make master to wait in "open_table" call during the execution of truncate
3394+# table command and kill the truncate table from other connection. This causes
3395+# open table to return an error saying truncate failed during open table. This
3396+# statement should not be binlogged.
3397+###############################################################################
3398+--source include/have_debug_sync.inc
3399+--source include/have_binlog_format_statement.inc
3400+RESET MASTER;
3401+--enable_connect_log
3402+--connection default
3403+CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
3404+INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
3405+SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
3406+--send TRUNCATE t1
3407+
3408+connect(con1,localhost,root,,);
3409+SET DEBUG_SYNC = "now wait_for truncate_before_lock";
3410+# Wait for one connection to reach open_and_process_table.
3411+--let $show_statement= SHOW PROCESSLIST
3412+--let $field= State
3413+--let $condition= 'debug sync point: open_and_process_table';
3414+--source include/wait_show_condition.inc
3415+
3416+SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
3417+# Test killing from mysql server
3418+KILL QUERY @id;
3419+
3420+connection default;
3421+--ERROR ER_QUERY_INTERRUPTED
3422+--reap
3423+
3424+connection con1;
3425+--source include/show_binlog_events.inc
3426+
3427+disconnect con1;
3428+--source include/wait_until_disconnected.inc
3429+connection default;
3430+
3431+SELECT * FROM t1;
3432+
3433+DROP TABLE t1;
3434+SET DEBUG_SYNC= 'RESET';
3435+--disable_connect_log
3436
3437=== added file 'mysql-test/suite/rpl/r/rpl_row_create_select.result'
3438--- mysql-test/suite/rpl/r/rpl_row_create_select.result 1970-01-01 00:00:00 +0000
3439+++ mysql-test/suite/rpl/r/rpl_row_create_select.result 2014-06-03 14:43:23 +0000
3440@@ -0,0 +1,28 @@
3441+include/master-slave.inc
3442+[connection master]
3443+#
3444+# BUG#17994219: CREATE TABLE .. SELECT PRODUCES INVALID STRUCTURE,
3445+# BREAKS RBR
3446+#
3447+#After the patch, the display width is set to a default
3448+#value of 21.
3449+CREATE TABLE t1 AS SELECT REPEAT('A', 1000) DIV 1 AS a;
3450+Warnings:
3451+Warning 1366 Incorrect decimal value: '' for column '' at row -1
3452+SHOW CREATE TABLE t1;
3453+Table Create Table
3454+t1 CREATE TABLE `t1` (
3455+ `a` bigint(21) DEFAULT NULL
3456+) ENGINE=MyISAM DEFAULT CHARSET=latin1
3457+CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a;
3458+Warnings:
3459+Warning 1366 Incorrect decimal value: '' for column '' at row -1
3460+SHOW CREATE TABLE t2;
3461+Table Create Table
3462+t2 CREATE TABLE `t2` (
3463+ `a` bigint(21) DEFAULT NULL
3464+) ENGINE=MyISAM DEFAULT CHARSET=latin1
3465+#After the patch, no error is reported.
3466+DROP TABLE t1;
3467+DROP TABLE t2;
3468+include/rpl_end.inc
3469
3470=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat_basic.test'
3471--- mysql-test/suite/rpl/t/rpl_heartbeat_basic.test 2012-01-25 18:05:10 +0000
3472+++ mysql-test/suite/rpl/t/rpl_heartbeat_basic.test 2014-06-03 14:43:23 +0000
3473@@ -363,13 +363,11 @@
3474 --connection master
3475 DELETE FROM t1;
3476 DROP EVENT e1;
3477+--sync_slave_with_master
3478 --echo
3479
3480
3481-
3482-
3483 # Check received heartbeat events while logs flushed on slave
3484---connection slave
3485 --echo *** Flush logs on slave ***
3486 STOP SLAVE;
3487 RESET SLAVE;
3488
3489=== added file 'mysql-test/suite/rpl/t/rpl_row_create_select.test'
3490--- mysql-test/suite/rpl/t/rpl_row_create_select.test 1970-01-01 00:00:00 +0000
3491+++ mysql-test/suite/rpl/t/rpl_row_create_select.test 2014-06-03 14:43:23 +0000
3492@@ -0,0 +1,28 @@
3493+# Testing table creations for row-based replication.
3494+
3495+--source include/have_binlog_format_row.inc
3496+--source include/master-slave.inc
3497+
3498+--echo #
3499+--echo # BUG#17994219: CREATE TABLE .. SELECT PRODUCES INVALID STRUCTURE,
3500+--echo # BREAKS RBR
3501+--echo #
3502+
3503+connection master;
3504+--echo #After the patch, the display width is set to a default
3505+--echo #value of 21.
3506+CREATE TABLE t1 AS SELECT REPEAT('A', 1000) DIV 1 AS a;
3507+SHOW CREATE TABLE t1;
3508+
3509+CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a;
3510+SHOW CREATE TABLE t2;
3511+
3512+--echo #After the patch, no error is reported.
3513+sync_slave_with_master;
3514+
3515+connection master;
3516+DROP TABLE t1;
3517+DROP TABLE t2;
3518+
3519+--source include/rpl_end.inc
3520+
3521
3522=== modified file 'mysql-test/t/loaddata.test'
3523--- mysql-test/t/loaddata.test 2013-03-22 03:29:56 +0000
3524+++ mysql-test/t/loaddata.test 2014-06-03 14:43:23 +0000
3525@@ -635,3 +635,24 @@
3526 drop table t1;
3527
3528 --echo End of 5.1 tests
3529+
3530+--echo #
3531+--echo # Bug#11759519 INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATA LOCAL AND IMPORT ERRORS
3532+--echo #
3533+SET @old_mode= @@sql_mode;
3534+CREATE TABLE t1 (fld1 INT);
3535+--copy_file $EXE_MYSQL $MYSQLTEST_VARDIR/mysql
3536+
3537+SET sql_mode='strict_all_tables';
3538+
3539+--echo # Without fix, load data hangs forever.
3540+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
3541+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,1000
3542+eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
3543+ FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
3544+
3545+SET @@sql_mode= @old_mode;
3546+
3547+--remove_file $MYSQLTEST_VARDIR/mysql
3548+DROP TABLE t1;
3549+
3550
3551=== modified file 'mysql-test/t/outfile_loaddata.test'
3552--- mysql-test/t/outfile_loaddata.test 2010-05-06 20:41:37 +0000
3553+++ mysql-test/t/outfile_loaddata.test 2014-06-03 14:43:23 +0000
3554@@ -169,6 +169,8 @@
3555 --eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ'
3556 --remove_file $file
3557 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
3558+SELECT * FROM t1;
3559+SELECT * FROM t2;
3560
3561 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
3562 --eval SELECT * FROM t1 INTO OUTFILE '$file' LINES STARTING BY 'ъ'
3563@@ -191,6 +193,8 @@
3564 --eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ъ'
3565 --remove_file $file
3566 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
3567+SELECT * FROM t1;
3568+SELECT * FROM t2;
3569
3570 --echo # Default (binary) charset:
3571
3572
3573=== modified file 'mysys/my_thr_init.c'
3574--- mysys/my_thr_init.c 2011-06-30 15:46:53 +0000
3575+++ mysys/my_thr_init.c 2014-06-03 14:43:23 +0000
3576@@ -313,6 +313,9 @@
3577 struct st_my_thread_var *tmp;
3578 my_bool error=0;
3579
3580+ if (!my_thread_global_init_done)
3581+ return 1; /* cannot proceed with unintialized library */
3582+
3583 #ifdef EXTRA_DEBUG_THREADS
3584 fprintf(stderr,"my_thread_init(): thread_id: 0x%lx\n",
3585 (ulong) pthread_self());
3586
3587=== modified file 'packaging/rpm-oel/filter-provides.sh' (properties changed: -x to +x)
3588=== modified file 'packaging/rpm-oel/filter-requires.sh' (properties changed: -x to +x)
3589=== modified file 'packaging/rpm-oel/mysql.spec.in'
3590--- packaging/rpm-oel/mysql.spec.in 2014-03-14 18:46:27 +0000
3591+++ packaging/rpm-oel/mysql.spec.in 2014-06-03 14:43:23 +0000
3592@@ -85,7 +85,7 @@
3593 Summary: A very fast and reliable SQL database server
3594 Group: Applications/Databases
3595 Version: @VERSION@
3596-Release: 4%{?dist}
3597+Release: 2%{?commercial:.1}%{?dist}
3598 License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
3599 Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
3600 URL: http://www.mysql.com/
3601@@ -153,13 +153,17 @@
3602 Requires: shadow-utils
3603 Requires: net-tools
3604 %if 0%{?commercial}
3605+Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release}
3606+Obsoletes: MySQL-server-advanced < %{version}-%{release}
3607 Obsoletes: mysql-community-server < %{version}-%{release}
3608 Requires: mysql-enterprise-client%{?_isa} = %{version}-%{release}
3609 Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
3610 %else
3611+Provides: MySQL-server%{?_isa} = %{version}-%{release}
3612 Requires: mysql-community-client%{?_isa} = %{version}-%{release}
3613 Requires: mysql-community-common%{?_isa} = %{version}-%{release}
3614 %endif
3615+Obsoletes: MySQL-server < %{version}-%{release}
3616 Obsoletes: mysql-server < %{version}-%{release}
3617 Obsoletes: mariadb-server
3618 Provides: mysql-server = %{version}-%{release}
3619@@ -199,11 +203,15 @@
3620 Summary: MySQL database client applications and tools
3621 Group: Applications/Databases
3622 %if 0%{?commercial}
3623+Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release}
3624+Obsoletes: MySQL-client-advanced < %{version}-%{release}
3625 Obsoletes: mysql-community-client < %{version}-%{release}
3626 Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
3627 %else
3628+Provides: MySQL-client%{?_isa} = %{version}-%{release}
3629 Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
3630 %endif
3631+Obsoletes: MySQL-client < %{version}-%{release}
3632 Obsoletes: mariadb
3633 %if 0%{?rhel} > 5
3634 Obsoletes: mysql < %{version}-%{release}
3635@@ -234,11 +242,15 @@
3636 Summary: Test suite for the MySQL database server
3637 Group: Applications/Databases
3638 %if 0%{?commercial}
3639+Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release}
3640+Obsoletes: MySQL-test-advanced < %{version}-%{release}
3641 Obsoletes: mysql-community-test < %{version}-%{release}
3642 Requires: mysql-enterprise-server%{?_isa} = %{version}-%{release}
3643 %else
3644+Provides: MySQL-test%{?_isa} = %{version}-%{release}
3645 Requires: mysql-community-server%{?_isa} = %{version}-%{release}
3646 %endif
3647+Obsoletes: MySQL-test < %{version}-%{release}
3648 Obsoletes: mysql-test < %{version}-%{release}
3649 Obsoletes: mariadb-test
3650 Provides: mysql-test = %{version}-%{release}
3651@@ -254,11 +266,15 @@
3652 Summary: Development header files and libraries for MySQL database client applications
3653 Group: Applications/Databases
3654 %if 0%{?commercial}
3655+Provides: MySQL-devel-advanced%{?_isa} = %{version}-%{release}
3656+Obsoletes: MySQL-devel-advanced < %{version}-%{release}
3657 Obsoletes: mysql-community-devel < %{version}-%{release}
3658 Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
3659 %else
3660+Provides: MySQL-devel%{?_isa} = %{version}-%{release}
3661 Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
3662 %endif
3663+Obsoletes: MySQL-devel < %{version}-%{release}
3664 Obsoletes: mysql-devel < %{version}-%{release}
3665 Obsoletes: mariadb-devel
3666 Provides: mysql-devel = %{version}-%{release}
3667@@ -272,11 +288,15 @@
3668 Summary: Shared libraries for MySQL database client applications
3669 Group: Applications/Databases
3670 %if 0%{?commercial}
3671+Provides: MySQL-shared-advanced%{?_isa} = %{version}-%{release}
3672+Obsoletes: MySQL-shared-advanced < %{version}-%{release}
3673 Obsoletes: mysql-community-libs < %{version}-%{release}
3674 Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
3675 %else
3676+Provides: MySQL-shared%{?_isa} = %{version}-%{release}
3677 Requires: mysql-community-common%{?_isa} = %{version}-%{release}
3678 %endif
3679+Obsoletes: MySQL-shared < %{version}-%{release}
3680 Obsoletes: mysql-libs < %{version}-%{release}
3681 Obsoletes: mariadb-libs
3682 Provides: mysql-libs = %{version}-%{release}
3683@@ -294,11 +314,15 @@
3684 Provides: mysql-libs-compat = %{version}-%{release}
3685 Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
3686 %if 0%{?commercial}
3687+Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release}
3688+Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release}
3689 Obsoletes: mysql-community-libs-compat < %{version}-%{release}
3690 Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
3691 %else
3692+Provides: MySQL-shared-compat%{?_isa} = %{version}-%{release}
3693 Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
3694 %endif
3695+Obsoletes: MySQL-shared-compat < %{version}-%{release}
3696 %if 0%{?rhel} > 5
3697 Obsoletes: mysql-libs < %{version}-%{release}
3698 %endif
3699@@ -312,11 +336,15 @@
3700 Summary: MySQL embedded library
3701 Group: Applications/Databases
3702 %if 0%{?commercial}
3703+Provides: MySQL-embedded-advanced%{?_isa} = %{version}-%{release}
3704+Obsoletes: MySQL-embedded-advanced < %{version}-%{release}
3705 Obsoletes: mysql-community-embedded < %{version}-%{release}
3706 Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
3707 %else
3708+Provides: MySQL-embedded%{?_isa} = %{version}-%{release}
3709 Requires: mysql-community-common%{?_isa} = %{version}-%{release}
3710 %endif
3711+Obsoletes: MySQL-embedded < %{version}-%{release}
3712 Obsoletes: mysql-embedded < %{version}-%{release}
3713 Provides: mysql-embedded = %{version}-%{release}
3714 Provides: mysql-emdedded%{?_isa} = %{version}-%{release}
3715@@ -435,20 +463,18 @@
3716 )
3717 %endif # 0%{?compatlib}
3718
3719-export CFLAGS="%{optflags} %{?el7:-DTAOCRYPT_DISABLE_X86ASM}"
3720-export CXXFLAGS="%{optflags} %{?el7:-DTAOCRYPT_DISABLE_X86ASM}"
3721-
3722 # Build debug versions of mysqld and libmysqld.a
3723 mkdir debug
3724 (
3725 cd debug
3726 # Attempt to remove any optimisation flags from the debug build
3727- CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
3728- CXXFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
3729+ optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
3730 cmake ../%{src_dir} \
3731 -DBUILD_CONFIG=mysql_release \
3732 -DINSTALL_LAYOUT=RPM \
3733 -DCMAKE_BUILD_TYPE=Debug %{?el7:-DENABLE_DTRACE=OFF} \
3734+ -DCMAKE_C_FLAGS="$optflags" \
3735+ -DCMAKE_CXX_FLAGS="$optflags" \
3736 -DINSTALL_LIBDIR="%{_lib}/mysql" \
3737 -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
3738 -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
3739@@ -470,6 +496,8 @@
3740 -DBUILD_CONFIG=mysql_release \
3741 -DINSTALL_LAYOUT=RPM \
3742 -DCMAKE_BUILD_TYPE=RelWithDebInfo %{?el7:-DENABLE_DTRACE=OFF} \
3743+ -DCMAKE_C_FLAGS="%{optflags}" \
3744+ -DCMAKE_CXX_FLAGS="%{optflags}" \
3745 -DINSTALL_LIBDIR="%{_lib}/mysql" \
3746 -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
3747 -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
3748@@ -676,7 +704,41 @@
3749 %attr(755, root, root) %{_sbindir}/mysqld
3750 %attr(755, root, root) %{_sbindir}/mysqld-debug
3751
3752-%{_libdir}/mysql/plugin
3753+%dir %{_libdir}/mysql/plugin
3754+%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
3755+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
3756+%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
3757+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
3758+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
3759+%dir %{_libdir}/mysql/plugin/debug
3760+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
3761+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
3762+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
3763+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
3764+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
3765+
3766+%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
3767+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
3768+%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
3769+%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
3770+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
3771+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
3772+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
3773+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
3774+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
3775+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
3776+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
3777+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
3778+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
3779+
3780+%if 0%{?commercial}
3781+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
3782+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
3783+%attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
3784+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
3785+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
3786+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
3787+%endif
3788
3789 %attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
3790 %attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
3791@@ -819,6 +881,19 @@
3792 %endif
3793
3794 %changelog
3795+* Sun May 11 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-2
3796+- Increment release version to resolve upgrade conflict issue
3797+
3798+* Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-1
3799+- Updated for 5.5.38
3800+
3801+* Mon Apr 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-6
3802+- Fix Cflags for el7
3803+
3804+* Mon Mar 31 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-5
3805+- Support for enterprise packages
3806+- Upgrade from MySQL-* packages
3807+
3808 * Fri Mar 14 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-4
3809 - Resolve mysql conflict with mysql-community-client
3810
3811
3812=== modified file 'packaging/solaris/CMakeLists.txt'
3813--- packaging/solaris/CMakeLists.txt 2013-05-16 15:33:32 +0000
3814+++ packaging/solaris/CMakeLists.txt 2014-06-03 14:43:23 +0000
3815@@ -1,4 +1,4 @@
3816-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
3817+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
3818 #
3819 # This program is free software; you can redistribute it and/or modify
3820 # it under the terms of the GNU General Public License as published by
3821@@ -17,6 +17,10 @@
3822 # Any files in this directory are auxiliary files for Solaris "pkg" packages.
3823 # They will be configured during "pkg" creation, not during (binary) build.
3824
3825+IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
3826+ RETURN()
3827+ENDIF()
3828+
3829 # Currently, this expands to "support-files/" in most layouts,
3830 # but to "/usr/share/mysql/" in a RPM.
3831 # It is important not to pollute "/usr/bin".
3832
3833=== modified file 'sql-common/client.c'
3834--- sql-common/client.c 2014-03-05 12:38:27 +0000
3835+++ sql-common/client.c 2014-06-03 14:43:23 +0000
3836@@ -4236,17 +4236,27 @@
3837
3838 RETURN
3839 Signed number > 323000
3840+ Zero if there is no connection
3841 */
3842
3843 ulong STDCALL
3844 mysql_get_server_version(MYSQL *mysql)
3845 {
3846- uint major, minor, version;
3847- char *pos= mysql->server_version, *end_pos;
3848- major= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1;
3849- minor= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1;
3850- version= (uint) strtoul(pos, &end_pos, 10);
3851- return (ulong) major*10000L+(ulong) (minor*100+version);
3852+ ulong major= 0, minor= 0, version= 0;
3853+
3854+ if (mysql->server_version)
3855+ {
3856+ char *pos= mysql->server_version, *end_pos;
3857+ major= strtoul(pos, &end_pos, 10); pos=end_pos+1;
3858+ minor= strtoul(pos, &end_pos, 10); pos=end_pos+1;
3859+ version= strtoul(pos, &end_pos, 10);
3860+ }
3861+ else
3862+ {
3863+ set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
3864+ }
3865+
3866+ return major*10000 + minor*100 + version;
3867 }
3868
3869
3870
3871=== modified file 'sql/field.cc'
3872--- sql/field.cc 2013-10-28 10:15:55 +0000
3873+++ sql/field.cc 2014-06-03 14:43:23 +0000
3874@@ -7376,8 +7376,7 @@
3875 If content of the 'from'-address is cached in the 'value'-object
3876 it is possible that the content needs a character conversion.
3877 */
3878- uint32 dummy_offset;
3879- if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
3880+ if (!String::needs_conversion_on_storage(length, cs, field_charset))
3881 {
3882 Field_blob::store_length(length);
3883 bmove(ptr+packlength, &from, sizeof(char*));
3884@@ -7975,12 +7974,11 @@
3885 {
3886 ASSERT_COLUMN_MARKED_FOR_WRITE;
3887 int err= 0;
3888- uint32 not_used;
3889 char buff[STRING_BUFFER_USUAL_SIZE];
3890 String tmpstr(buff,sizeof(buff), &my_charset_bin);
3891
3892 /* Convert character set if necessary */
3893- if (String::needs_conversion(length, cs, field_charset, &not_used))
3894+ if (String::needs_conversion_on_storage(length, cs, field_charset))
3895 {
3896 uint dummy_errors;
3897 tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
3898@@ -8196,12 +8194,11 @@
3899 int err= 0;
3900 char *not_used;
3901 uint not_used2;
3902- uint32 not_used_offset;
3903 char buff[STRING_BUFFER_USUAL_SIZE];
3904 String tmpstr(buff,sizeof(buff), &my_charset_bin);
3905
3906 /* Convert character set if necessary */
3907- if (String::needs_conversion(length, cs, field_charset, &not_used_offset))
3908+ if (String::needs_conversion_on_storage(length, cs, field_charset))
3909 {
3910 uint dummy_errors;
3911 tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
3912
3913=== modified file 'sql/item_func.cc'
3914--- sql/item_func.cc 2014-02-10 13:46:53 +0000
3915+++ sql/item_func.cc 2014-06-03 14:43:23 +0000
3916@@ -1,4 +1,4 @@
3917-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
3918+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
3919
3920 This program is free software; you can redistribute it and/or modify
3921 it under the terms of the GNU General Public License as published by
3922@@ -1649,9 +1649,11 @@
3923 {
3924 Item_result argtype= args[0]->result_type();
3925 /* use precision ony for the data type it is applicable for and valid */
3926- max_length=args[0]->max_length -
3927- (argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
3928- args[0]->decimals : 0);
3929+ uint32 char_length= args[0]->max_char_length() -
3930+ (argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
3931+ args[0]->decimals : 0);
3932+ fix_char_length(char_length > MY_INT64_NUM_DECIMAL_DIGITS ?
3933+ MY_INT64_NUM_DECIMAL_DIGITS : char_length);
3934 maybe_null=1;
3935 unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag;
3936 }
3937
3938=== modified file 'sql/sql_load.cc'
3939--- sql/sql_load.cc 2013-12-05 08:07:26 +0000
3940+++ sql/sql_load.cc 2014-06-03 14:43:23 +0000
3941@@ -1,5 +1,5 @@
3942 /*
3943- Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
3944+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
3945
3946 This program is free software; you can redistribute it and/or modify
3947 it under the terms of the GNU General Public License as published by
3948@@ -57,13 +57,17 @@
3949 }
3950
3951
3952+#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
3953+#define PUSH(A) *(stack_pos++)=(A)
3954+
3955 class READ_INFO {
3956 File file;
3957 uchar *buffer, /* Buffer for read text */
3958 *end_of_buff; /* Data in bufferts ends here */
3959 uint buff_length, /* Length of buffert */
3960 max_length; /* Max length of row */
3961- char *field_term_ptr,*line_term_ptr,*line_start_ptr,*line_start_end;
3962+ const uchar *field_term_ptr,*line_term_ptr;
3963+ const char *line_start_ptr,*line_start_end;
3964 uint field_term_length,line_term_length,enclosed_length;
3965 int field_term_char,line_term_char,enclosed_char,escape_char;
3966 int *stack,*stack_pos;
3967@@ -87,7 +91,7 @@
3968 int read_fixed_length(void);
3969 int next_line(void);
3970 char unescape(char chr);
3971- int terminator(char *ptr,uint length);
3972+ int terminator(const uchar *ptr, uint length);
3973 bool find_start_of_fields();
3974 /* load xml */
3975 List<XML_TAG> taglist;
3976@@ -111,6 +115,15 @@
3977 either the table or THD value
3978 */
3979 void set_io_cache_arg(void* arg) { cache.arg = arg; }
3980+
3981+ /**
3982+ skip all data till the eof.
3983+ */
3984+ void skip_data_till_eof()
3985+ {
3986+ while (GET != my_b_EOF)
3987+ ;
3988+ }
3989 };
3990
3991 static int read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
3992@@ -535,8 +548,7 @@
3993 if (error)
3994 {
3995 if (read_file_from_client)
3996- while (!read_info.next_line())
3997- ;
3998+ read_info.skip_data_till_eof();
3999
4000 #ifndef EMBEDDED_LIBRARY
4001 if (mysql_bin_log.is_open())
4002@@ -749,7 +761,7 @@
4003
4004 Execute_load_query_log_event
4005 e(thd, load_data_query, query_str.length(),
4006- (uint) (fname_start - 1), (uint) fname_end,
4007+ static_cast<uint>(fname_start - 1), static_cast<uint>(fname_end),
4008 (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE :
4009 (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR),
4010 transactional_table, FALSE, FALSE, errcode);
4011@@ -1291,10 +1303,18 @@
4012 found_end_of_line(false), eof(false), need_end_io_cache(false),
4013 error(false), line_cuted(false), found_null(false), read_charset(cs)
4014 {
4015- field_term_ptr=(char*) field_term.ptr();
4016+ /*
4017+ Field and line terminators must be interpreted as sequence of unsigned char.
4018+ Otherwise, non-ascii terminators will be negative on some platforms,
4019+ and positive on others (depending on the implementation of char).
4020+ */
4021+ field_term_ptr=
4022+ static_cast<const uchar*>(static_cast<const void*>(field_term.ptr()));
4023 field_term_length= field_term.length();
4024- line_term_ptr=(char*) line_term.ptr();
4025+ line_term_ptr=
4026+ static_cast<const uchar*>(static_cast<const void*>(line_term.ptr()));
4027 line_term_length= line_term.length();
4028+
4029 level= 0; /* for load xml */
4030 if (line_start.length() == 0)
4031 {
4032@@ -1303,7 +1323,7 @@
4033 }
4034 else
4035 {
4036- line_start_ptr=(char*) line_start.ptr();
4037+ line_start_ptr= line_start.ptr();
4038 line_start_end=line_start_ptr+line_start.length();
4039 start_of_line= 1;
4040 }
4041@@ -1312,12 +1332,12 @@
4042 !memcmp(field_term_ptr,line_term_ptr,field_term_length))
4043 {
4044 line_term_length=0;
4045- line_term_ptr=(char*) "";
4046+ line_term_ptr= NULL;
4047 }
4048 enclosed_char= (enclosed_length=enclosed_par.length()) ?
4049 (uchar) enclosed_par[0] : INT_MAX;
4050- field_term_char= field_term_length ? (uchar) field_term_ptr[0] : INT_MAX;
4051- line_term_char= line_term_length ? (uchar) line_term_ptr[0] : INT_MAX;
4052+ field_term_char= field_term_length ? field_term_ptr[0] : INT_MAX;
4053+ line_term_char= line_term_length ? line_term_ptr[0] : INT_MAX;
4054
4055
4056 /* Set of a stack for unget if long terminators */
4057@@ -1375,11 +1395,7 @@
4058 }
4059
4060
4061-#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
4062-#define PUSH(A) *(stack_pos++)=(A)
4063-
4064-
4065-inline int READ_INFO::terminator(char *ptr,uint length)
4066+inline int READ_INFO::terminator(const uchar *ptr,uint length)
4067 {
4068 int chr=0; // Keep gcc happy
4069 uint i;
4070@@ -1394,7 +1410,7 @@
4071 return 1;
4072 PUSH(chr);
4073 while (i-- > 1)
4074- PUSH((uchar) *--ptr);
4075+ PUSH(*--ptr);
4076 return 0;
4077 }
4078
4079@@ -1525,7 +1541,7 @@
4080 if (my_mbcharlen(read_charset, chr) > 1 &&
4081 to + my_mbcharlen(read_charset, chr) <= end_of_buff)
4082 {
4083- uchar* p= (uchar*) to;
4084+ uchar* p= to;
4085 int ml, i;
4086 *to++ = chr;
4087
4088@@ -1550,7 +1566,7 @@
4089 (const char *)to))
4090 continue;
4091 for (i= 0; i < ml; i++)
4092- PUSH((uchar) *--to);
4093+ PUSH(*--to);
4094 chr= GET;
4095 }
4096 #endif
4097@@ -1699,7 +1715,7 @@
4098 return 1;
4099 }
4100 } while ((char) chr != line_start_ptr[0]);
4101- for (char *ptr=line_start_ptr+1 ; ptr != line_start_end ; ptr++)
4102+ for (const char *ptr=line_start_ptr+1 ; ptr != line_start_end ; ptr++)
4103 {
4104 chr=GET; // Eof will be checked later
4105 if ((char) chr != *ptr)
4106@@ -1707,7 +1723,7 @@
4107 PUSH(chr);
4108 while (--ptr != line_start_ptr)
4109 { // Restart with next char
4110- PUSH((uchar) *ptr);
4111+ PUSH( *ptr);
4112 }
4113 goto try_again;
4114 }
4115@@ -1903,7 +1919,7 @@
4116
4117 // row tag should be in ROWS IDENTIFIED BY '<row>' - stored in line_term
4118 if((tag.length() == line_term_length -2) &&
4119- (strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
4120+ (memcmp(tag.ptr(), line_term_ptr + 1, tag.length()) == 0))
4121 {
4122 DBUG_PRINT("read_xml", ("start-of-row: %i %s %s",
4123 level,tag.c_ptr_safe(), line_term_ptr));
4124@@ -1965,7 +1981,7 @@
4125 }
4126
4127 if((tag.length() == line_term_length -2) &&
4128- (strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
4129+ (memcmp(tag.ptr(), line_term_ptr + 1, tag.length()) == 0))
4130 {
4131 DBUG_PRINT("read_xml", ("found end-of-row %i %s",
4132 level, tag.c_ptr_safe()));
4133
4134=== modified file 'sql/sql_select.cc'
4135--- sql/sql_select.cc 2013-09-16 13:54:52 +0000
4136+++ sql/sql_select.cc 2014-06-03 14:43:23 +0000
4137@@ -17366,6 +17366,11 @@
4138 unit->fake_select_lex->options|= SELECT_DESCRIBE;
4139 if (!(res= unit->prepare(thd, result, SELECT_NO_UNLOCK | SELECT_DESCRIBE)))
4140 res= unit->exec();
4141+ /*
4142+ Reset select option. Needed if fake_select_lex is used and not called
4143+ from select describe.
4144+ */
4145+ unit->fake_select_lex->options&= ~SELECT_DESCRIBE;
4146 res|= unit->cleanup();
4147 }
4148 else
4149
4150=== modified file 'sql/sql_show.cc'
4151--- sql/sql_show.cc 2013-12-16 08:19:34 +0000
4152+++ sql/sql_show.cc 2014-06-03 14:43:23 +0000
4153@@ -1,4 +1,4 @@
4154-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
4155+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
4156
4157 This program is free software; you can redistribute it and/or modify
4158 it under the terms of the GNU General Public License as published by
4159@@ -2727,10 +2727,38 @@
4160 /* This is only used internally, but we need it here as a forward reference */
4161 extern ST_SCHEMA_TABLE schema_tables[];
4162
4163+/**
4164+ Condition pushdown used for INFORMATION_SCHEMA / SHOW queries.
4165+ This structure is to implement an optimization when
4166+ accessing data dictionary data in the INFORMATION_SCHEMA
4167+ or SHOW commands.
4168+ When the query contain a TABLE_SCHEMA or TABLE_NAME clause,
4169+ narrow the search for data based on the constraints given.
4170+*/
4171 typedef struct st_lookup_field_values
4172 {
4173- LEX_STRING db_value, table_value;
4174- bool wild_db_value, wild_table_value;
4175+ /**
4176+ Value of a TABLE_SCHEMA clause.
4177+ Note that this value length may exceed @c NAME_LEN.
4178+ @sa wild_db_value
4179+ */
4180+ LEX_STRING db_value;
4181+ /**
4182+ Value of a TABLE_NAME clause.
4183+ Note that this value length may exceed @c NAME_LEN.
4184+ @sa wild_table_value
4185+ */
4186+ LEX_STRING table_value;
4187+ /**
4188+ True when @c db_value is a LIKE clause,
4189+ false when @c db_value is an '=' clause.
4190+ */
4191+ bool wild_db_value;
4192+ /**
4193+ True when @c table_value is a LIKE clause,
4194+ false when @c table_value is an '=' clause.
4195+ */
4196+ bool wild_table_value;
4197 } LOOKUP_FIELD_VALUES;
4198
4199
4200@@ -3135,14 +3163,22 @@
4201
4202
4203 /*
4204- If we have db lookup vaule we just add it to list and
4205+ If we have db lookup value we just add it to list and
4206 exit from the function.
4207 We don't do this for database names longer than the maximum
4208- path length.
4209+ name length.
4210 */
4211- if (lookup_field_vals->db_value.str &&
4212- lookup_field_vals->db_value.length < FN_REFLEN)
4213+ if (lookup_field_vals->db_value.str)
4214 {
4215+ if (lookup_field_vals->db_value.length > NAME_LEN)
4216+ {
4217+ /*
4218+ Impossible value for a database name,
4219+ found in a WHERE DATABASE_NAME = 'xxx' clause.
4220+ */
4221+ return 0;
4222+ }
4223+
4224 if (is_infoschema_db(lookup_field_vals->db_value.str,
4225 lookup_field_vals->db_value.length))
4226 {
4227@@ -3279,6 +3315,15 @@
4228 if (!lookup_field_vals->wild_table_value &&
4229 lookup_field_vals->table_value.str)
4230 {
4231+ if (lookup_field_vals->table_value.length > NAME_LEN)
4232+ {
4233+ /*
4234+ Impossible value for a table name,
4235+ found in a WHERE TABLE_NAME = 'xxx' clause.
4236+ */
4237+ return 0;
4238+ }
4239+
4240 if (with_i_schema)
4241 {
4242 LEX_STRING *name;
4243@@ -3978,6 +4023,9 @@
4244 bzero((char*) &table_list, sizeof(TABLE_LIST));
4245 bzero((char*) &tbl, sizeof(TABLE));
4246
4247+ DBUG_ASSERT(db_name->length <= NAME_LEN);
4248+ DBUG_ASSERT(table_name->length <= NAME_LEN);
4249+
4250 if (lower_case_table_names)
4251 {
4252 /*
4253@@ -4309,6 +4357,7 @@
4254 it.rewind(); /* To get access to new elements in basis list */
4255 while ((db_name= it++))
4256 {
4257+ DBUG_ASSERT(db_name->length <= NAME_LEN);
4258 #ifndef NO_EMBEDDED_ACCESS_CHECKS
4259 if (!(check_access(thd, SELECT_ACL, db_name->str,
4260 &thd->col_access, NULL, 0, 1) ||
4261@@ -4330,6 +4379,7 @@
4262 List_iterator_fast<LEX_STRING> it_files(table_names);
4263 while ((table_name= it_files++))
4264 {
4265+ DBUG_ASSERT(table_name->length <= NAME_LEN);
4266 restore_record(table, s->default_values);
4267 table->field[schema_table->idx_field1]->
4268 store(db_name->str, db_name->length, system_charset_info);
4269@@ -4476,6 +4526,7 @@
4270 List_iterator_fast<LEX_STRING> it(db_names);
4271 while ((db_name=it++))
4272 {
4273+ DBUG_ASSERT(db_name->length <= NAME_LEN);
4274 if (with_i_schema) // information schema name is always first in list
4275 {
4276 if (store_schema_shemata(thd, table, db_name,
4277
4278=== modified file 'sql/sql_string.cc'
4279--- sql/sql_string.cc 2014-02-03 04:39:37 +0000
4280+++ sql/sql_string.cc 2014-06-03 14:43:23 +0000
4281@@ -224,6 +224,42 @@
4282
4283
4284 /*
4285+ Checks that the source string can just be copied to the destination string
4286+ without conversion.
4287+ Unlike needs_conversion it will require conversion on incoming binary data
4288+ to ensure the data are verified for vailidity first.
4289+
4290+ @param arg_length Length of string to copy.
4291+ @param from_cs Character set to copy from
4292+ @param to_cs Character set to copy to
4293+
4294+ @return conversion needed
4295+*/
4296+bool String::needs_conversion_on_storage(uint32 arg_length,
4297+ CHARSET_INFO *cs_from,
4298+ CHARSET_INFO *cs_to)
4299+{
4300+ uint32 offset;
4301+ return (needs_conversion(arg_length, cs_from, cs_to, &offset) ||
4302+ /* force conversion when storing a binary string */
4303+ (cs_from == &my_charset_bin &&
4304+ /* into a non-binary destination */
4305+ cs_to != &my_charset_bin &&
4306+ /* and any of the following is true :*/
4307+ (
4308+ /* it's a variable length encoding */
4309+ cs_to->mbminlen != cs_to->mbmaxlen ||
4310+ /* longer than 2 bytes : neither 1 byte nor ucs2 */
4311+ cs_to->mbminlen > 2 ||
4312+ /* and is not a multiple of the char byte size */
4313+ 0 != (arg_length % cs_to->mbmaxlen)
4314+ )
4315+ )
4316+ );
4317+}
4318+
4319+
4320+/*
4321 Copy a multi-byte character sets with adding leading zeros.
4322
4323 SYNOPSIS
4324
4325=== modified file 'sql/sql_string.h'
4326--- sql/sql_string.h 2013-06-27 15:35:20 +0000
4327+++ sql/sql_string.h 2014-06-03 14:43:23 +0000
4328@@ -286,6 +286,9 @@
4329 static bool needs_conversion(uint32 arg_length,
4330 CHARSET_INFO *cs_from, CHARSET_INFO *cs_to,
4331 uint32 *offset);
4332+ static bool needs_conversion_on_storage(uint32 arg_length,
4333+ CHARSET_INFO *cs_from,
4334+ CHARSET_INFO *cs_to);
4335 bool copy_aligned(const char *s, uint32 arg_length, uint32 offset,
4336 CHARSET_INFO *cs);
4337 bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs);
4338
4339=== modified file 'sql/sql_truncate.cc'
4340--- sql/sql_truncate.cc 2013-01-09 23:45:25 +0000
4341+++ sql/sql_truncate.cc 2014-06-03 14:43:23 +0000
4342@@ -1,4 +1,4 @@
4343-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
4344+/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
4345
4346 This program is free software; you can redistribute it and/or modify
4347 it under the terms of the GNU General Public License as published by
4348@@ -182,12 +182,19 @@
4349 @param table_ref Table list element for the table to be truncated.
4350 @param is_tmp_table True if element refers to a temp table.
4351
4352- @retval 0 Success.
4353- @retval > 0 Error code.
4354+ @retval TRUNCATE_OK Truncate was successful and statement can be safely
4355+ binlogged.
4356+ @retval TRUNCATE_FAILED_BUT_BINLOG Truncate failed but still go ahead with
4357+ binlogging as in case of non transactional tables
4358+ partial truncation is possible.
4359+
4360+ @retval TRUNCATE_FAILED_SKIP_BINLOG Truncate was not successful hence donot
4361+ binlong the statement.
4362 */
4363
4364-int Truncate_statement::handler_truncate(THD *thd, TABLE_LIST *table_ref,
4365- bool is_tmp_table)
4366+enum Truncate_statement::truncate_result
4367+Truncate_statement::handler_truncate(THD *thd, TABLE_LIST *table_ref,
4368+ bool is_tmp_table)
4369 {
4370 int error= 0;
4371 uint flags;
4372@@ -229,16 +236,30 @@
4373
4374 /* Open the table as it will handle some required preparations. */
4375 if (open_and_lock_tables(thd, table_ref, FALSE, flags))
4376- DBUG_RETURN(1);
4377+ DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
4378
4379 /* Whether to truncate regardless of foreign keys. */
4380 if (! (thd->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS))
4381- error= fk_truncate_illegal_if_parent(thd, table_ref->table);
4382+ if (fk_truncate_illegal_if_parent(thd, table_ref->table))
4383+ DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
4384
4385- if (!error && (error= table_ref->table->file->ha_truncate()))
4386+ error= table_ref->table->file->ha_truncate();
4387+ if (error)
4388+ {
4389 table_ref->table->file->print_error(error, MYF(0));
4390-
4391- DBUG_RETURN(error);
4392+ /*
4393+ If truncate method is not implemented then we don't binlog the
4394+ statement. If truncation has failed in a transactional engine then also we
4395+ donot binlog the statment. Only in non transactional engine we binlog
4396+ inspite of errors.
4397+ */
4398+ if (error == HA_ERR_WRONG_COMMAND ||
4399+ table_ref->table->file->has_transactions())
4400+ DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
4401+ else
4402+ DBUG_RETURN(TRUNCATE_FAILED_BUT_BINLOG);
4403+ }
4404+ DBUG_RETURN(TRUNCATE_OK);
4405 }
4406
4407
4408@@ -471,10 +492,14 @@
4409
4410 /*
4411 All effects of a TRUNCATE TABLE operation are committed even if
4412- truncation fails. Thus, the query must be written to the binary
4413- log. The only exception is a unimplemented truncate method.
4414+ truncation fails in the case of non transactional tables. Thus, the
4415+ query must be written to the binary log. The only exception is a
4416+ unimplemented truncate method.
4417 */
4418- binlog_stmt= !error || error != HA_ERR_WRONG_COMMAND;
4419+ if (error == TRUNCATE_OK || error == TRUNCATE_FAILED_BUT_BINLOG)
4420+ binlog_stmt= true;
4421+ else
4422+ binlog_stmt= false;
4423 }
4424
4425 /*
4426
4427=== modified file 'sql/sql_truncate.h'
4428--- sql/sql_truncate.h 2010-10-06 14:34:28 +0000
4429+++ sql/sql_truncate.h 2014-06-03 14:43:23 +0000
4430@@ -1,6 +1,6 @@
4431 #ifndef SQL_TRUNCATE_INCLUDED
4432 #define SQL_TRUNCATE_INCLUDED
4433-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
4434+/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
4435
4436 This program is free software; you can redistribute it and/or modify
4437 it under the terms of the GNU General Public License as published by
4438@@ -47,11 +47,17 @@
4439 bool execute(THD *thd);
4440
4441 protected:
4442+ enum truncate_result{
4443+ TRUNCATE_OK=0,
4444+ TRUNCATE_FAILED_BUT_BINLOG,
4445+ TRUNCATE_FAILED_SKIP_BINLOG
4446+ };
4447+
4448 /** Handle locking a base table for truncate. */
4449 bool lock_table(THD *, TABLE_LIST *, bool *);
4450
4451 /** Truncate table via the handler method. */
4452- int handler_truncate(THD *, TABLE_LIST *, bool);
4453+ enum truncate_result handler_truncate(THD *, TABLE_LIST *, bool);
4454
4455 /**
4456 Optimized delete of all rows by doing a full regenerate of the table.
4457
4458=== modified file 'sql/sql_union.cc'
4459--- sql/sql_union.cc 2011-07-11 09:27:52 +0000
4460+++ sql/sql_union.cc 2014-06-03 14:43:23 +0000
4461@@ -511,6 +511,35 @@
4462 (select_limit_cnt == HA_POS_ERROR || sl->braces) ?
4463 sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union;
4464 saved_error= sl->join->optimize();
4465+
4466+ /*
4467+ If called by explain statement then we may need to save the original
4468+ JOIN LAYOUT so that we can display the plan. Otherwise original plan
4469+ will be replaced by a simple scan on temp table if subquery uses temp
4470+ table.
4471+ We check for following conditions to force join_tmp creation
4472+ 1. This is an EXPLAIN statement, and
4473+ 2. JOIN not yet saved in JOIN::optimize(), and
4474+ 3. Not called directly from select_describe(), and
4475+ 4. Belongs to a subquery that is const, and
4476+ 5. Need a temp table.
4477+ */
4478+ if (thd->lex->describe && // 1
4479+ !sl->uncacheable && // 2
4480+ !(sl->join->select_options & SELECT_DESCRIBE) && // 3
4481+ item && item->const_item()) // 4
4482+ {
4483+ /*
4484+ Force join->join_tmp creation, because this subquery will be
4485+ replaced by a simple select from the materialization temp table
4486+ by optimize() called by EXPLAIN and we need to preserve the
4487+ initial query structure so we can display it.
4488+ */
4489+ sl->uncacheable|= UNCACHEABLE_EXPLAIN;
4490+ sl->master_unit()->uncacheable|= UNCACHEABLE_EXPLAIN;
4491+ if (sl->join->need_tmp && sl->join->init_save_join_tab()) // 5
4492+ DBUG_RETURN(1);
4493+ }
4494 }
4495 if (!saved_error)
4496 {
4497
4498=== modified file 'storage/archive/ha_archive.cc'
4499--- storage/archive/ha_archive.cc 2012-12-20 13:56:20 +0000
4500+++ storage/archive/ha_archive.cc 2014-06-03 14:43:23 +0000
4501@@ -1,5 +1,6 @@
4502 /*
4503- Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
4504+ Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights
4505+ reserved.
4506
4507 This program is free software; you can redistribute it and/or
4508 modify it under the terms of the GNU General Public License
4509@@ -1078,6 +1079,7 @@
4510 }
4511
4512 rc= found ? 0 : HA_ERR_END_OF_FILE;
4513+ table->status= rc ? STATUS_NOT_FOUND : 0;
4514 MYSQL_INDEX_READ_ROW_DONE(rc);
4515 DBUG_RETURN(rc);
4516 }
4517
4518=== modified file 'storage/innobase/row/row0ins.c'
4519--- storage/innobase/row/row0ins.c 2014-03-27 15:42:21 +0000
4520+++ storage/innobase/row/row0ins.c 2014-06-03 14:43:23 +0000
4521@@ -143,6 +143,7 @@
4522 const dict_col_t* col;
4523 dfield_t* dfield;
4524 byte* ptr;
4525+ uint len;
4526
4527 row = node->row;
4528 table = node->table;
4529@@ -151,35 +152,37 @@
4530 ut_ad(row && table && heap);
4531 ut_ad(dtuple_get_n_fields(row) == dict_table_get_n_cols(table));
4532
4533- /* 1. Allocate buffer for row id */
4534+ /* allocate buffer to hold the needed system created hidden columns. */
4535+ len = DATA_ROW_ID_LEN + DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN;
4536+ ptr = mem_heap_zalloc(heap, len);
4537
4538+ /* 1. Populate row-id */
4539 col = dict_table_get_sys_col(table, DATA_ROW_ID);
4540
4541 dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
4542
4543- ptr = mem_heap_zalloc(heap, DATA_ROW_ID_LEN);
4544-
4545 dfield_set_data(dfield, ptr, DATA_ROW_ID_LEN);
4546
4547 node->row_id_buf = ptr;
4548
4549- /* 3. Allocate buffer for trx id */
4550+ ptr += DATA_ROW_ID_LEN;
4551
4552+ /* 2. Populate trx id */
4553 col = dict_table_get_sys_col(table, DATA_TRX_ID);
4554
4555 dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
4556- ptr = mem_heap_zalloc(heap, DATA_TRX_ID_LEN);
4557
4558 dfield_set_data(dfield, ptr, DATA_TRX_ID_LEN);
4559
4560 node->trx_id_buf = ptr;
4561
4562- /* 4. Allocate buffer for roll ptr */
4563+ ptr += DATA_TRX_ID_LEN;
4564+
4565+ /* 3. Populate roll ptr */
4566
4567 col = dict_table_get_sys_col(table, DATA_ROLL_PTR);
4568
4569 dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
4570- ptr = mem_heap_zalloc(heap, DATA_ROLL_PTR_LEN);
4571
4572 dfield_set_data(dfield, ptr, DATA_ROLL_PTR_LEN);
4573 }

Subscribers

People subscribed via source and target branches