Commit Graph

336 Commits

Author SHA1 Message Date
0fe39d368a Merge branch '10.6' into 10.11 2024-07-22 15:14:50 +02:00
f071b7620b Merge branch '10.5' into 10.6 2024-07-16 15:54:22 +08:00
3c508d4c71 MDEV-34581: Fix flashback mode man pages 2024-07-14 10:38:35 +10:00
b81d717387 Merge 10.6 into 10.11 2024-06-11 12:50:10 +03:00
a687cf8661 Merge 10.5 into 10.6 2024-06-07 10:03:51 +03:00
e9f4b87e53 MDEV-33919: Remove less standard format directive an-trap
Few man pages have less standard format directive:
.it 1 an-trap which specifying a formatting instruction
related to indentation (adds tab in man page in this)

There is no traces what an-trap should do and removing
it does not affect rendering of man page
2024-06-05 09:53:52 +10:00
64cce8d5bf Merge 10.6 into 10.11 2024-02-14 16:12:53 +02:00
691f923906 Merge 10.5 into 10.6 2024-02-13 20:42:59 +02:00
d64ade302e Properly introduce wsrep_sst_backup script in project packaging
The script wsrep_sst_backup was introduced on MariaDB 10.3 in commit
9b2fa2a. The new script was automatically included in RPM packages but not
in Debian packages (which started to fail on warning about stray file).

Include wsrep_sst_backup in the mariadb-server-10.5+ package, and also
include a stub man page so that packaging of a new script is complete.

Related:
https://galeracluster.com/documentation/html_docs_20210213-1355-master/documentation/backup-cluster.html

This commit was originally submitted in May 2022 in
https://github.com/MariaDB/server/pull/2129 but upstream indicated only
in May 2023 that it might get merged, thus this is for a later release.

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.
2024-02-13 12:03:55 +00:00
7bbc545f38 Update my_print_defaults man page with mariadbd option
The `--mariadbd` option was added in 10.11.3, this commit adds the option
to the man page as well.
2024-02-13 10:21:13 +11:00
fecd78b837 Merge branch '10.10' into 10.11 2023-11-08 16:46:47 +01:00
04d9a46c41 Merge branch '10.6' into 10.10 2023-11-08 16:23:30 +01:00
b83c379420 Merge branch '10.5' into 10.6 2023-11-08 15:57:05 +01:00
6cfd2ba397 Merge branch '10.4' into 10.5 2023-11-08 12:59:00 +01:00
358209dab4 Update innochecksum man page 2023-10-13 10:36:26 +11:00
6f955c262a Fix syntax FB/FR -> fB/fR and bump version to 10.11 in man pages
For the sake of readable diffs this change is done separately from the
previous commit and it changes all man page headers to:

- Use correct syntax \fB and \fR to make titles bold instead of previous
  capitalized version that had no effect
- Omit unnecessary \&. syntax, works fine without it
- Bump version to 10.11

