454 Commits

Author SHA1 Message Date
bb1d88b6dc Merge 11.4 into 11.8 2025-04-02 14:07:01 +03:00
28425cc276 Merge branch '10.11' into 11.4 2025-03-31 22:28:52 +02:00
730dcf7e6d Merge branch '10.6' into 10.11 2025-03-31 17:57:43 +02:00
51cc77f212 Merge branch '10.5' into 10.6 2025-03-31 12:12:50 +02:00
04771ff6b1 MDEV-28209 New mysql_upgrade message on minor-only upgrades is confusing 2025-03-27 21:25:05 +01:00
5100773ab9 Tag my_vsnprintf.c with ATTRIBUTE_FORMAT
[Breaking]
Good news:
GCC now checks your `my_snprintf` (direct) calls (`-Wformat` was on);
Bad news:
The build process no longer lets your incorrect
formats/arguments sneak past (`-Werror` was also on).

As such, this commit also migrates all direct `my_snprintf` calls from
the old specifiers to MDEV-21978’s new `-Wformat`-compatible suffixes.
The next commits will cover non-direct calls to `my_snprintf`.
(I call them “`my_snprintf` descendants”.)

This commit does not update the ABI records because
there’re more ABI “changes” to come – half a dozen
`include/mysql/plugin_*.h.pp`s are now missing the new `__attribute__`s.
2025-02-11 20:32:55 +01:00
d34289a3e2 Merge 10.11 into 11.1 2024-06-17 09:21:50 +03:00
346a0c1402 Merge 10.6 into 10.11 2024-06-17 09:08:07 +03:00
e60acae655 Merge 10.5 into 10.6 2024-06-17 08:40:07 +03:00
fef32fd9ad MDEV-34406 Enhance mariadb_upgrade to print failing query in case of error
To make this possible, it was also necessary to enhance the mariadb
client with the option --print-query-on-error.
This option can also be very useful when running a batch of queries
through the mariadb client and one wants to find out where things goes
wrong.

TODO: It would be good to enhance mariadb_upgrade to not call the mariadb
client for executing queries but instead do this internally.  This
would have made this patch much easier!

Reviewed by: Sergei Golubchik <serg@mariadb.com>
2024-06-16 10:51:33 +03:00
f0a5412037 Merge branch '11.0' into 11.1 2024-05-13 09:52:30 +02:00
f9807aadef Merge branch '10.11' into 11.0 2024-05-12 12:18:28 +02:00
a6b2f820e0 Merge branch '10.6' into 10.11 2024-05-10 20:02:18 +02:00
7b53672c63 Merge branch '10.5' into 10.6 2024-05-08 20:06:00 +02:00
98b157fdee cleanup: unused OPT_xxx and client_priv.h 2024-05-06 17:16:10 +02:00
d470ed6857 Merge 11.0 into 11.1 2023-12-20 16:11:45 +02:00
590036b021 Merge 10.11 into 11.0 2023-12-20 16:05:20 +02:00
2b99e5f7ef Merge 10.6 into 10.11 2023-12-20 15:58:36 +02:00
2b01e5103d Merge 10.5 into 10.6 2023-12-19 18:41:42 +02:00
12995559f9 Merge 10.4 into 10.5 2023-12-19 18:30:58 +02:00
be694384d4 MDEV-31925 Fix for File Leak in mysql_upgrade with --check-if-upgrade-is-needed Option
This commit addresses the file leakage problem encountered with the mysql_upgrade --check-if-upgrade-is-needed command.
2023-12-19 19:30:02 +11:00
edc478847b Merge 11.0 into 11.1 2023-11-24 15:58:35 +02:00
5b6134b040 Merge 10.11 into 11.0 2023-11-24 11:20:56 +02:00
90d968dab9 Merge 10.6 into 10.11 2023-11-20 10:08:19 +02:00
52ca2e65af Merge 10.5 into 10.6 2023-11-15 14:10:21 +02:00
4eb8aeee8e MDEV-32462: mysql_upgrade -s still checks for non system tables
- Prevent opening of any user tables in case `upgrade-system-table`
option is used.
- Still there may be uninstalled data types in `mysql` system table so
allow it to perform.
- Closes PR #2790
- Reviewer: <daniel@mariadb.org>, <vicentiu@mariadb.org>
2023-10-30 21:33:06 +01:00
f5fae75652 Merge branch '11.0' into 11.1 2023-08-09 08:25:14 +02:00
51f9d62005 Merge branch '10.11' into 11.0 2023-08-09 07:53:48 +02:00
34a8e78581 Merge branch '10.6' into 10.9 2023-08-04 08:01:06 +02:00
6bf8483cac Merge branch '10.5' into 10.6 2023-08-01 15:08:52 +02:00
f52954ef42 Merge commit '10.4' into 10.5 2023-07-20 11:54:52 +02:00
8290a46d50 Merge 11.0 into 11.1 2023-06-28 09:38:59 +03:00
1fe4bcbe05 Merge 10.11 into 11.0 2023-06-28 09:19:19 +03:00
eb6b521f1b Merge 10.6 into 10.9 2023-06-27 13:48:46 +03:00
d671fec431 Fixed some errors & warnings when running mariadb-upgrade on MySQL instance
- Moved view checks after privilege tables are fixed. This is to avoid
  warnings about wrongly defined mysql.proc when checking views.
