Commit graph

22 commits

Author SHA1 Message Date
Tingyao Nian
4145618103 MDEV-22023 Update man page NAME section to say MariaDB instead of MySQL
Continue the effort of a previous commit (PR#2114) which changed the man
pages titles from MariaDB to MySQL, to further update the man pages.

Update the man page NAME sections to use mariadb-* instead of mysql* for
MariaDB binaries that are drop-in replacements for MySQL equivalents,
indicating that the commands are actually of the MariaDB version.

Before:
    NAME
        mysql_upgrade - check tables for MariaDB upgrade
    ...

After:
    NAME
        mariadb-upgrade - check tables for MariaDB upgrade (mysql_upgrade
        is now a symlink to mariadb-upgrade)
    ...

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
2022-06-09 09:08:03 +10:00
Tingyao Nian
3dd3dccb8e MDEV-22023 Update man pages titles to say MariaDB instead of MySQL
When reading the man page of e.g. 'mysql' on a system with MariaDB
installed one would actually see the man page of 'mariadb'. However the
man page had no indication of the page being for 'mariadb', which was
confusing for users.

Fix this by updating the man page title lines to use mariadb-* instead
of mysql* for MariaDB binaries that are drop-in replacements for MySQL
equivalents, indicating that the commands are actually of the MariaDB
version.

In long term, all the commands in man pages should be replaced by their
MariaDB counterparts. Update the title lines as a start, and only those
that exist as symlinks to their MariaDB counterparts.

Before:

    man mariadb-upgrade | head -n 1
    MYSQL_UPGRADE(1) ...

After:

    man mariadb-upgrade | head -n 1
    MARIADB-UPGRADE(1) ...

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
2022-05-24 09:21:12 +10:00
Sergei Golubchik
ef781162ff Merge branch '10.4' into 10.5 2022-05-09 22:04:06 +02:00
Sergei Golubchik
a70a1cf3f4 Merge branch '10.3' into 10.4 2022-05-08 23:03:08 +02:00
Oleksandr Byelkin
9614fde1aa Merge branch '10.2' into 10.3 2022-05-03 10:59:54 +02:00
Daniel Black
a7923b37c4 MDEV-28263 mariadb-tzinfo-to-sql binlog fixes
The --skip-write-binlog message was confusing that it only had
an effect if the galera was enabled. There are uses beyond galera
so we apply SET SESSION SQL_LOG_BIN=0 as implied by the option
without being conditional on the wsrep status.

Remove wsrep.mysql_tzinfo_to_sql_symlink{,_skip} tests as they offered
no additional coverage beyond main.mysql_tzinfo_to_sql_symlink as no
server testing was done.

Introduced a variant of the galera.mariadb_tzinfo_to_sql as
galera.mysql_tzinfo_to_sql, which does testing using the mysql client
rather than directly importing into the server via mysqltest.

Update man page and mysql_tzinfo_to_sql to having a --skip-write-binlog
option.

merge notes:
10.4:
- conflicts in tztime.cc can revert to this version of --help text.
- tztime.cc - merge execute immediate @prep1, and leave %s%s trunc_tables, lock_tables
  after that.
10.6:
- Need to remove the not_embedded.inc in mysql_tzinfo_to_sql.test and
  replace it with no_protocol.inc
- leave both mysql_tzinfo_to_sql.test and mariadb_tzinfo_to_sql.sql
  tests.
- sql/tztime.cc - keep entirely 10.6 version.
2022-04-23 14:20:22 +10:00
Ian Gilfillan
9a7d96e832 Update man pages for 10.5 2019-07-15 19:17:46 +04:00
Oleksandr Byelkin
c07325f932 Merge branch '10.3' into 10.4 2019-05-19 20:55:37 +02:00
Marko Mäkelä
be85d3e61b Merge 10.2 into 10.3 2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130 Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
cb248f8806 Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
Vicențiu Ciorbaru
5543b75550 Update FSF Address
* Update wrong zip-code
2019-05-11 21:29:06 +03:00
Ian Gilfillan
8d27f1e4f4 Update 10.4 man pages 2019-03-29 13:32:07 +04:00
=Ian Gilfillan
86b9417035 10.3 man pages 2017-06-06 12:54:06 +04:00
=Ian Gilfillan
c7319cf3d5 10.2 man pages 2017-04-09 14:24:39 -04:00
iangilfillan
b0f3bb2545 man page updates: mysqlbinlog options, mysqlcheck clarification and 10.2 updates 2016-03-22 21:21:49 +02:00
iangilfillan
6ddd775314 10.1 man pages 2015-12-14 23:16:27 +02:00
iangilfillan
50775094cf MDEV-7680: Update man pages 2015-10-09 12:46:54 +02:00
unknown
f7f9227744 Imported MySQL documentation files from ../mysql-5.1.46 2010-04-28 15:06:11 +02:00
unknown
4b69d0ee52 Imported MySQL documentation files from MySQL 5.1.41 source tarball 2009-12-01 08:24:05 +01:00
unknown
36f3cbfdc6 Imported MySQL documentation files from /home/knielsen/devel/maria/mysql-5.1.38 2009-09-16 14:03:18 +02:00
unknown
cc5e283d15 Imported freely distributable documentation from upstream MySQL 5.1.34 source tarball. 2009-05-25 11:59:47 +02:00