Commit graph

55 commits

Author SHA1 Message Date
Marko Mäkelä
d73baa402a Merge 10.11 into 11.0 2024-02-20 12:02:01 +02:00
Marko Mäkelä
691f923906 Merge 10.5 into 10.6 2024-02-13 20:42:59 +02:00
Otto Kekäläinen
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
Sergei Golubchik
c6f0814468 more changes to man page handling
* move them from ManPagesX component to X (works better for plugins),
  but keep ManPagesDevelopment as C/C is using it
* move backup manpages to Backup
* move plugin manpages (s3, rocksdb) to plugins
2023-02-12 12:15:22 +01:00
Sergei Golubchik
951b7ab57b cmake: simplify handling of man pages
and remove unused function INSTALL_MANPAGE
2023-02-12 12:15:21 +01:00
Sergei Golubchik
f6c5b57eb3 man pages: mariadb* are primary pages, mysql* are generated 2023-02-12 12:15:21 +01:00
Marko Mäkelä
c59985fcf5 Merge 10.5 into 10.6 2022-11-30 07:06:41 +02:00
Daniel Black
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
Anel Husakovic
395a033237 MDEV-22552: mytop packaging
`mytop` and `my_print_defaults` for RPM

- Add `mytop` to client package
- Add man page of `my_print_defaults` to client package
- Add dependencies for RPMs
- Remove old comment
- Remove dead link

Reviewed by: serg@mariadb.com
2021-10-25 12:15:49 +02:00
Daniel Black
d1ee7163bc mariadb-tzinfo-to-sql,mariadb-dumpslow as Client components 2021-03-28 12:51:48 +11:00
Anel Husakovic
09202b2e6d Separate client and server components (man/scripts)
cleanups from PR 900:

- Use mariadb names instead of mysql and add secure-installation and
additionally organize man pages.

- Remove obsolete script `/make_binary_distribution`
- Don't build binary `mariadb-install-db` in case of without-server
2021-03-28 12:51:48 +11:00
Anel Husakovic
27decbbfe6 Since PR #1566 my_print_defaults is a client so should be man page 2021-03-28 12:51:48 +11:00
Daniel Black
4cea38431e Remove server man pages from WITHOUT_SERVER 2021-03-28 12:51:48 +11:00
Anel Husakovic
67eeb7770b MDEV-23429: Remove WSREP when using WITHOUT_SERVER
Under WITHOUT_WSREP:

Exclude support files that are server only like
* wsrep.cnf
* wsrep_notify
* log rotate config files
* mysqld_multi

Exclude man pages of server components
2021-03-28 12:51:48 +11:00
Otto Kekäläinen
55c7536a02 Add man page for new command aria_s3_copy
Based on output of 'aria_s3_copy --help'.

Also fix a typo in command help.
2020-07-08 12:24:55 +03:00
Rasmus Johansson
9e1b3af4a4 MDEV-21303 Make executables MariaDB named
To change all executables to have a mariadb name I had to:
- Do name changes in every CMakeLists.txt that produces executables
- CREATE_MARIADB_SYMLINK was removed and GET_SYMLINK added by Wlad to reuse the function in other places also
- The scripts/CMakeLists.txt could make use of GET_SYMLINK instead of introducing redundant code, but I thought I'll leave that for next release
- A lot of changes to debian/.install and debian/.links files due to swapping of real executable and symlink. I did not however change the name of the manpages, so the real name is still mysql there and mariadb are symlinks.
- The Windows part needed a change now when we made the executables mariadb -named. MSI (and ZIP) do not support symlinks and to not break backward compatibility we had to include mysql named binaries also. Done by Wlad
2020-03-21 20:20:29 +01:00
Otto Kekäläinen
8607076545 Add a man page for mytop that is in sources
Related to MDEV-21769.
2020-03-10 07:53:33 +01:00
Otto Kekäläinen
c7c0959c19 Use correct reference in man page links
After the '.so' one is supposed to use the directory name, like we have
correctly in all old man pages:
  mysql_client_test_embedded.1:.so man1/mysql_client_test.1
  mysql_embedded.1:.so man1/mysql.1
  mysqltest_embedded.1:.so man1/mysqltest.1

This change adds the 'man1/' component so the link has the correct format.
Actually using man links is a deprecated practice and using symlinks
would be better, but that can be fixed in a later commit.

From https://www.debian.org/doc/debian-policy/ch-docs.html#manual-pages:
> If one man page needs to be accessible via several names it is better
> to use a symbolic link than the .so feature

Detected via Lintian errors:
  E: mariadb-server-10.5: bad-so-link-within-manual-page usr/share/man/man1/mariadb-show.1.gz
  E: mariadb-client-10.5: bad-so-link-within-manual-page usr/share/man/man1/mariadb-binlog.1.gz
  E: mariadb-client-10.5: bad-so-link-within-manual-page usr/share/man/man1/mariadb-plugin.1.gz

Related to MDEV-21769.
2020-03-10 07:53:33 +01:00
Otto Kekäläinen
0335af745c Add missing man pages for myrocks_hotbackup
Related to MDEV-21769.
2020-03-10 07:53:33 +01:00
Ian Gilfillan
d62766a890 MDEV-21228: mariadb-conv man page 2020-03-04 16:50:17 +01:00
Oleksandr Byelkin
646d1ec83a Merge branch '10.3' into 10.4 2020-02-11 14:40:35 +01:00
Marko Mäkelä
c8bd8d5c64 MDEV-14330: After-merge fix
The merge commit 5ff66fb0b9
accidentally omitted part of
commit 07e34cddb6.
2020-01-31 13:16:11 +02:00
Marko Mäkelä
5ff66fb0b9 Merge 10.2 into 10.3 2020-01-31 11:37:12 +02:00
Marko Mäkelä
2daf3b14fe Merge 10.1 into 10.2 2020-01-31 10:53:56 +02:00
Daniel Black
5271d43648 MDEV-14330 Move mysqltest.1 man page to appropriate test package from server package
Original patch from Daniel Black <daniel@linux.ibm.com>, backported to 10.1.
2020-01-28 19:55:32 +02:00
Vicențiu Ciorbaru
07e34cddb6 MDEV-14330: move tokudb manpages to right packages
Move tokuftdump and tokuft_logprint man pages to storage/tokudb.

