From 47a549048bf8729b7983026c11c9ed75ca653cca Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 3 Feb 2015 15:03:35 +0100 Subject: [PATCH] Removing man pages patch since upstream claims the version in tarball is correct. --- community-mysql-man-pages.patch | 979 -------------------------------- community-mysql.spec | 3 +- 2 files changed, 1 insertion(+), 981 deletions(-) delete mode 100644 community-mysql-man-pages.patch diff --git a/community-mysql-man-pages.patch b/community-mysql-man-pages.patch deleted file mode 100644 index 43fe99d..0000000 --- a/community-mysql-man-pages.patch +++ /dev/null @@ -1,979 +0,0 @@ -diff --git a/man/mysql.1 b/man/mysql.1 -index 2e1602c..1e1d9f3 100644 ---- a/man/mysql.1 -+++ b/man/mysql.1 -@@ -137,7 +137,8 @@ Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(r - .\" mysql: help option - .\" help option: mysql - \fB\-\-help\fR, --\fB\-?\fR -+\fB\-?\fR, -+\fB\-I\fR - .sp - Display a help message and exit\&. - .RE -@@ -348,6 +349,21 @@ Compress all information sent between the client and the server if both support - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -+.\" mysql: connect-timeout option -+.\" connect-timeout option: mysql -+\fB\-\-connect\-timeout=\fR\fB\fIseconds\fR\fR -+.sp -+Set the time for connection timeout in seconds\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .el \{\ - .sp -1 - .IP \(bu 2.3 -@@ -447,6 +463,37 @@ Section\ \&6.3.7, \(lqPluggable Authentication\(rq\&. - .sp - .RS 4 - .ie n \{\ -+.\" mysql: defaults-file option -+.\" defaults-file option: mysql -+\fB\-\-defaults-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysql: defaults-extra-file option -+.\" defaults-extra-file option: mysql -+\fB\-\-defaults-extra-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - \h'-04'\(bu\h'+03'\c - .\} - .el \{\ -@@ -638,6 +685,36 @@ Section\ \&5.1.7, \(lqServer SQL Modes\(rq)\&. - .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 -+.sp -+Specify the maximum packet length to send to or recieve form server\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysql: max-join-size option -+.\" max-join-size option: mysql -+\fB\-\-max\-join\-size=\fR\fB\fInum\fR\fR -+.sp -+Set the automatic limit for rows in a join when using \fB\-\-safe\-updates\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.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 also support it\&. - .RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c -+.\" mysql: no-defaults option -+.\" no-defaults option: mysql -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\} - .el \{\ - .sp -1 -@@ -911,6 +1003,21 @@ the section called \(lqMYSQL COMMANDS\(rq, discusses output paging further\&. - \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 -+.sp -+Print the program argument list and exit\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - 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 -@@ -1102,6 +1209,36 @@ If the connection to the server is lost, automatically try to reconnect\&. A sin - \fB\-\-skip\-reconnect\fR\&. - .RE - .sp -+.\" mysql: select-limit option -+.\" select-limit option: mysql -+\fB\-\-select\-limit=\fR\fB\fIlimit\fR\fR -+.sp -+Set automatic limit for SELECT when using \fB\-\-safe\-updates\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysql: server-arg option -+.\" server-arg option: mysql -+\fB\-\-server\-arg=\fR\fB\fIname\fR\fR -+.sp -+Send \fB\fIname\fR\fR as a parameter to the embedded server\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c -@@ -1146,9 +1283,39 @@ to disable it\&. - .if n \{\ - .sp - .\} -+.\" 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 -+.sp -+Disable automatic rehashing\&. Synonym for \fB\-\-disable\-auto\-rehash\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .nr an-break-flag 1 - .br - .ps +1 -@@ -1305,7 +1472,7 @@ localhost, the Unix socket file to use, or, on Windows, the name of the named pi - \fB\-\-ssl*\fR - .sp - Options that begin with --\fB\-\-ssl\fR -+\fB\-\-ssl\fR, - specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See - Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&. - .RE -@@ -1481,7 +1648,7 @@ The XML output also uses an XML namespace, as shown here: - .RS 4 - .\} - .nf --shell> \fBmysql \-\-xml \-uroot \-e "SHOW VARIABLES LIKE \*(Aqversion%\*(Aq"\fR -+shell> \fBmysql \-\-xml \-u root \-e "SHOW VARIABLES LIKE \*(Aqversion%\*(Aq"\fR - - - -@@ -3395,16 +3562,16 @@ statements that probably need to examine more than 1,000,000 row combinations\&. - .RE - .PP - To specify limits different from 1,000 and 1,000,000, you can override the defaults by using the --\fB\-\-select_limit\fR -+\fB\-\-select\-limit\fR - and --\fB\-\-max_join_size\fR -+\fB\-\-max\-join\-size\fR - options: - .sp - .if n \{\ - .RS 4 - .\} - .nf --shell> \fBmysql \-\-safe\-updates \-\-select_limit=500 \-\-max_join_size=10000\fR -+shell> \fBmysql \-\-safe\-updates \-\-select\-limit=500 \-\-max\-join\-size=10000\fR - .fi - .if n \{\ - .RE -diff --git a/man/mysql_config.1 b/man/mysql_config.1 -index 5bd4e5b..e7e11db 100644 ---- a/man/mysql_config.1 -+++ b/man/mysql_config.1 -@@ -174,6 +174,22 @@ The default TCP/IP port number, defined when configuring MySQL\&. - .sp - .RS 4 - .ie n \{\ -+.\" mysql_config: variable option -+.\" variable option: mysql_config -+\fB\-\-variable=VAR\fR -+.sp -+Path to MySQL include, library and plugin directories\&. \fBVAR\fR is one of -+`pkgincludedir`, `pkglibdir` and `plugindir`, respectively\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - \h'-04'\(bu\h'+03'\c - .\} - .el \{\ -diff --git a/man/mysqladmin.1 b/man/mysqladmin.1 -index d1a1020..111715e 100644 ---- a/man/mysqladmin.1 -+++ b/man/mysqladmin.1 -@@ -639,6 +639,21 @@ Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqladmin: connect-timeout option -+.\" connect-timeout option: mysqladmin -+\fB\-\-connect-timeout=\fR\fB\fItimeout\fR\fR -+.sp -+Equivalent to \fB\-\-connect_timeout\fR, see the end of this section\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqladmin: compress option - .\" compress option: mysqladmin - \fB\-\-compress\fR, -@@ -729,6 +744,37 @@ Print debugging information and memory and CPU usage statistics when the program - .sp - 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 -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqladmin: defaults-file option -+.\" defaults-file option: mysqladmin -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .RE - .sp - .RS 4 -@@ -789,6 +835,21 @@ command\&. With multiple commands, continue even if an error occurs\&. - .ie n \{\ - \h'-04'\(bu\h'+03'\c - .\} -+.\" mysqladmin: no-defaults option -+.\" no-defaults option: mysqladmin -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .el \{\ - .sp -1 - .IP \(bu 2.3 -@@ -887,6 +948,21 @@ Section\ \&6.1.2.1, \(lqEnd-User Guidelines for Password Security\(rq\&. You can - 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 -+.sp -+Print the program argument list and exit\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c -@@ -967,6 +1043,21 @@ command\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqladmin: shutdown-timeout option -+.\" shutdown-timeout option: mysqladmin -+\fB\-\-shutdown\-timeout\fR\fB\fItimeout\fR\fR -+.sp -+Equivalent of \fB\-\-shutdown_timeout\fR, see the end of this section\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqladmin: secure-auth option - .\" secure-auth option: mysqladmin - \fB\-\-secure\-auth\fR -diff --git a/man/mysqlbinlog.1 b/man/mysqlbinlog.1 -index eead304..8e30383 100644 ---- a/man/mysqlbinlog.1 -+++ b/man/mysqlbinlog.1 -@@ -629,6 +629,7 @@ Do not display any of the groups listed in the - \fB\-F\fR - .sp - Read binary log files even if they are open or were not closed properly\&. -+Enabled by default, use \fB\-\-skip\-force\-if\-open\fR to disable\&. - .RE - .sp - .RS 4 -@@ -743,6 +744,22 @@ or any other MySQL program\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlbinlog: open-files-limit option -+.\" open-files-limit option: mysqlbinlog -+\fB\-\-open\-files\-limit=\fR\fB\fINUM\fR\fR -+.sp -+Sets the open_files_limit variable, which is used to reserve file descriptors for -+\fBmysqlbinlog\fR\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlbinlog: login-path option - .\" login-path option: mysqlbinlog - \fB\-\-login\-path=\fR\fB\fIname\fR\fR -diff --git a/man/mysqlcheck.1 b/man/mysqlcheck.1 -index 8f1a6ce..2cddc1f 100644 ---- a/man/mysqlcheck.1 -+++ b/man/mysqlcheck.1 -@@ -456,6 +456,38 @@ Print some debugging information when the program exits\&. - .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 -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlcheck: defaults-file option -+.\" defaults-file option: mysqlcheck -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" debug-info option: mysqlcheck - \fB\-\-debug\-info\fR - .sp -@@ -572,6 +604,21 @@ Convert table names to 5\&.1 format\&. Only table names that contain special cha - .\} - .\" mysqlcheck: force option - .\" force option: mysqlcheck -+.\" mysqlcheck: no-defaults option -+.\" no-defaults option: mysqlcheck -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - \fB\-\-force\fR, - \fB\-f\fR - .sp -@@ -728,6 +775,22 @@ This option was added in MySQL 5\&.6\&.2\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlcheck: print-defaults option -+.\" print-defaults option: mysqlcheck -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlcheck: port option - .\" port option: mysqlcheck - \fB\-\-port=\fR\fB\fIport_num\fR\fR, -diff --git a/man/mysqldump.1 b/man/mysqldump.1 -index 9f5dad4..d92f4e6 100644 ---- a/man/mysqldump.1 -+++ b/man/mysqldump.1 -@@ -1304,7 +1304,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 -@@ -1724,6 +1724,38 @@ Do not dump the given table, which must be specified using both the database and - \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 -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqldump: defaults-file option -+.\" defaults-file option: mysqldump -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - CREATE TABLE - statement for the table (for example, to create an empty copy of the table by loading the dump file)\&. - .RE -@@ -1975,6 +2007,36 @@ for information about selectively enabling or disabling a subset of the options - .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 -+.sp -+Sets the maximum packet length to send to or recieve from server\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqldump: net-buffer-length option -+.\" net-buffer-length option: mysqldump -+\fB\-\-net\-buffer\-length=\fR\fB\fIlength\fR\fR -+.sp -+Sets 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 -+.\} - .\" quick option: mysqldump - \fB\-\-quick\fR, - \fB\-q\fR -@@ -2252,6 +2314,21 @@ is on by default\&. Thus you rarely if ever specify - .el \{\ - .sp -1 - .IP \(bu 2.3 -+.\" mysqldump: no-defaults option -+.\" no-defaults option: mysqldump -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\} - The - \fB\-\-compact\fR -@@ -2436,6 +2513,21 @@ is on by default\&.) - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqldump: print-defaults option -+.\" print-defaults option: mysqldump -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. This must begiven as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - To reverse - \fB\-\-opt\fR - for all features except index disabling and table locking, use -diff --git a/man/mysqlimport.1 b/man/mysqlimport.1 -index 9d82dab..1d231d3 100644 ---- a/man/mysqlimport.1 -+++ b/man/mysqlimport.1 -@@ -258,10 +258,42 @@ This option was added in MySQL 5\&.6\&.2\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlimport: defaults-extra-file option -+.\" defaults-extra-file option: mysqlimport -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been -+read\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlimport: defaults-file option -+.\" defaults-file option: mysqlimport -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" 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 @@ Section\ \&13.2.6, \(lqLOAD DATA INFILE Syntax\(rq\&. - Read input files locally from the client host\&. - .RE - .sp -+.\" mysqlimport: no-defaults option -+.\" no-defaults option: mysqlimport -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the -+first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c -@@ -535,6 +583,22 @@ This option was added in MySQL 5\&.6\&.2\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlimport: print-defaults option -+.\" print-defaults option: mysqlimport -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlimport: port option - .\" port option: mysqlimport - \fB\-\-port=\fR\fB\fIport_num\fR\fR, -diff --git a/man/mysqlshow.1 b/man/mysqlshow.1 -index 0634515..0cfbfd3 100644 ---- a/man/mysqlshow.1 -+++ b/man/mysqlshow.1 -@@ -173,7 +173,7 @@ This option is supported beginning with MySQL 5\&.6\&.1\&. - .\} - .\" 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 +285,38 @@ Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&. - .\} - .el \{\ - .sp -1 -+.\" mysqlshow: defaults-extra-file option -+.\" defaults-extra-file option: mysqlshow -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been -+read\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlshow: defaults-file option -+.\" defaults-file option: mysqlshow -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .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 -+.sp -+Do not read default options from any option file\&. This must be given as the -+first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .RS 4 - .ie n \{\ - \h'-04'\(bu\h'+03'\c -@@ -429,6 +477,22 @@ This option was added in MySQL 5\&.6\&.2\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlshow: print-defaults option -+.\" print-defaults option: mysqlshow -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlshow: port option - .\" port option: mysqlshow - \fB\-\-port=\fR\fB\fIport_num\fR\fR, -diff --git a/man/mysqlslap.1 b/man/mysqlslap.1 -index 7c4d4e7..85a5168 100644 ---- a/man/mysqlslap.1 -+++ b/man/mysqlslap.1 -@@ -526,6 +526,38 @@ This option was added in MySQL 5\&.6\&.2\&. - .el \{\ - .sp -1 - .IP \(bu 2.3 -+.\" mysqlslap: defaults-extra-file option -+.\" defaults-extra-file option: mysqlslap -+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been -+read\&. Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlslap: defaults-file option -+.\" defaults-file option: mysqlslap -+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR -+.sp -+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. -+Must be given as first option\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\} - .\" mysqlslap: delimiter option - .\" delimiter option: mysqlslap -@@ -584,6 +616,37 @@ Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) - \fB\-e \fR\fB\fIengine_name\fR\fR - .sp - The storage engine to use for creating tables\&. -+.\" mysqlslap: no-defaults option -+.\" no-defaults option: mysqlslap -+\fB\-\-no\-defaults\fR -+.sp -+Do not read default options from any option file\&. This must be given as the -+first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} -+.\" mysqlslap: no-drop option -+.\" no-drop option: mysqlslap -+\fB\-\-no\-drop\fR -+.sp -+Do not drop the schema after the test\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .RE - .sp - .RS 4 -@@ -822,6 +885,22 @@ This option was added in MySQL 5\&.6\&.2\&. - .sp -1 - .IP \(bu 2.3 - .\} -+.\" mysqlslap: print-defaults option -+.\" print-defaults option: mysqlslap -+\fB\-\-print\-defaults\fR -+.sp -+Print the program argument list and exit\&. -+This must be given as the first argument\&. -+.RE -+.sp -+.RS 4 -+.ie n \{\ -+\h'-04'\(bu\h'+03'\c -+.\} -+.el \{\ -+.sp -1 -+.IP \(bu 2.3 -+.\} - .\" mysqlslap: port option - .\" port option: mysqlslap - \fB\-\-port=\fR\fB\fIport_num\fR\fR, diff --git a/community-mysql.spec b/community-mysql.spec index b37edef..5a64f0c 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -119,7 +119,6 @@ Patch10: %{pkgnamepatch}-paths.patch Patch51: %{pkgnamepatch}-chain-certs.patch Patch52: %{pkgnamepatch}-sharedir.patch Patch53: %{pkgnamepatch}-5.6.16-libmysql-version.patch -Patch54: %{pkgnamepatch}-man-pages.patch Patch55: %{pkgnamepatch}-5.6.16-mysql-install.patch Patch56: %{pkgnamepatch}-pluginerrmsg.patch Patch57: %{pkgnamepatch}-5.6.19-gcc49-aarch64-opt.patch @@ -391,7 +390,6 @@ the MySQL sources. %patch51 -p1 %patch52 -p1 %patch53 -p1 -%patch54 -p1 %patch55 -p1 %patch56 -p1 %patch57 -p1 @@ -945,6 +943,7 @@ fi - Expired certs patch now obsolete - Fixed changelog - Refreshed file contents patch +- Man pages fixed upstream - Fix typo in server.cnf.in * Mon Jan 26 2015 Honza Horak - 5.6.22-6