rpms
/
mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild -man-pages.patch to apply smoothly 

Changes made by Bjorn Munch <bjorn.munch@oracle.com>:
Update to MySQL 5.6.16, for various fixes described at https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-16.html
Patches now upstream: tmpdir, cve-2013-1861, covscan-signexpr, covscan-stroverflow
Fixed upstream: innodbwarn
ldconfig needed in embedded subpackage
Remove unused generate-tarball.sh from tree
Rediff mysql-install patch
Make symvers 18 default, provide symvers 16 for backward compat
(bz #1045013)
Man page patch disabled due too many conflicts
Memcached build patched to not remove -Werror=<something> in CFLAGS
This commit is contained in:
Honza Horak 2014-02-03 15:41:44 +01:00
parent 86ff19c879
commit a49d466856
9 changed files with 216 additions and 824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
community-mysql-5.6.10-libmysql-version.patch
View File

@ -1,150 +0,0 @@
--- mysql-5.6.10/libmysql/libmysql.ver.in 2013-01-22 17:54:50.000000000 +0100
+++ mysql-5.6.10/libmysql/libmysql.ver.in.fedora 2013-02-21 12:59:40.108881131 +0100
@@ -1,1 +1,146 @@
-libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
+# symbols exported from mysql 5.1
+libmysqlclient_16 {
+ global:
+ _fini;
+ _init;
+ my_init;
+ myodbc_remove_escape;
+ mysql_affected_rows;
+ mysql_autocommit;
+ mysql_change_user;
+ mysql_character_set_name;
+ mysql_close;
+ mysql_commit;
+ mysql_data_seek;
+ mysql_debug;
+ mysql_dump_debug_info;
+ mysql_embedded;
+ mysql_eof;
+ mysql_errno;
+ mysql_error;
+ mysql_escape_string;
+ mysql_fetch_field;
+ mysql_fetch_field_direct;
+ mysql_fetch_fields;
+ mysql_fetch_lengths;
+ mysql_fetch_row;
+ mysql_field_count;
+ mysql_field_seek;
+ mysql_field_tell;
+ mysql_free_result;
+ mysql_get_character_set_info;
+ mysql_get_client_info;
+ mysql_get_client_version;
+ mysql_get_host_info;
+ mysql_get_parameters;
+ mysql_get_proto_info;
+ mysql_get_server_info;
+ mysql_get_server_version;
+ mysql_get_ssl_cipher;
+ mysql_hex_string;
+ mysql_info;
+ mysql_init;
+ mysql_insert_id;
+ mysql_kill;
+ mysql_list_dbs;
+ mysql_list_fields;
+ mysql_list_processes;
+ mysql_list_tables;
+ mysql_more_results;
+ mysql_next_result;
+ mysql_num_fields;
+ mysql_num_rows;
+ mysql_options;
+ mysql_ping;
+ mysql_query;
+ mysql_read_query_result;
+ mysql_real_connect;
+ mysql_real_escape_string;
+ mysql_real_query;
+ mysql_refresh;
+ mysql_rollback;
+ mysql_row_seek;
+ mysql_row_tell;
+ mysql_select_db;
+ mysql_send_query;
+ mysql_server_end;
+ mysql_server_init;
+ mysql_set_character_set;
+ mysql_set_local_infile_default;
+ mysql_set_local_infile_handler;
+ mysql_set_server_option;
+ mysql_shutdown;
+ mysql_sqlstate;
+ mysql_ssl_set;
+ mysql_stat;
+ mysql_stmt_affected_rows;
+ mysql_stmt_attr_get;
+ mysql_stmt_attr_set;
+ mysql_stmt_bind_param;
+ mysql_stmt_bind_result;
+ mysql_stmt_close;
+ mysql_stmt_data_seek;
+ mysql_stmt_errno;
+ mysql_stmt_error;
+ mysql_stmt_execute;
+ mysql_stmt_fetch;
+ mysql_stmt_fetch_column;
+ mysql_stmt_field_count;
+ mysql_stmt_free_result;
+ mysql_stmt_init;
+ mysql_stmt_insert_id;
+ mysql_stmt_num_rows;
+ mysql_stmt_param_count;
+ mysql_stmt_param_metadata;
+ mysql_stmt_prepare;
+ mysql_stmt_reset;
+ mysql_stmt_result_metadata;
+ mysql_stmt_row_seek;
+ mysql_stmt_row_tell;
+ mysql_stmt_send_long_data;
+ mysql_stmt_sqlstate;
+ mysql_stmt_store_result;
+ mysql_store_result;
+ mysql_thread_end;
+ mysql_thread_id;
+ mysql_thread_init;
+ mysql_thread_safe;
+ mysql_use_result;
+ mysql_warning_count;
+# These are documented in Paul DuBois' MySQL book, so we treat them as part
+# of the de-facto API.
+ free_defaults;
+ handle_options;
+ load_defaults;
+ my_print_help;
+# This isn't really documented anywhere, but it seems to be part of the
+# de-facto API as well. We're not going to export the deprecated version
+# make_scrambled_password, however.
+ my_make_scrambled_password;
+# This really shouldn't be exported, but some applications use it as a
+# workaround for inadequate threading support; see bug #846602
+ THR_KEY_mysys;
+ local:
+ *;
+};
+# symbols added in mysql 5.5
+libmysqlclient_18 {
+ global:
+ mysql_client_find_plugin;
+ mysql_client_register_plugin;
+ mysql_load_plugin;
+ mysql_load_plugin_v;
+ mysql_plugin_options;
+ mysql_stmt_next_result;
+#
+# Ideally the following symbols wouldn't be exported, but various applications
+# require them.
+#
+# mysql-connector-odbc requires these
+ default_charset_info;
+ get_charset;
+ get_charset_by_csname;
+ net_realloc;
+# PHP's mysqli.so requires this (via the ER() macro)
+ client_errors;
+};

239
community-mysql-5.6.14-mysql-install.patch
View File

@ -1,239 +0,0 @@
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
index c142d4f..f1f2891 100644
--- a/scripts/mysql_install_db.pl.in
+++ b/scripts/mysql_install_db.pl.in
@@ -34,13 +34,35 @@
#
##############################################################################
-use Fcntl;
-use File::Basename;
-use File::Copy;
-use Getopt::Long;
-use Sys::Hostname;
-use Data::Dumper;
use strict;
+use warnings;
+
+##############################################################################
+# Check if all needed modules are available, exit if something is missing.
+##############################################################################
+
+BEGIN {
+ my @req_mods = ('Fcntl', 'File::Basename', 'File::Copy', 'Getopt::Long',
+ 'Sys::Hostname', 'Data::Dumper');
+ my @missing_mods;
+ my $req;
+ foreach $req (@req_mods) {
+ eval 'require ' . $req;
+ if ($@) {
+ push(@missing_mods, $req);
+ } else {
+ $req->import();
+ }
+ }
+ # this avoids the confusing "BEGIN failed--compilation aborted" message
+ local $SIG{__DIE__} = sub {warn @_; exit 1};
+
+ if (@missing_mods) {
+ my $msg = "FATAL ERROR: please install the following Perl modules " .
+ "before executing $0:\n" . join("\n",@missing_mods)."\n";
+ die $msg;
+ }
+}
Getopt::Long::Configure("pass_through");
@@ -75,6 +97,8 @@ Usage: $0 [OPTIONS]
--help Display this help and exit.
--ldata=path The path to the MySQL data directory. Same as --datadir.
--no-defaults Don't read default options from any option file.
+ --keep-my-cnf Don't try to create my.cnf based on template.
+ Useful for systems with working, updated my.cnf.
EOF1
if ( $^O !~ m/^(MSWin32|cygwin)$/ ) {
print <<EOF2;
@@ -86,6 +110,7 @@ EOF2
print <<EOF3;
--rpm For internal use. This option is used by RPM files
during the MySQL installation process.
+ Implies --keep-my-cnf option.
--skip-name-resolve Use IP addresses rather than hostnames when creating
grant table entries. This option can be useful if
your DNS does not work.
@@ -149,6 +174,7 @@ sub parse_arguments
"skip-name-resolve",
"verbose",
+ "keep-my-cnf",
"rpm",
"help",
"random-passwords",
@@ -356,13 +382,19 @@ sub tell_root_password {
##############################################################################
sub generate_random_password {
- # On (at least) Linux and Solaris, a "random" device is available, use it:
- # cat /dev/urandom | LC_ALL=C tr -dc "[:alnum:]" | fold -w 8 | head -1
- # Without LC_ALL, "tr" may not know the "alnum" character class -
- # and there are user profiles which do not have this set.
- #
- my $password = `cat /dev/urandom | LC_ALL=C tr -dc "[:alnum:]" | fold -w 8 | head -1`;
- chomp ($password);
+ # On Linux, Solaris, Max OS X and FreeBSD we have a random device available.
+ my $randfile = "/dev/urandom";
+ open(FD, $randfile) || die "Can't open $randfile for reading: $!";
+ my $password = "";
+ my $pass_len = 16;
+ my $c;
+ while (length($password) < $pass_len) {
+ $c = getc(FD);
+ if ($c =~ /\w/) {
+ $password .= $c;
+ }
+ }
+ close(FD);
return $password;
}
@@ -399,11 +431,16 @@ $basedir= "@prefix@" if ! $basedir; # Default
# ----------------------------------------------------------------------
my $print_defaults;
+my $keep_my_cnf = 0;
if ( $opt->{srcdir} and $opt->{basedir} )
{
error($opt,"Specify either --basedir or --srcdir, not both");
}
+if ( $opt->{rpm} || $opt->{'keep-my-cnf'} )
+{
+ $keep_my_cnf = 1;
+}
if ( $opt->{srcdir} )
{
$opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
@@ -425,13 +462,18 @@ my $config_file;
my $copy_cfg_file;
# ----------------------------------------------------------------------
-# This will be the default config file
+# This will be the default config file (unless creation is unwanted)
# ----------------------------------------------------------------------
$config_file= "$basedir/my.cnf";
my $cfg_template= find_in_basedir($opt,"file","my-default.cnf",
"share","share/mysql","support-files");
+# Distros might move files
+if ((! -r $cfg_template) && (-r "@pkgdatadir@/my-default.cnf")) {
+ $cfg_template = "@pkgdatadir@/my-default.cnf";
+}
+
-e $cfg_template or cannot_find_file("my-default.cnf");
$copy_cfg_file= $config_file;
@@ -441,22 +483,21 @@ if (-e $copy_cfg_file)
$copy_cfg_file =~ s/my.cnf/my-new.cnf/;
# Too early to print warning here, the user may not notice
}
-open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
-if (open (CFG, "> $copy_cfg_file"))
-{
- while (<TEMPL>)
- {
- # Remove lines beginning with # *** which are template comments
- print CFG $_ unless /^# \*\*\*/;
+
+if ( ! $keep_my_cnf ) {
+ open (TEMPL, $cfg_template) or error($opt, "Could not open config template $cfg_template");
+ if (open (CFG, "> $copy_cfg_file")) {
+ while (<TEMPL>) {
+ # Remove lines beginning with # *** which are template comments
+ print CFG $_ unless /^# \*\*\*/;
+ }
+ close CFG;
+ } else {
+ warning($opt,"Could not write to config file $copy_cfg_file: $!");
+ $failed_write_cfg= 1;
}
- close CFG;
+ close TEMPL;
}
-else
-{
- warning($opt,"Could not write to config file $copy_cfg_file: $!");
- $failed_write_cfg= 1;
-}
-close TEMPL;
# ----------------------------------------------------------------------
# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
@@ -619,7 +660,7 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
}
# ----------------------------------------------------------------------
-# Create database directories mysql & test
+# Create database directory mysql
# ----------------------------------------------------------------------
# FIXME The shell variant uses "mkdir -p":
@@ -652,7 +693,7 @@ if ($opt_user)
}
}
-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql")
{
mkdir($dir, 0700) unless -d $dir;
if ($opt_user and -w "/")
@@ -838,15 +879,26 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
" cd mysql-test ; perl mysql-test-run.pl");
}
report($opt,
- "Please report any problems with the " . '@scriptdir@' . "/mysqlbug script!",
- "",
"The latest information about MySQL is available on the web at",
"",
" http://www.mysql.com",
"",
- "Support MySQL by buying support/licenses at http://shop.mysql.com");
+ "Please visit",
+ "",
+ " http://bugs.mysql.com/",
+ "",
+ "to report bugs. This database is public and can be browsed",
+ "and searched by anyone. If you log in to the system",
+ "you can enter new reports.");
+
- if ($copy_cfg_file eq $config_file and !$failed_write_cfg)
+ if ($keep_my_cnf)
+ {
+ report($opt,
+ "Note: new default config file not created.",
+ "Please make sure your config file is current");
+ }
+ elsif ($copy_cfg_file eq $config_file and !$failed_write_cfg)
{
report($opt,
"New default config file was created as $config_file and",
@@ -900,9 +952,15 @@ else
"http://www.mysql.com",
"Please consult the MySQL manual section: 'Problems running mysql_install_db',",
"and the manual section that describes problems on your OS.",
- "Another information source is the MySQL email archive.",
- "Please check all of the above before mailing us!",
- "And if you do mail us, you MUST use the " . '@scriptdir@' . "/mysqlbug script!")
+ "Another information source is our bug database.",
+ "Please visit",
+ "",
+ " http://bugs.mysql.com/",
+ "",
+ "to report bugs. This database is public and can be browsed",
+ "and searched by anyone. If you log in to the system you can",
+ "enter new reports.");
+
}
##############################################################################

