Kristian Nielsen
a090a3c571
MDEV-33239: mysqlbinlog always stops at timestamp 0xffffffff
...
Do not use the magic value 0xffffffff as meaning "no --stop-datetime option
specified", as this is a valid timestamp value. Use an explicit boolean flag
instead.
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
2024-12-17 17:54:17 +01:00
Marko Mäkelä
33907f9ec6
Merge 11.4 into 11.7
2024-12-02 17:51:17 +02:00
Marko Mäkelä
2719cc4925
Merge 10.11 into 11.4
2024-12-02 11:35:34 +02:00
Marko Mäkelä
3d23adb766
Merge 10.6 into 10.11
2024-11-29 13:43:17 +02:00
Marko Mäkelä
7d4077cc11
Merge 10.5 into 10.6
2024-11-29 12:37:46 +02:00
Alexander Barkov
225c17d35c
MDEV-34090 Client allows to set character set to utf32 and crashes on the next command
...
Disallowing character sets with mbminlen>1 in the client.
2024-11-26 13:57:55 +04:00
Brandon Nesterenko
840fe316d4
MDEV-34348: my_hash_get_key fixes
...
Partial commit of the greater MDEV-34348 scope.
MDEV-34348: MariaDB is violating clang-16 -Wcast-function-type-strict
Change the type of my_hash_get_key to:
1) Return const
2) Change the context parameter to be const void*
Also fix casting in hash adjacent areas.
Reviewed By:
============
Marko Mäkelä <marko.makela@mariadb.com>
2024-11-23 08:14:22 -07:00
Brandon Nesterenko
dbfee9fc2b
MDEV-34348: Consolidate cmp function declarations
...
Partial commit of the greater MDEV-34348 scope.
MDEV-34348: MariaDB is violating clang-16 -Wcast-function-type-strict
The functions queue_compare, qsort2_cmp, and qsort_cmp2
all had similar interfaces, and were used interchangable
and unsafely cast to one another.
This patch consolidates the functions all into the
qsort_cmp2 interface.
Reviewed By:
============
Marko Mäkelä <marko.makela@mariadb.com>
2024-11-23 08:14:22 -07:00
ParadoxV5
cf2d49ddcf
Extract some of #3360 fixes to 10.5.x
...
That PR uncovered countless issues on `my_snprintf` uses.
This commit backports a squashed subset of their fixes.
2024-11-21 22:43:56 +11:00
Oleksandr Byelkin
b12ff287ec
Merge branch '11.6' into 11.7
2024-11-10 19:22:21 +01:00
Oleksandr Byelkin
9e1fb104a3
MariaDB 11.4.4 release
...
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmck77AACgkQ8WVvJMdM
0dgccQ/+Lls8fWt4D+gMPP7x+drJSO/IE/gZFt3ugbWF+/p3B2xXAs5AAE83wxEh
QSbp4DCkb/9PnuakhLmzg0lFbxMUlh4rsJ1YyiuLB2J+YgKbAc36eQQf+rtYSipd
DT5uRk36c9wOcOXo/mMv4APEvpPXBIBdIL4VvpKFbIOE7xT24Sp767zWXdXqrB1f
JgOQdM2ct+bvSPC55oZ5p1kqyxwvd6K6+3RB3CIpwW9zrVSLg7enT3maLjj/761s
jvlRae+Cv+r+Hit9XpmEH6n2FYVgIJ3o3WhdAHwN0kxKabXYTg7OCB7QxDZiUHI9
C/5goKmKaPB1PCQyuTQyLSyyK9a8nPfgn6tqw/p/ZKDQhKT9sWJv/5bSWecrVndx
LLYifSTrFC/eXLzgPvCnNv/U8SjsZaAdMIKS681+qDJ0P5abghUIlGnMYTjYXuX1
1B6Vrr0bdrQ3V1CLB3tpkRjpUvicrsabtuAUAP65QnEG2G9UJXklOer+DE291Gsl
f1I0o6C1zVGAOkUUD3QEYaHD8w7hlvyfKme5oXKUm3DOjaAar5UUKLdr6prxRZL4
ebhmGEy42Mf8fBYoeohIxmxgvv6h2Xd9xCukgPp8hFpqJGw8abg7JNZTTKH4h2IY
J51RpD10h4eoi6WRn3opEcjexTGvZ+xNR7yYO5WxWw6VIre9IUA=
=s+WW
-----END PGP SIGNATURE-----
Merge tag '11.4' into 11.6
MariaDB 11.4.4 release
2024-11-08 07:17:00 +01:00
Sergei Golubchik
d046aca0c7
cleanup: CREATE_TYPELIB_FOR() helper
2024-11-05 14:00:47 -08:00
Oleksandr Byelkin
c770bce898
Merge branch '11.2' into 11.4
2024-10-30 15:11:17 +01:00
Oleksandr Byelkin
69d033d165
Merge branch '10.11' into 11.2
2024-10-29 16:42:46 +01:00
Oleksandr Byelkin
3d0fb15028
Merge branch '10.6' into 10.11
2024-10-29 15:24:38 +01:00
Oleksandr Byelkin
f00711bba2
Merge branch '10.5' into 10.6
2024-10-29 14:20:03 +01:00
Marko Mäkelä
ebefef658e
Merge 10.11 into 11.2
2024-10-18 11:32:22 +03:00
Sergei Golubchik
973e641c32
MDEV-34318 post-merge fix
2024-10-17 11:24:42 +02:00
Sergei Golubchik
7842cab8c0
MDEV-34318 post-merge fix
2024-10-17 10:08:24 +02:00
Monty
8b057fee62
Fixed core dump in mysqltest in move-file when using wrong paths
2024-10-16 17:24:46 +03:00
Yuchen Pei
35cebfdc51
MDEV-15696 Implement SHOW CREATE SERVER
...
One change is that if the port is not supplied or out of bound, the
old behaviour is to print 3306. The new behaviour is to not print
it (if not supplied) or the out of bound value.
2024-10-15 10:50:23 +11:00
Oleksandr Byelkin
1d0e94c55f
Merge branch '10.5' into 10.6
2024-10-09 08:38:48 +02:00
Ocean Li
eedbb901e5
[MDEV-14978] Client programs to use $MARIADB_HOST consistently
...
Only `mysql` client program was using $MYSQL_HOST as the default host.
Add the same feature in most other client programs but using
$MARIADB_HOST instead.
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-10-04 06:44:39 +01:00
Yuchen Pei
e9c999caf4
MDEV-34915 Sort output of session track system variable in mysqltest
...
Updated the output format too.
Before:
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
-- autocommit
-- ON
-- time_zone
-- SYSTEM
-- character_set_client
-- latin1
-- character_set_connection
-- latin1
-- redirect_url
--
After:
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
-- autocommit: ON
-- character_set_client: latin1
-- character_set_connection: latin1
-- redirect_url:
-- time_zone: SYSTEM
2024-10-04 10:32:02 +10:00
Marko Mäkelä
43465352b9
Merge 11.4 into 11.6
2024-10-03 16:09:56 +03:00
Marko Mäkelä
b53b81e937
Merge 11.2 into 11.4
2024-10-03 14:32:14 +03:00
Marko Mäkelä
12a91b57e2
Merge 10.11 into 11.2
2024-10-03 13:24:43 +03:00
Marko Mäkelä
63913ce5af
Merge 10.6 into 10.11
2024-10-03 10:55:08 +03:00
Marko Mäkelä
7e0afb1c73
Merge 10.5 into 10.6
2024-10-03 09:31:39 +03:00
Yuchen Pei
ba7088d462
Merge '11.4' into 11.6
2024-10-03 15:59:20 +10:00
ParadoxV5
d8d80bd503
Fix a couple of my_snprintf arg mismatches
...
This commit backports two fixes from #3360’s vast discovery.
2024-10-01 09:53:13 +01:00
Lena Startseva
ab569524dc
MDEV-31005: Make working cursor-protocol
...
Added ability to disable/enable (--disable_cursor_protocol/
--enable_cursor_protocol) cursor-protocol in tests. If
"--disable_cursor_protocol" is used then ps-protocol is also
disabled. With cursor-protocol prepare statement is executed
only once. For "--cursor-protocol" added filter for queries:
it is executed only for "SELECT" queries.
2024-09-18 18:39:26 +07:00
Marko Mäkelä
7ea9e1358f
Merge 11.2 into 11.4
2024-09-18 08:07:22 +03:00
Marko Mäkelä
e782e416ac
Merge 10.11 into 11.2
2024-09-18 07:38:49 +03:00
Yuchen Pei
1f7f406b7b
Merge branch '11.2' into 11.4
2024-09-18 11:27:53 +10:00
Yuchen Pei
ff88633b9c
Merge branch '10.11' into 11.2
2024-09-18 10:45:26 +10:00
Julius Goryavsky
f176248d4b
Merge branch '10.6' into '10.11'
2024-09-17 06:23:10 +02:00
Julius Goryavsky
80fff4c6b1
Merge branch '10.5' into '10.6'
2024-09-16 16:39:59 +02:00
Vladislav Vaintroub
45d99ea105
Workaround MDEV-34890
2024-09-12 17:36:54 +02:00
Vladislav Vaintroub
7fd73f9ac9
mariadb-import, multithreading - improve error handling
...
In case of error in one connection, issue KILL CONNECTION for all others,
or server will still do LOAD FILE, possibly for hours, after we exited.
2024-09-12 17:36:44 +02:00
Dave Gosselin
95885261f0
MDEV-27037 mysqlbinlog emits a warning when reaching EOF before stop-datetime
...
Emit a warning in the event that we finished processing input files
before reaching the boundary indicated by --stop-datetime.
2024-09-12 08:43:29 -04:00
Dave Gosselin
242b67f1de
MDEV-27037 mysqlbinlog emits a warning when reaching EOF before stop-condition
...
Emit a warning in the event that we finished processing input files
before reaching the boundary indicated by --stop-position.
2024-09-12 08:43:29 -04:00
Yuchen Pei
a8c5717223
Merge branch '10.6' into 10.11
2024-09-12 10:44:13 +10:00
Monty
fafcd24e02
Fixed compiler warning from strncpy in mysql_plugin.c
2024-09-11 16:15:37 +03:00
Sergei Petrunia
2c3b298337
Merge 11.2 into 11.4
2024-09-09 14:40:02 +03:00
Sergei Petrunia
abd98336d2
Merge 10.11 -> 11.2
2024-09-09 13:50:38 +03:00
Vladislav Vaintroub
19cea73834
Cleanup - make sure all members of table_load_params are initialized
...
Alexey Botchkov complains there are problems with empty curly brackets
initializer in old-ish gcc(4.9)
Can't verify, but making all members are initialized by
default constructor is easy enough.
2024-09-05 13:24:22 +02:00
Sergei Golubchik
b2ebe1cb7b
MDEV-33091 pcre2 headers aren't found on Solaris
...
use pkg-config to find pcre2, if possible
rename PCRE_INCLUDES to use PKG_CHECK_MODULES naming, PCRE_INCLUDE_DIRS
2024-09-05 12:14:06 +10:00
Marko Mäkelä
a5b80531fb
Merge 11.4 into 11.6
2024-09-04 10:38:25 +03:00
Julius Goryavsky
d058be62b8
Merge branch '10.6' into '10.11'
2024-09-02 03:49:03 +02:00
