Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 123 deletions

diff --git a/man/mysql_tzinfo_to_sql.1 b/man/mysql_tzinfo_to_sql.1
deleted file mode 100644
index e287db0c..00000000
--- a/man/mysql_tzinfo_to_sql.1
+++ /dev/null
@@ -1,123 +0,0 @@
-'\" t
-.\"
-.TH "\fBMARIADB-TZINFO-TO-SQL\fR" "1" "22 April 2022" "MariaDB 10.11" "MariaDB Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.\" mysql_tzinfo_to_sql
-.\" time zone tables
-.SH "NAME"
-mariadb-tzinfo-to-sql \- load the time zone tables (mysql_tzinfo_to_sql is now a symlink to mariadb-tzinfo-to-sql)
-.SH "SYNOPSIS"
-.HP \w'\fBmysql_tzinfo_to_sql\ \fR\fB\fIarguments\fR\fR\ 'u
-\fBmysql_tzinfo_to_sql \fR\fB\fIarguments\fR\fR
-.SH "DESCRIPTION"
-.PP
-The
-\fBmysql_tzinfo_to_sql\fR
-program loads the time zone tables in the
-mysql
-database\&. It is used on systems that have a
-zoneinfo
-database (the set of files describing time zones)\&. Examples of such systems are Linux, FreeBSD, Solaris, and Mac OS X\&. One likely location for these files is the
-/usr/share/zoneinfo
-directory (/usr/share/lib/zoneinfo
-on Solaris)\&.
-.PP
-\fBmysql_tzinfo_to_sql\fR
-can be invoked several ways:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysql_tzinfo_to_sql \fR\fB\fItz_dir\fR\fR
-shell> \fBmysql_tzinfo_to_sql \fR\fB\fItz_file tz_name\fR\fR
-shell> \fBmysql_tzinfo_to_sql \-\-leap \fR\fB\fItz_file\fR\fR
-shell> \fBmysql_tzinfo_to_sql \-\-skip\-write\-binlog \fR\fB\fItz_dir\fR\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-For the first invocation syntax, pass the zoneinfo directory path name to
-\fBmysql_tzinfo_to_sql\fR
-and send the output into the
-\fBmysql\fR
-program\&. For example:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysql_tzinfo_to_sql /usr/share/zoneinfo | mysql \-u root mysql\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-\fBmysql_tzinfo_to_sql\fR
-reads your system's time zone files and generates SQL statements from them\&.
-\fBmysql\fR
-processes those statements to load the time zone tables\&.
-.PP
-The second syntax causes
-\fBmysql_tzinfo_to_sql\fR
-to load a single time zone file
-\fItz_file\fR
-that corresponds to a time zone name
-\fItz_name\fR:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysql_tzinfo_to_sql \fR\fB\fItz_file\fR\fR\fB \fR\fB\fItz_name\fR\fR\fB | mysql \-u root mysql\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-If your time zone needs to account for leap seconds, invoke
-\fBmysql_tzinfo_to_sql\fR
-using the third syntax, which initializes the leap second information\&.
-\fItz_file\fR
-is the name of your time zone file:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysql_tzinfo_to_sql \-\-leap \fR\fB\fItz_file\fR\fR\fB | mysql \-u root mysql\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Using the \-\-skip\-write\-binlog option prevents writing of changes to the binary log or to other Galera
-cluster members. This can be used with any form of running \fBmysql_tzinfo_to_sql\fR.
-.PP
-After running
-\fBmysql_tzinfo_to_sql\fR, it is best to restart the server so that it does not continue to use any previously cached time zone data\&.
-.SH "COPYRIGHT"
-.br
-.PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2020 MariaDB Foundation
-.PP
-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.
-.PP
-This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/.
-.sp
-.SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-.SH AUTHOR
-MariaDB Foundation (http://www.mariadb.org/).