16
community-mysql-covscan-signexpr.patch
View File

@ -1,16 +0,0 @@
This issue has been found by Coverity - static analysis tool.
mysql-5.5.31/strings/ctype-ucs2.c:1707:sign_extension – Suspicious implicit sign extension: "s[0]" with type "unsigned char" (8 bits, unsigned) is promoted in "(s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]" to type "int" (32 bits, signed), then sign-extended to type "unsigned long" (64 bits, unsigned). If "(s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]" is greater than 0x7FFFFFFF, the upper bits of the result will all be 1.
diff -up mysql-5.5.31/strings/ctype-ucs2.c.covscan1 mysql-5.5.31/strings/ctype-ucs2.c
--- mysql-5.5.31/strings/ctype-ucs2.c.covscan1 2013-06-14 12:12:29.663300314 +0200
+++ mysql-5.5.31/strings/ctype-ucs2.c 2013-06-14 12:13:07.809299646 +0200
@@ -1704,7 +1704,7 @@ my_utf32_uni(CHARSET_INFO *cs __attribut
{
if (s + 4 > e)
return MY_CS_TOOSMALL4;
- *pwc= (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
+ *pwc= (((my_wc_t)s[0]) << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
return 4;
}

57
community-mysql-covscan-stroverflow.patch
View File

@ -1,57 +0,0 @@
The following problems have been found by Coverity - static analysis tool.
mysql-5.5.31/plugin/semisync/semisync_master.cc:672:parameter_as_source – Note: This defect has an elevated risk because the source argument is a parameter of the current function.
mysql-5.5.31/plugin/semisync/semisync_master.cc:661:parameter_as_source – Note: This defect has an elevated risk because the source argument is a parameter of the current function.
mysql-5.5.31/plugin/semisync/semisync_master.cc:555:parameter_as_source – Note: This defect has an elevated risk because the source argument is a parameter of the current function.
diff -up mysql-5.6.14/plugin/semisync/semisync_master.cc.p33 mysql-5.6.14/plugin/semisync/semisync_master.cc
--- mysql-5.6.14/plugin/semisync/semisync_master.cc.p33 2013-09-10 09:38:25.000000000 +0200
+++ mysql-5.6.14/plugin/semisync/semisync_master.cc 2013-10-09 15:29:03.550379533 +0200
@@ -553,7 +553,8 @@ int ReplSemiSyncMaster::reportReplyBinlo
if (need_copy_send_pos)
{
- strcpy(reply_file_name_, log_file_name);
+ strncpy(reply_file_name_, log_file_name, sizeof(reply_file_name_)-1);
+ reply_file_name_[sizeof(reply_file_name_)-1] = '\0';
reply_file_pos_ = log_file_pos;
reply_file_name_inited_ = true;
@@ -681,7 +682,8 @@ int ReplSemiSyncMaster::commitTrx(const
if (cmp <= 0)
{
/* This thd has a lower position, let's update the minimum info. */
- strcpy(wait_file_name_, trx_wait_binlog_name);
+ strncpy(wait_file_name_, trx_wait_binlog_name, sizeof(wait_file_name_)-1);
+ wait_file_name_[sizeof(wait_file_name_)-1] = '\0';
wait_file_pos_ = trx_wait_binlog_pos;
rpl_semi_sync_master_wait_pos_backtraverse++;
@@ -692,7 +694,8 @@ int ReplSemiSyncMaster::commitTrx(const
}
else
{
- strcpy(wait_file_name_, trx_wait_binlog_name);
+ strncpy(wait_file_name_, trx_wait_binlog_name, sizeof(wait_file_name_)-1);
+ wait_file_name_[sizeof(wait_file_name_)-1] = '\0';
wait_file_pos_ = trx_wait_binlog_pos;
wait_file_name_inited_ = true;
mysql-5.5.31/sql/sp_rcontext.h:87:buffer_size_warning – Calling strncpy with a maximum size argument of 512 bytes on destination array "this->m_message" of size 512 bytes might leave the destination string unterminated.
diff -up mysql-5.6.14/sql/rpl_handler.cc.p33 mysql-5.6.14/sql/rpl_handler.cc
diff -up mysql-5.6.14/sql/sp_rcontext.h.p33 mysql-5.6.14/sql/sp_rcontext.h
--- mysql-5.6.14/sql/sp_rcontext.h.p33 2013-10-09 15:29:03.552379535 +0200
+++ mysql-5.6.14/sql/sp_rcontext.h 2013-10-09 15:29:53.367412814 +0200
@@ -144,7 +144,8 @@ public:
memcpy(sql_state, _sql_state, SQLSTATE_LENGTH);
sql_state[SQLSTATE_LENGTH]= '\0';
- strncpy(message, _message, MYSQL_ERRMSG_SIZE);
+ strncpy(message, _message, sizeof(message)-1);
+ message[sizeof(message)-1] = '\0';
}
};

47
community-mysql-cve-2013-1861.patch
View File

@ -1,47 +0,0 @@
It seems CVE-2013-1861 has been fixed in MySQL upstream, but they don't
ship a test case for that. This patch only includes the test case ported
from MariaDB fix:
https://mariadb.atlassian.net/browse/MDEV-4252
diff -up mysql-5.6.14/mysql-test/r/gis.result.cve mysql-5.6.14/mysql-test/r/gis.result
--- mysql-5.6.14/mysql-test/r/gis.result.cve 2013-09-10 09:38:27.000000000 +0200
+++ mysql-5.6.14/mysql-test/r/gis.result 2013-10-09 15:08:59.886598028 +0200
@@ -1115,6 +1115,21 @@ SELECT 1 FROM g1 WHERE a >= ANY
(SELECT 1 FROM g1 WHERE a = geomfromtext('') OR a) ;
1
DROP TABLE g1;
+#
+# TODO-424 geometry query crashes server
+#
+select astext(0x0100000000030000000100000000000010);
+astext(0x0100000000030000000100000000000010)
+NULL
+select area(0x0100000000030000000100000000000010);
+area(0x0100000000030000000100000000000010)
+NULL
+select astext(exteriorring(0x0100000000030000000100000000000010));
+astext(exteriorring(0x0100000000030000000100000000000010))
+NULL
+select astext(centroid(0x0100000000030000000100000000000010));
+astext(centroid(0x0100000000030000000100000000000010))
+NULL
End of 5.5 tests
DROP DATABASE IF EXISTS gis_ogs;
CREATE DATABASE gis_ogs;
diff -up mysql-5.6.14/mysql-test/t/gis.test.cve mysql-5.6.14/mysql-test/t/gis.test
--- mysql-5.6.14/mysql-test/t/gis.test.cve 2013-09-10 09:38:27.000000000 +0200
+++ mysql-5.6.14/mysql-test/t/gis.test 2013-10-09 15:08:59.886598028 +0200
@@ -868,6 +868,13 @@ SELECT 1 FROM g1 WHERE a >= ANY
DROP TABLE g1;
+--echo #
+--echo # TODO-424 geometry query crashes server
+--echo #
+select astext(0x0100000000030000000100000000000010);
+select area(0x0100000000030000000100000000000010);
+select astext(exteriorring(0x0100000000030000000100000000000010));
+select astext(centroid(0x0100000000030000000100000000000010));
--echo End of 5.5 tests

388
community-mysql-man-pages.patch
View File

@ -4,22 +4,22 @@ Upstream bug: http://bugs.mysql.com/bug.php?id=69342
# ===== mysqladmin manual page =====
diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
--- mysql-5.6.15/man/mysql.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysql.1 2013-12-10 12:28:29.055463911 +0100
@@ -135,7 +135,8 @@ Section\ \&4.2.3.4, \(lqCommand-Line Opt
.IP \(bu 2.3
.\}
.\" mysql: help option.\" help option: mysql\fB\-\-help\fR,
diff -up mysql-5.6.16/man/mysql.1.p24 mysql-5.6.16/man/mysql.1
--- mysql-5.6.16/man/mysql.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysql.1 2014-02-03 15:37:23.064082223 +0100
@@ -137,7 +137,8 @@ Section\ \&4.2.3.4, \(lqCommand-Line Opt
.\" mysql: help option
.\" help option: mysql
\fB\-\-help\fR,
-\fB\-?\fR
+\fB\-?\fR,
+\fB\-I\fR
.sp
Display a help message and exit\&.
.RE
@@ -346,6 +347,21 @@ Section\ \&6.3.6, \(lqPassword Expiratio
.sp -1
.IP \(bu 2.3
@@ -348,6 +349,21 @@ Compress all information sent between th
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
+.\" mysql: connect-timeout option
+.\" connect-timeout option: mysql
@ -36,13 +36,13 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: database option.\" database option: mysql\fB\-\-database=\fR\fB\fIdb_name\fR\fR,
\fB\-D \fR\fB\fIdb_name\fR\fR
.sp
@@ -445,6 +461,37 @@ Section\ \&10.5, \(lqCharacter Set Confi
.el \{\
.sp -1
.IP \(bu 2.3
.\}
@@ -447,6 +463,37 @@ Section\ \&6.3.7, \(lqPluggable Authenti
.sp
.RS 4
.ie n \{\
+.\" mysql: defaults-file option
+.\" defaults-file option: mysql
+\fB\-\-defaults-file=\fR\fB\fIfilename\fR\fR
@ -74,13 +74,13 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: delimiter option.\" delimiter option: mysql\fB\-\-delimiter=\fR\fB\fIstr\fR\fR
.sp
Set the statement delimiter\&. The default is the semicolon character (\(lq;\(rq)\&.
@@ -636,6 +683,36 @@ has no effect if the server does not als
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
@@ -638,6 +685,36 @@ Section\ \&5.1.7, \(lqServer SQL Modes\(
.el \{\
.sp -1
.IP \(bu 2.3
.\}
+.\" mysql: max-allowed-packet option
+.\" max-allowed-packet option: mysql
+\fB\-\-max\-allowed\-packet=\fR\fB\fInum\fR\fR
@ -111,41 +111,13 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: named-commands option.\" named-commands option: mysql\fB\-\-named\-commands\fR,
\fB\-G\fR
.sp
@@ -659,11 +736,26 @@ the section called \(lqMYSQL COMMANDS\(r
.sp -1
.IP \(bu 2.3
.\}
+.\" mysql: net-buffer-length option
+.\" net-buffer-length option: mysql
+\fB\-\-net\-buffer\-lenght=\fR\fB\fIsize\fR\fR
+.sp
+Set the buffer size for TCP/IP and socket communication\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: no-auto-rehash option.\" no-auto-rehash option: mysql\fB\-\-no\-auto\-rehash\fR,
\fB\-A\fR
.sp
This has the same effect as
-\fB\-skip\-auto\-rehash\fR\&. See the description for
+\fB\-\-skip\-auto\-rehash\fR\&. See the description for
\fB\-\-auto\-rehash\fR\&.
.RE
.sp
@@ -689,6 +781,21 @@ Do not beep when errors occur\&.
.sp -1
.IP \(bu 2.3
.\}
.\" mysql: init-command option
.\" init-command option: mysql
@@ -691,6 +768,21 @@ has no effect if the server does not als
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
+.\" mysql: no-defaults option
+.\" no-defaults option: mysql
+\fB\-\-no\-defaults\fR
@ -161,13 +133,13 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: one-database option.\" one-database option: mysql\fB\-\-one\-database\fR,
\fB\-o\fR
.sp
@@ -884,6 +991,21 @@ The TCP/IP port number to use for the co
.sp -1
.IP \(bu 2.3
.\}
.el \{\
.sp -1
@@ -886,6 +978,21 @@ the section called \(lqMYSQL COMMANDS\(r
\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
.sp
+.\" mysql: print-defaults option
+.\" print-defaults option: mysql
+\fB\-\-print\-defaults\fR
@ -183,13 +155,13 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: prompt option.\" prompt option: mysql\fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
The password to use when connecting to the server\&. If you use the short option form (\fB\-p\fR), you
\fIcannot\fR
have a space between the option and the password\&. If you omit the
@@ -1077,6 +1184,36 @@ If the connection to the server is lost,
\fB\-\-skip\-reconnect\fR\&.
.RE
.sp
Set the prompt to the specified format\&. The default is
@@ -1075,6 +1197,36 @@ and renamed in 5\&.6\&.7 to
.sp -1
.IP \(bu 2.3
.\}
+.\" mysql: select-limit option
+.\" select-limit option: mysql
+\fB\-\-select\-limit=\fR\fB\fIlimit\fR\fR
@ -220,13 +192,31 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: show-warnings option.\" show-warnings option: mysql\fB\-\-show\-warnings\fR
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
@@ -1121,9 +1258,39 @@ to disable it\&.
.if n \{\
.sp
Cause warnings to be shown after each statement if there are any\&. This option applies to interactive and batch mode\&.
@@ -1122,6 +1274,21 @@ option\&.
.sp -1
.IP \(bu 2.3
.\}
+.\" mysql: net-buffer-length option
+.\" net-buffer-length option: mysql
+\fB\-\-net\-buffer\-lenght=\fR\fB\fIsize\fR\fR
+.sp
+Set the buffer size for TCP/IP and socket communication\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
.RS 4
.it 1 an-trap
.nr an-no-space-flag 1
+.\" mysql: skip-auto-rehash option
+.\" skip-auto-rehash option: mysql
+\fB\-\-skip\-auto\-rehash\fR
@ -242,11 +232,11 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql: skip-column-names option.\" skip-column-names option: mysql\fB\-\-skip\-column\-names\fR,
\fB\-N\fR
.sp
@@ -1168,7 +1335,7 @@ localhost, the Unix socket file to use,
.\" mysql: SSL options.\" SSL options: mysql\fB\-\-ssl*\fR
.nr an-break-flag 1
.br
.ps +1
@@ -1279,7 +1446,7 @@ localhost, the Unix socket file to use,
\fB\-\-ssl*\fR
.sp
Options that begin with
-\fB\-\-ssl\fR
@ -254,7 +244,7 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
.RE
@@ -1326,7 +1493,7 @@ The XML output also uses an XML namespac
@@ -1455,7 +1622,7 @@ The XML output also uses an XML namespac
.RS 4
.\}
.nf
@ -263,7 +253,7 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
<?xml version="1\&.0"?>
<resultset statement="SHOW VARIABLES LIKE \*(Aqversion%\*(Aq" xmlns:xsi="http://www\&.w3\&.org/2001/XMLSchema\-instance">
<row>
@@ -3188,16 +3355,16 @@ statements that probably need to examine
@@ -3369,16 +3536,16 @@ statements that probably need to examine
.RE
.PP
To specify limits different from 1,000 and 1,000,000, you can override the defaults by using the
@ -283,10 +273,10 @@ diff -up mysql-5.6.15/man/mysql.1.p24 mysql-5.6.15/man/mysql.1
.fi
.if n \{\
.RE
diff -up mysql-5.6.15/man/mysqladmin.1.p24 mysql-5.6.15/man/mysqladmin.1
--- mysql-5.6.15/man/mysqladmin.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqladmin.1 2013-12-10 13:05:23.105401084 +0100
@@ -639,6 +639,21 @@ Compress all information sent between th
diff -up mysql-5.6.16/man/mysqladmin.1.p24 mysql-5.6.16/man/mysqladmin.1
--- mysql-5.6.16/man/mysqladmin.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqladmin.1 2014-02-03 15:31:31.984839986 +0100
@@ -639,6 +639,21 @@ Section\ \&10.5, \(lqCharacter Set Confi
.sp -1
.IP \(bu 2.3
.\}
@ -305,13 +295,13 @@ diff -up mysql-5.6.15/man/mysqladmin.1.p24 mysql-5.6.15/man/mysqladmin.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqladmin: count option.\" count option: mysqladmin\fB\-\-count=\fR\fB\fIN\fR\fR,
\fB\-c \fR\fB\fIN\fR\fR
.\" mysqladmin: compress option
.\" compress option: mysqladmin
\fB\-\-compress\fR,
@@ -729,6 +744,37 @@ Print debugging information and memory a
.sp
@@ -729,6 +744,37 @@ Section\ \&10.5, \(lqCharacter Set Confi
.sp -1
.IP \(bu 2.3
.\}
The client\-side authentication plugin to use\&. See
Section\ \&6.3.7, \(lqPluggable Authentication\(rq\&.
+.\" mysqladmin: defaults-extra-file option
+.\" defaults-extra-file option: mysqladmin
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
@ -343,12 +333,12 @@ diff -up mysql-5.6.15/man/mysqladmin.1.p24 mysql-5.6.15/man/mysqladmin.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqladmin: enable-cleartext-plugin option.\" enable-cleartext-plugin option: mysqladmin\fB\-\-enable\-cleartext\-plugin\fR
.RE
.sp
Enable the
@@ -789,6 +835,21 @@ Suppress the warning beep that is emitte
.sp -1
.IP \(bu 2.3
.RS 4
@@ -789,6 +835,21 @@ command\&. With multiple commands, conti
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
+.\" mysqladmin: no-defaults option
+.\" no-defaults option: mysqladmin
@ -365,13 +355,13 @@ diff -up mysql-5.6.15/man/mysqladmin.1.p24 mysql-5.6.15/man/mysqladmin.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqladmin: password option.\" password option: mysqladmin\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
.sp
@@ -862,6 +923,21 @@ The TCP/IP port number to use for the co
.el \{\
.sp -1
.IP \(bu 2.3
.\}
@@ -862,6 +923,21 @@ Section\ \&6.1.2.1, \(lqEnd-User Guideli
On Windows, connect to the server using a named pipe\&. This option applies only if the server supports named\-pipe connections\&.
.RE
.sp
+.\" mysqladmin: print-defaults option
+.\" print-defaults option: mysqladmin
+\fB\-\-print\-defaults\fR
@ -387,10 +377,10 @@ diff -up mysql-5.6.15/man/mysqladmin.1.p24 mysql-5.6.15/man/mysqladmin.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqladmin: protocol option.\" protocol option: mysqladmin\fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
.sp
The connection protocol to use for connecting to the server\&. It is useful when the other connection parameters normally would cause a protocol to be used other than the one you want\&. For details on the permissible values, see
@@ -938,6 +1014,21 @@ localhost, the Unix socket file to use,
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
@@ -935,6 +1011,21 @@ command\&.
.RE
.sp
.RS 4
@ -412,10 +402,10 @@ diff -up mysql-5.6.15/man/mysqladmin.1.p24 mysql-5.6.15/man/mysqladmin.1
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
diff -up mysql-5.6.15/man/mysqlbinlog.1.p24 mysql-5.6.15/man/mysqlbinlog.1
--- mysql-5.6.15/man/mysqlbinlog.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqlbinlog.1 2013-12-09 19:08:52.750074832 +0100
@@ -602,6 +602,7 @@ Do not display any of the groups listed
diff -up mysql-5.6.16/man/mysqlbinlog.1.p24 mysql-5.6.16/man/mysqlbinlog.1
--- mysql-5.6.16/man/mysqlbinlog.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqlbinlog.1 2014-02-03 15:31:31.984839986 +0100
@@ -629,6 +629,7 @@ Do not display any of the groups listed
\fB\-F\fR
.sp
Read binary log files even if they are open or were not closed properly\&.
@ -423,7 +413,7 @@ diff -up mysql-5.6.15/man/mysqlbinlog.1.p24 mysql-5.6.15/man/mysqlbinlog.1
.RE
.sp
.RS 4
@@ -715,6 +716,22 @@ entries in the log\&.
@@ -736,6 +737,22 @@ or any other MySQL program\&.
.RE
.sp
.RS 4
@ -446,13 +436,13 @@ diff -up mysql-5.6.15/man/mysqlbinlog.1.p24 mysql-5.6.15/man/mysqlbinlog.1
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
diff -up mysql-5.6.15/man/mysqlcheck.1.p24 mysql-5.6.15/man/mysqlcheck.1
--- mysql-5.6.15/man/mysqlcheck.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqlcheck.1 2013-12-10 13:02:43.841276619 +0100
@@ -456,6 +456,38 @@ Section\ \&10.5, \(lqCharacter Set Confi
.sp -1
diff -up mysql-5.6.16/man/mysqlcheck.1.p24 mysql-5.6.16/man/mysqlcheck.1
--- mysql-5.6.16/man/mysqlcheck.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqlcheck.1 2014-02-03 15:31:31.985839986 +0100
@@ -456,6 +456,38 @@ Print some debugging information when th
.IP \(bu 2.3
.\}
.\" mysqlcheck: debug-info option
+.\" mysqlcheck: defaults-extra-file option
+.\" defaults-extra-file option: mysqlcheck
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
@ -485,13 +475,13 @@ diff -up mysql-5.6.15/man/mysqlcheck.1.p24 mysql-5.6.15/man/mysqlcheck.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlcheck: extended option.\" extended option: mysqlcheck\fB\-\-extended\fR,
\fB\-e\fR
.\" debug-info option: mysqlcheck
\fB\-\-debug\-info\fR
.sp
@@ -572,6 +604,21 @@ operation\&. This finds only 99\&.99% of
.sp -1
.IP \(bu 2.3
@@ -572,6 +604,21 @@ Convert table names to 5\&.1 format\&. O
.\}
.\" mysqlcheck: force option
.\" force option: mysqlcheck
+.\" mysqlcheck: no-defaults option
+.\" no-defaults option: mysqlcheck
+\fB\-\-no\-defaults\fR
@ -507,10 +497,10 @@ diff -up mysql-5.6.15/man/mysqlcheck.1.p24 mysql-5.6.15/man/mysqlcheck.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlcheck: optimize option.\" optimize option: mysqlcheck\fB\-\-optimize\fR,
\fB\-o\fR
\fB\-\-force\fR,
\fB\-f\fR
.sp
@@ -712,6 +759,22 @@ Silent mode\&. Print only error messages
@@ -712,6 +759,22 @@ The TCP/IP port number to use for the co
.RE
.sp
.RS 4
@ -533,13 +523,13 @@ diff -up mysql-5.6.15/man/mysqlcheck.1.p24 mysql-5.6.15/man/mysqlcheck.1
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
diff -up mysql-5.6.15/man/mysql_config.1.p24 mysql-5.6.15/man/mysql_config.1
--- mysql-5.6.15/man/mysql_config.1.p24 2013-12-09 19:08:52.751074834 +0100
+++ mysql-5.6.15/man/mysql_config.1 2013-12-10 13:09:46.944577176 +0100
@@ -174,6 +174,22 @@ The default Unix socket file, defined wh
.sp -1
.IP \(bu 2.3
.\}
diff -up mysql-5.6.16/man/mysql_config.1.p24 mysql-5.6.16/man/mysql_config.1
--- mysql-5.6.16/man/mysql_config.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysql_config.1 2014-02-03 15:31:31.985839986 +0100
@@ -174,6 +174,22 @@ The default TCP/IP port number, defined
.sp
.RS 4
.ie n \{\
+.\" mysql_config: variable option
+.\" variable option: mysql_config
+\fB\-\-variable=VAR\fR
@ -556,26 +546,25 @@ diff -up mysql-5.6.15/man/mysql_config.1.p24 mysql-5.6.15/man/mysql_config.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysql_config: version option.\" version option: mysql_config\fB\-\-version\fR
.sp
Version number for the MySQL distribution\&.
diff -up mysql-5.6.15/man/mysqldump.1.p24 mysql-5.6.15/man/mysqldump.1
--- mysql-5.6.15/man/mysqldump.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqldump.1 2013-12-10 13:00:43.204169470 +0100
@@ -1154,7 +1154,8 @@ statements that include column names\&.
.sp -1
.IP \(bu 2.3
\h'-04'\(bu\h'+03'\c
.\}
-.\" mysqldump: create-options option.\" create-options option: mysqldump\fB\-\-create\-options\fR
+.\" mysqldump: create-options option.\" create-options option: mysqldump\fB\-\-create\-options\fR,
+\fB\-a\fR
.el \{\
diff -up mysql-5.6.16/man/mysqldump.1.p24 mysql-5.6.16/man/mysqldump.1
--- mysql-5.6.16/man/mysqldump.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqldump.1 2014-02-03 15:35:30.992008930 +0100
@@ -1246,7 +1246,7 @@ statements that include column names\&.
.\}
.\" mysqldump: create-options option
.\" create-options option: mysqldump
-\fB\-\-create\-options\fR
+\fB\-\-create\-options\fR, \fB\-a\fR
.sp
Include all MySQL\-specific table options in the
CREATE TABLE
@@ -1666,6 +1667,38 @@ transactional options, primarily for the
.sp -1
.IP \(bu 2.3
.\}
@@ -1666,6 +1666,38 @@ Do not dump the given table, which must
\fB\-d\fR
.sp
Do not write any table row information (that is, do not dump table contents)\&. This is useful if you want to dump only the
+.\" mysqldump: defaults-extra-file option
+.\" defaults-extra-file option: mysqldump
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
@ -608,13 +597,13 @@ diff -up mysql-5.6.15/man/mysqldump.1.p24 mysql-5.6.15/man/mysqldump.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqldump: delayed-insert option.\" delayed-insert option: mysqldump\fB\-\-delayed\-insert\fR
.sp
For those nontransactional tables that support the
@@ -1917,6 +1950,36 @@ at the end of the option list\&.
.sp -1
CREATE TABLE
statement for the table (for example, to create an empty copy of the table by loading the dump file)\&.
.RE
@@ -1917,6 +1949,36 @@ for information about selectively enabli
.IP \(bu 2.3
.\}
.\" mysqldump: quick option
+.\" mysqldump: max-allowed-packet option
+.\" max-allowed-packet option: mysqldump
+\fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
@ -645,10 +634,10 @@ diff -up mysql-5.6.15/man/mysqldump.1.p24 mysql-5.6.15/man/mysqldump.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqldump: no-autocommit option.\" no-autocommit option: mysqldump\fB\-\-no\-autocommit\fR
.sp
Enclose the
@@ -2012,6 +2075,21 @@ is on by default\&. Thus you rarely if e
.\" quick option: mysqldump
\fB\-\-quick\fR,
\fB\-q\fR
@@ -2194,6 +2256,21 @@ is on by default\&. Thus you rarely if e
.el \{\
.sp -1
.IP \(bu 2.3
@ -670,7 +659,7 @@ diff -up mysql-5.6.15/man/mysqldump.1.p24 mysql-5.6.15/man/mysqldump.1
.\}
The
\fB\-\-compact\fR
@@ -2184,6 +2262,21 @@ is on by default\&.)
@@ -2371,6 +2448,21 @@ is on by default\&.)
.RE
.sp
.RS 4
@ -692,10 +681,10 @@ diff -up mysql-5.6.15/man/mysqldump.1.p24 mysql-5.6.15/man/mysqldump.1
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
diff -up mysql-5.6.15/man/mysqlimport.1.p24 mysql-5.6.15/man/mysqlimport.1
--- mysql-5.6.15/man/mysqlimport.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqlimport.1 2013-12-10 12:55:58.039851937 +0100
@@ -238,8 +238,40 @@ This option was added in MySQL 5\&.6\&.2
diff -up mysql-5.6.16/man/mysqlimport.1.p24 mysql-5.6.16/man/mysqlimport.1
--- mysql-5.6.16/man/mysqlimport.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqlimport.1 2014-02-03 15:36:17.680039918 +0100
@@ -258,10 +258,42 @@ This option was added in MySQL 5\&.6\&.2
.sp -1
.IP \(bu 2.3
.\}
@ -731,16 +720,18 @@ diff -up mysql-5.6.15/man/mysqlimport.1.p24 mysql-5.6.15/man/mysqlimport.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlimport: delete option.\" delete option: mysqlimport\fB\-\-delete\fR,
.\" mysqlimport: delete option
.\" delete option: mysqlimport
\fB\-\-delete\fR,
-\fB\-D\fR
+\fB\-d\fR
.sp
Empty the table before importing the text file\&.
.RE
@@ -397,6 +429,22 @@ MERGE)\&.
.sp -1
.IP \(bu 2.3
.\}
@@ -397,6 +429,22 @@ Section\ \&13.2.6, \(lqLOAD DATA INFILE
Read input files locally from the client host\&.
.RE
.sp
+.\" mysqlimport: no-defaults option
+.\" no-defaults option: mysqlimport
+\fB\-\-no\-defaults\fR
@ -757,10 +748,10 @@ diff -up mysql-5.6.15/man/mysqlimport.1.p24 mysql-5.6.15/man/mysqlimport.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlimport: password option.\" password option: mysqlimport\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
.sp
@@ -513,6 +561,22 @@ Silent mode\&. Produce output only when
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
@@ -519,6 +567,22 @@ The TCP/IP port number to use for the co
.RE
.sp
.RS 4
@ -783,23 +774,22 @@ diff -up mysql-5.6.15/man/mysqlimport.1.p24 mysql-5.6.15/man/mysqlimport.1
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
diff -up mysql-5.6.15/man/mysqlshow.1.p24 mysql-5.6.15/man/mysqlshow.1
--- mysql-5.6.15/man/mysqlshow.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqlshow.1 2013-12-10 13:08:16.657520289 +0100
@@ -167,7 +167,8 @@ This option is supported beginning with
.sp -1
.IP \(bu 2.3
diff -up mysql-5.6.16/man/mysqlshow.1.p24 mysql-5.6.16/man/mysqlshow.1
--- mysql-5.6.16/man/mysqlshow.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqlshow.1 2014-02-03 15:34:12.679955219 +0100
@@ -173,7 +173,7 @@ This option is supported beginning with
.\}
-.\" mysqlshow: character-sets-dir option.\" character-sets-dir option: mysqlshow\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
+.\" mysqlshow: character-sets-dir option.\" character-sets-dir option: mysqlshow\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR,
+\fB\-c\fR
.\" mysqlshow: character-sets-dir option
.\" character-sets-dir option: mysqlshow
-\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR, \fB\-c\fR
.sp
The directory where character sets are installed\&. See
Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
@@ -285,6 +286,38 @@ This option was added in MySQL 5\&.6\&.2
.sp -1
.IP \(bu 2.3
@@ -285,6 +285,38 @@ Section\ \&10.5, \(lqCharacter Set Confi
.\}
.el \{\
.sp -1
+.\" mysqlshow: defaults-extra-file option
+.\" defaults-extra-file option: mysqlshow
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
@ -832,13 +822,13 @@ diff -up mysql-5.6.15/man/mysqlshow.1.p24 mysql-5.6.15/man/mysqlshow.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlshow: host option.\" host option: mysqlshow\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
\fB\-h \fR\fB\fIhost_name\fR\fR
.sp
@@ -313,6 +346,22 @@ Show table indexes\&.
.sp -1
.IP \(bu 2.3
.\}
.\" mysqlshow: default-auth option
@@ -313,6 +345,22 @@ This option was added in MySQL 5\&.6\&.2
Connect to the MySQL server on the given host\&.
.RE
.sp
+.\" mysqlshow: no-defaults option
+.\" no-defaults option: mysqlshow
+\fB\-\-no\-defaults\fR
@ -855,10 +845,10 @@ diff -up mysql-5.6.15/man/mysqlshow.1.p24 mysql-5.6.15/man/mysqlshow.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlshow: password option.\" password option: mysqlshow\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
.sp
@@ -413,6 +462,22 @@ VIEW\&.
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
@@ -413,6 +461,22 @@ The TCP/IP port number to use for the co
.RE
.sp
.RS 4
@ -881,10 +871,10 @@ diff -up mysql-5.6.15/man/mysqlshow.1.p24 mysql-5.6.15/man/mysqlshow.1
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
diff -up mysql-5.6.15/man/mysqlslap.1.p24 mysql-5.6.15/man/mysqlslap.1
--- mysql-5.6.15/man/mysqlslap.1.p24 2013-11-17 19:03:04.000000000 +0100
+++ mysql-5.6.15/man/mysqlslap.1 2013-12-10 13:11:04.721623937 +0100
@@ -531,6 +531,38 @@ Section\ \&6.3.7.7, \(lqThe Cleartext Cl
diff -up mysql-5.6.16/man/mysqlslap.1.p24 mysql-5.6.16/man/mysqlslap.1
--- mysql-5.6.16/man/mysqlslap.1.p24 2014-01-14 16:38:10.000000000 +0100
+++ mysql-5.6.16/man/mysqlslap.1 2014-02-03 15:31:31.989839989 +0100
@@ -526,6 +526,38 @@ This option was added in MySQL 5\&.6\&.2
.el \{\
.sp -1
.IP \(bu 2.3
@ -921,12 +911,12 @@ diff -up mysql-5.6.15/man/mysqlslap.1.p24 mysql-5.6.15/man/mysqlslap.1
+.IP \(bu 2.3
+.\}
.\}
.\" mysqlslap: engine option.\" engine option: mysqlslap\fB\-\-engine=\fR\fB\fIengine_name\fR\fR,
.\" mysqlslap: delimiter option
.\" delimiter option: mysqlslap
@@ -584,6 +616,37 @@ Section\ \&6.3.7.7, \(lqThe Cleartext Cl
\fB\-e \fR\fB\fIengine_name\fR\fR
@@ -589,6 +621,37 @@ from dropping any schema it creates duri
.sp -1
.IP \(bu 2.3
.\}
.sp
The storage engine to use for creating tables\&.
+.\" mysqlslap: no-defaults option
+.\" no-defaults option: mysqlslap
+\fB\-\-no\-defaults\fR
@ -958,10 +948,10 @@ diff -up mysql-5.6.15/man/mysqlslap.1.p24 mysql-5.6.15/man/mysqlslap.1
+.sp -1
+.IP \(bu 2.3
+.\}
.\" mysqlslap: number-char-cols option.\" number-char-cols option: mysqlslap\fB\-\-number\-char\-cols=\fR\fB\fIN\fR\fR,
\fB\-x \fR\fB\fIN\fR\fR
.RE
.sp
@@ -819,6 +882,22 @@ Section\ \&4.2.2, \(lqConnecting to the
.RS 4
@@ -821,6 +884,22 @@ The file or string containing the statem
.RE
.sp
.RS 4

87
community-mysql-tmpdir.patch
View File

@ -1,87 +0,0 @@
Directory /tmp is now on tmpfs, which can cause problems with limitted space
or replication. It's documented here:
http://dev.mysql.com/doc/refman/5.5/en/server-options.html#option_mysqld_tmpdir
"If the MySQL server is acting as a replication slave, you should not set --tmpdir
to point to a directory on a memory-based file system or to a directory that is
cleared when the server host restarts."
RHBZ#962087
Upstream bug report: https://mariadb.atlassian.net/browse/MDEV-4165
MySQL bug report: http://bugs.mysql.com/bug.php?id=68338
diff -up mysql-5.6.14/CMakeLists.txt.tmpdir mysql-5.6.14/CMakeLists.txt
--- mysql-5.6.14/CMakeLists.txt.tmpdir 2013-09-10 09:38:25.000000000 +0200
+++ mysql-5.6.14/CMakeLists.txt 2013-10-09 14:49:14.115887439 +0200
@@ -309,6 +309,10 @@ IF(SYSCONFDIR)
SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
ENDIF()
+IF(TMPDIR)
+ SET(DEFAULT_TMPDIR "${TMPDIR}")
+ENDIF()
+
# Run platform tests
INCLUDE(configure.cmake)
diff -up mysql-5.6.14/config.h.cmake.tmpdir mysql-5.6.14/config.h.cmake
--- mysql-5.6.14/config.h.cmake.tmpdir 2013-09-10 09:38:25.000000000 +0200
+++ mysql-5.6.14/config.h.cmake 2013-10-09 14:49:14.115887439 +0200
@@ -636,6 +636,7 @@
#cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
#cmakedefine PLUGINDIR "@PLUGINDIR@"
#cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
+#cmakedefine DEFAULT_TMPDIR "@DEFAULT_TMPDIR@"
#cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
diff -up mysql-5.6.14/include/my_global.h.tmpdir mysql-5.6.14/include/my_global.h
--- mysql-5.6.14/include/my_global.h.tmpdir 2013-09-10 09:38:25.000000000 +0200
+++ mysql-5.6.14/include/my_global.h 2013-10-09 14:49:14.116887439 +0200
@@ -1219,3 +1219,10 @@ typedef struct
#endif
#endif // MY_GLOBAL_INCLUDED
+/*
+ Define default tmpdir if not already set.
+*/
+#if !defined(DEFAULT_TMPDIR)
+#define DEFAULT_TMPDIR P_tmpdir
+#endif
+
diff -up mysql-5.6.14/libmysqld/lib_sql.cc.tmpdir mysql-5.6.14/libmysqld/lib_sql.cc
--- mysql-5.6.14/libmysqld/lib_sql.cc.tmpdir 2013-09-10 09:38:26.000000000 +0200
+++ mysql-5.6.14/libmysqld/lib_sql.cc 2013-10-09 14:49:14.116887439 +0200
@@ -587,7 +587,7 @@ int init_embedded_server(int argc, char
opt_mysql_tmpdir=getenv("TMP");
#endif
if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
- opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */
+ opt_mysql_tmpdir=(char*) DEFAULT_TMPDIR; /* purecov: inspected */
init_ssl();
umask(((~my_umask) & 0666));
diff -up mysql-5.6.14/mysys/mf_tempdir.c.tmpdir mysql-5.6.14/mysys/mf_tempdir.c
--- mysql-5.6.14/mysys/mf_tempdir.c.tmpdir 2013-09-10 09:38:25.000000000 +0200
+++ mysql-5.6.14/mysys/mf_tempdir.c 2013-10-09 14:49:14.116887439 +0200
@@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, c
pathlist=getenv("TMP");
#endif
if (!pathlist || !pathlist[0])
- pathlist=(char*) P_tmpdir;
+ pathlist=(char*) DEFAULT_TMPDIR;
}
do
{
diff -up mysql-5.6.14/mysys/mf_tempfile.c.tmpdir mysql-5.6.14/mysys/mf_tempfile.c
--- mysql-5.6.14/mysys/mf_tempfile.c.tmpdir 2013-09-10 09:38:25.000000000 +0200
+++ mysql-5.6.14/mysys/mf_tempfile.c 2013-10-09 14:49:14.117887440 +0200
@@ -111,7 +111,7 @@ File create_temp_file(char *to, const ch
sizeof(prefix_buff)-7),"XXXXXX") -
prefix_buff);
if (!dir && ! (dir =getenv("TMPDIR")))
- dir=P_tmpdir;
+ dir=DEFAULT_TMPDIR;
if (strlen(dir)+ pfx_len > FN_REFLEN-2)
{
errno=my_errno= ENAMETOOLONG;

41
community-mysql.spec
View File

@ -13,8 +13,8 @@
%global _default_patch_flags --no-backup-if-mismatch
Name: community-mysql
Version: 5.6.15
Release: 4%{?dist}
Version: 5.6.16
Release: 2%{?dist}
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
URL: http://www.mysql.com
@ -50,19 +50,15 @@ Patch18: community-mysql-5.6.11-cipherspec.patch
Patch19: community-mysql-file-contents.patch
Patch21: community-mysql-dh1024.patch
Patch22: community-mysql-sharedir.patch
Patch23: community-mysql-5.6.10-libmysql-version.patch
Patch23: community-mysql-5.6.16-libmysql-version.patch
Patch24: community-mysql-man-pages.patch
Patch25: community-mysql-5.6.14-mysql-install.patch
Patch25: community-mysql-5.6.16-mysql-install.patch
Patch26: community-mysql-5.6.13-major.patch
Patch28: community-mysql-5.6.13-truncate-file.patch
Patch29: community-mysql-tmpdir.patch
Patch30: community-mysql-cve-2013-1861.patch
Patch31: community-mysql-innodbwarn.patch
Patch32: community-mysql-covscan-signexpr.patch
Patch33: community-mysql-covscan-stroverflow.patch
Patch34: community-mysql-pluginerrmsg.patch
Patch35: community-mysql-rhbz1059545.patch
Patch36: community-mysql-ssltest.patch
Patch37: community-mysql-5.6.16-fix-regex-werror.patch
BuildRequires: cmake
BuildRequires: dos2unix
@ -254,14 +250,10 @@ the MySQL sources.
%patch26 -p1
%endif
%patch28 -p0
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
# Workaround for upstream bug #http://bugs.mysql.com/56342
rm -f mysql-test/t/ssl_8k_key-master.opt
@ -537,6 +529,8 @@ mkdir %{buildroot}%{_sysconfdir}/my.cnf.d
%post libs -p /sbin/ldconfig
%post embedded -p /sbin/ldconfig
%post server
%systemd_post mysqld.service
/bin/touch /var/log/mysqld.log
@ -561,6 +555,8 @@ fi
%postun libs -p /sbin/ldconfig
%postun embedded -p /sbin/ldconfig
%postun server
%systemd_postun_with_restart mysqld.service
@ -752,6 +748,23 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
* Mon Feb 3 2014 Honza Horak <hhorak@redhat.com> 5.6.16-2
- Rebuild -man-pages.patch to apply smoothly
* Fri Jan 31 2014 Bjorn Munch <bjorn.munch@oracle.com> 5.6.16-1
- Update to MySQL 5.6.16, for various fixes described at
https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-16.html
- Patches now upstream: tmpdir, cve-2013-1861, covscan-signexpr,
covscan-stroverflow
- Fixed upstream: innodbwarn
- ldconfig needed in embedded subpackage
- Remove unused generate-tarball.sh from tree
- Rediff mysql-install patch
- Make symvers 18 default, provide symvers 16 for backward compat
(bz #1045013)
- Man page patch disabled due too many conflicts
- Memcached build patched to not remove -Werror=<something> in CFLAGS
* Thu Jan 30 2014 Honza Horak <hhorak@redhat.com> 5.6.15-4
Fix for CVE-2014-0001
Resolves: #1059545

15
generate-tarball.sh
View File

@ -1,15 +0,0 @@
#!/bin/sh
VERSION=$1
rm -rf mysql-$VERSION
tar xfz mysql-$VERSION.tar.gz || exit 1
rm mysql-$VERSION/Docs/mysql.info
tar cfJ mysql-$VERSION-nodocs.tar.xz mysql-$VERSION || exit 1
rm -rf mysql-$VERSION
exit 0