- Don't use stat tables before they have been fixed.
- Don't run mysql_fix_view() if 'FOR MYSQL' is used if the view is
  already a MariaDB view.
- Added 'FOR UPGRADE' as an option for 'REPAIR VIEW' to be able to
  detect if the REPAIR command comes from mariadb_upgrade. In this
  case we get a warning, instead of an error, if a definer of a view
  does not exists.
2023-06-25 16:15:08 +03:00
d32fc5b8e0 MDEV-31461 mariadb SIGSEGV when built with -DCLIENT_PLUGIN_DIALOG=STATIC 2023-06-19 12:12:21 +02:00
cbabb95915 Merge branch '11.0' into 11.1 2023-06-05 20:15:15 +02:00
c7fe8e51de Merge 10.11 into 11.0 2023-04-17 16:50:01 +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
320a4b52c9 MDEV-30205 Move /usr/share/mysql to /usr/share/mariadb
These are mainly internal files so is a low impact change.

The few scripts/mysql*sql where renames to mariadb_* prefix
on the name.

mysql-test renamed to mariadb-test in the final packages
2023-04-11 07:59:02 +10: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
4878891193 MDBF-534: Coverity scan: fix client folder
---------------------------------
File: `mysqladmin`
---------------------------------
- Coverity (PRINTF_ARGS):
https://scan5.scan.coverity.com/reports.htm#v58936/p10357/fileInstanceId=231728412&defectInstanceId=53073308&mergedDefectId=1520228&eventId=53073308-0

`mysql_upgrade` - extra argument to printf format specifiera

- Coverity (TAINTED_SCALAR) - FAlSE POSITIVE:
https://scan5.scan.coverity.com/reports.htm#v58936/p10357/fileInstanceId=231728412&defectInstanceId=53072897&mergedDefectId=1519349
2023-02-17 13:43:43 +00:00
3622644836 MDEV-30498 Rename mysql_upgrade state file to mariadb_upgrade
Renames the upgrade state file, and ensures the old
file is properly removed when `mariadb-upgrade` tool is executed.

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-02-07 07:29:04 +00:00
eb26bf6e09 unify client/tool version string
it should now always be

/path/to/exe Ver <tool version> Distrib <server version> for <OS> (<ARCH>)

in all tools and clients
2023-01-19 12:39:28 +01:00
b6ebadaa66 Merge branch '10.6' into 10.7 2022-10-04 07:41:35 +02:00
194cc36805 Merge branch '10.5' into 10.6 2022-09-30 12:29:24 +02:00
620d520d68 MDEV-29614 mariadb-upgrade calls mysql and mysql-check (#2279)
rather than mariadb/mariadb-check
2022-09-28 15:20:23 +01:00
65a963f755 Merge branch '10.6' into 10.7 2022-08-10 13:12:32 +02:00