Ideally the version would automatically be inherited from the
build/release, but for now at least update it manually to match what is
in the VERSION file of this release branch.

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.
2023-07-24 13:37:55 +10:00
2972fbc771 Fix syntax error in man page headers
Add \FR on lines that start with \FB as it is likely useful, but not
stricly necessary. However if there is just \ the line won't render at
all as happened in example below from 'man mysql-test-test.pl.1':

  AUTHOR
         MariaDB Foundation (http://www.mariadb.org/).
                                                 MYSQL-TEST-RUN()
  ->
  AUTHOR
         MariaDB Foundation (http://www.mariadb.org/).
  MariaDB 10.11        15 May 2020              MYSQL-TEST-RUN(1)

Also use full command name instead of truncated ones.

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.
2023-07-24 13:37:55 +10:00
e36b648077 MDEV-23789: Fix unnecessary acute accents in man pages
The man pages has several places where \' is intended to escape the single
quote and just print '. However, in reality this will print an ` (acute
accent). Fix this by removing excess backslashes. Also remove some excess
& in front of dots, such escaping is also unnecessary.

Also join several lines to avoid lone words in quotes to be read by groff
as macros when they are just text.

In a table (t{}) the content must be on new lines separately, so groff
will try to read them as macros too, so use \(aq that renders to '
(single quote).

This error was originally detected by Lintian:
https://lintian.debian.org/tags/acute-accent-in-manual-page

Example of man page sections before and after:

  Make a backup of each table´s data file using the name tbl_name.OLD.
  ->
  Make a backup of each table's data file using the name tbl_name.OLD.

  A typical debug_options string is ´d:t:o,file_name´.
  The default is ´d:t:o,/tmp/my_print_defaults.trace´.
  ->
  A typical debug_options string is 'd:t:o,file_name'.
  The default is 'd:t:o,/tmp/my_print_defaults.trace'.

  shell> mysql --xml -uroot -e "SHOW VARIABLES LIKE ´version%´"
  <?xml version="1.0"?>
  <resultset statement="SHOW VARIABLES LIKE ´version%´" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  ->
  shell> mysql --xml -uroot -e "SHOW VARIABLES LIKE 'version%'"
  <?xml version="1.0"?>
  <resultset statement="SHOW VARIABLES LIKE 'version%'" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

This command was used to validate no man pages have syntax errors:

  for x in *.?
  do
    echo "##### $x #####"
    LC_ALL=C.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z $x >/dev/null
  done

The man pages are not perfect after this, there are still a lot of
suboptimal syntax, but this helps towards better man pages.

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.
2023-07-24 13:37:55 +10:00
656c2e18b1 Merge 10.10 into 10.11 2023-04-14 13:08:28 +03:00
a009280e60 Merge 10.9 into 10.10 2023-04-14 12:24:14 +03:00
44281b88f3 Merge 10.8 into 10.9 2023-04-14 11:32:36 +03:00
1d1e0ab2cc Merge 10.6 into 10.8 2023-04-12 15:50:08 +03:00
5bada1246d Merge 10.5 into 10.6 2023-04-11 16:15:19 +03:00
ac5a534a4c Merge remote-tracking branch '10.4' into 10.5 2023-03-31 21:32:41 +02:00
d575b07c86 MDEV-24453 Added support for a 5th --verbose parameter in mariadb-upgrade to show mysql results for mysql_fix_privilege_tables 2023-03-27 16:29:14 +02:00
b81b194393 Merge 10.10 into 10.11 2022-11-30 12:59:57 +02:00
a27bfb2a87 Merge 10.9 into 10.10 2022-11-30 12:34:45 +02:00
3ba8828396 Merge 10.8 into 10.9 2022-11-30 12:21:10 +02:00
0751bfbcaf Merge 10.7 into 10.8 2022-11-30 12:12:07 +02:00
b7ae4d442a Merge 10.6 into 10.7 2022-11-30 12:09:01 +02:00
c59985fcf5 Merge 10.5 into 10.6 2022-11-30 07:06:41 +02:00
7b44d0ba57 MDEV-23230 wsrep files installed when built without WSREP (#2334)
Prevent wsrep files from being installed if WITH_WSREP=OFF.

Reviewed by Daniel Black
Additionally excluded #include wsrep files and galera* files
along with galera/wsrep tests.

mysql-test/include/have_wsrep.inc remainds as its used by
a few isolated tests.

Co-authored-by: Chris Ross <cross2@cisco.com>
2022-11-28 18:21:03 +00:00
7933367a27 Merge 10.10 into 10.11 2022-11-21 10:51:10 +02:00
bebe193979 Merge 10.9 into 10.10 2022-11-21 10:32:08 +02:00
91a7e9eb1e Merge 10.8 into 10.9 2022-11-10 09:50:30 +02:00
fe9412dbc9 Merge 10.7 into 10.8 2022-11-09 13:05:44 +02:00
27eaa963ff Merge 10.6 into 10.7 2022-11-09 12:27:54 +02:00
2ac1edb1c3 Merge 10.5 into 10.6 2022-11-08 17:37:22 +02:00
a732d5e2ba Merge 10.4 into 10.5 2022-11-08 17:01:28 +02:00
93b4f84ab2 Merge 10.3 into 10.4 2022-11-08 16:04:01 +02:00
e7be2d3142 Fix duplicate entry in mysqld_safe man page 2022-11-03 12:25:38 +11:00
f45f60636f MDEV-22200: maridb-dump add --header option
This adds a header row in txt files exported by mariadb-dump --tab

Reviewed by: Daniel Black and Dan Lenski
2022-10-26 15:01:04 +11:00
8759967d1c MDEV-29625 Some clients/scripts refer to old slow log variables 2022-10-04 12:28:04 +02:00
22d455612b Merge branch '10.8' into 10.9 2022-08-09 09:57:13 +02:00
75d631f333 Merge branch '10.7' into 10.8 2022-08-09 09:52:15 +02:00
4c18f68d59 Merge branch '10.9' into 10.10 2022-08-09 09:47:16 +02:00
564d374704 Merge branch '10.8' into 10.9 2022-08-08 17:17:45 +02:00
50b270525a Merge branch '10.7' into 10.8 2022-08-08 17:15:13 +02:00
1d48041982 Merge branch '10.6' into 10.7 2022-08-08 17:12:32 +02:00
ee620a7416 Merge branch '10.5' into 10.6 2022-08-04 16:58:42 +02:00