The man pages are now part of tokudb-engine cmake component. This change
is mostly for RPM & DEB based packaging generated through CMake & CPack.

Debian upstream already handles this change via the custom scripts in debian/
2020-01-28 18:27:18 +02:00
Sergei Golubchik
306e439c6d MDEV-17592 Create MariaDB named commands/symlinks
post-merge fixes:
* .gitignore
* don't put the keyword COMPONENT into ${COMP} anymore
* don't alias mytop, but do alias mysql_client_test
* don't symlink manpages, use troff aliasing technique instead
  (symlinked manpages break rpm and out-of-source bintar builds)
* move debian to use troff aliased manpages, fix typos in debian files,
  put aliases in the correct packages, add more aliases to match
  rpm/bintar packaging
2019-06-17 12:26:26 +02:00
Rasmus Johansson
24503d5711 MDEV-17592 Create MariaDB named commands/symlinks 2019-06-17 12:26:26 +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
Julius Goryavsky
0e89e90f42 MDEV-17835: Remove wsrep-sst-method=xtrabackup
The second line of changes related to replacing xtrabackup with
mariabackup:

1) All unnecessary references to xtrabackup are removed from
the documentation, from some comments, from the control files
that are used to prepare the packages.

2) Made corrections of the tests from the galera_3nodes suite
that mentioned xtrabackup or the old (associated with xtrabackup)
version of innobackupex.

3) Fixed flaws in the galera_3nodes mtr suite control scripts,
because of which they could not work with mariabackup.

4) Fixed numerous bugs in the SST scripts and in the mtr test
files (galera_3nodes mtr suite) that prevented the use of Galera
with IPv6 addresses.

5) Fixed flaws in tests for rsync and mysqldump (for galera_3nodes
mtr tests suite). These tests were not performed successfully without
these fixes.

https://jira.mariadb.org/browse/MDEV-17835
2019-01-22 13:28:03 +01:00
Sergei Petrunia
186eb2c0e0 Fix BB failure: file INSTALL cannot find ... man/tokuft_logdump.1.
Remove the mismatch betwen list of man pages in CMakeLists.txt and
actual files.
2018-09-01 15:06:16 +03:00
Marko Mäkelä
206528f722 Merge 10.1 into 10.2 2018-08-31 15:10:02 +03:00
Ian Gilfillan
a8bf27c715 MDEV-14927: Missing man pages 2018-08-29 09:57:31 +03:00
Ian Gilfillan
6c588c92a9 MDEV-14927: Missing man pages 2018-08-28 14:12:42 +03:00
Marko Mäkelä
f740d23ce6 Merge 10.1 into 10.2 2017-04-28 12:22:32 +03:00
=Ian Gilfillan
107de652b6 MDEV-11964 my_safe_process, tokuft_logdump stub man pages 2017-04-19 07:08:15 +04:00
Sergei Golubchik
da4d71d10d Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
=Ian Gilfillan
c333cae652 MDEV-11964 Add more stub missing man pages 2017-03-16 15:42:13 +04:00
Sergey Vojtovich
253be36c0f MDEV-7376 - Removal of the tool "mysql_zap" 2015-11-26 11:34:18 +04:00
Sergey Vojtovich
0b5e975cf8 MDEV-8654 - Remove mysqlbug
mysqlbug has been obsolete since MySQL 5.5, and has been removed in MySQL 5.7.
It's also of no use for reporting MariaDB bugs. The script and the associated
man page removed from MariaDB.
2015-11-26 11:34:18 +04:00
Sergei Golubchik
ecbb6d6a0a install new aria* manpages 2014-06-18 14:47:23 +02:00
Sergei Golubchik
759fa19690 don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 and mysqlman.1 2014-06-01 11:23:20 +02:00
Sergei Golubchik
de8cb7a1f3 MDEV-5485 Minor man pages formatting issues
MDEV-6281 Typo in mysql_install_db scripts
and collateral changes:

* remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo)
* for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize
  (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck)
* remove mysqlmanager.8 and references to it
* correct "very long line" error in mysqladmin.1
* simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1
* fix a typo in the help text in mysql_install_db
* aria_chk: say "for Linux on x86_64", like other tools do
  (not "for Linux at x86_64")
* add simple manpages for aria_* utilities
2014-05-30 23:19:26 +02:00
Sergei Golubchik
04aeaaa04f MDEV-4006 mysql_plugin.1 is removed from source which is not necessary
Add mysql_plugin.1 from mysql-5.5.30.tar.gz
2013-06-14 14:04:58 +02:00
Sergei Golubchik
9ed96f5f86 MDEV-286 mytop is not installed in 5.5
include mytop in bintars, rpms, and debs.
install mysqlbug.1 too.
2012-08-13 09:21:47 +02:00
Sergei Golubchik
ec586f529c Building RPMs with CPack
configure with cmake -DRPM=distro
2012-05-22 11:04:32 +02:00
Joerg Bruehe
4e26afa01b Exclude NDB man pages from a source tarball,
these sources don't have any current NDB.

man/CMakeLists.txt:
  This will need to be modified as soon as NDB is added
  to the 5.5 sources,
  then the man page exclusion should be controlled
  by the build option also governing NDB use.
2011-10-04 12:28:30 +02:00