Georg Richter
d0ed305960
Fix previous merge
2025-01-06 12:07:10 +01:00
Georg Richter
b6eff15590
Merge branch '3.1' into 3.3-travis
2025-01-06 10:38:35 +01:00
Georg Richter
10893d7945
cmake fix: Use $ENV{} instead of ENV{}
2024-12-23 07:13:40 +01:00
Georg Richter
b4ac6e6acc
Merge branch '3.1' into 3.3-travis
2024-12-22 11:31:23 +01:00
Georg Richter
a9ed07c695
Travis and build fixes:
...
- Don't copy Connector/C directory into server submodule,
instead update the submodule (PR or commit)
- Fixed Travis windows environment variables
- Use DROP and CREATE instead of CREATE OR REPLACE to make
MySQL happy.
- Disable several TLS tests for MaxScale
2024-12-22 11:06:30 +01:00
Georg Richter
12a7054194
Partial revert of 1a2ed3f67a
...
Since Item_result enumerations are also used by MariaDB server, we
moved them back to mariadb_com.h.
Item_result is not used in Connector/C 3.3 and above for replication
api.
2024-12-22 11:00:12 +01:00
Georg Richter
486a07c824
Test fix:
...
use mysql_real_connect instead of my_test_connect for unix_socket
test to reduce diagnostic output from my_test_connect function.
2024-12-21 08:33:15 +01:00
Georg Richter
80a7fa5cee
Test fix for charsets
...
Skipped 2 tests if running against MariaDB 11.4 or newer version.
2024-12-20 14:35:37 +01:00
Georg Richter
5485acd470
Test case fix:
...
Don't connect with anonymous user, since mtr doesn't run with
unix_sockets by default.
2024-12-20 12:02:35 +01:00
Georg Richter
30bd00796e
Travis: Include unit test suite
2024-12-20 06:17:01 +01:00
Georg Richter
32addee3fc
Test case fix:
...
Don't connect with anonymous user, since mtr doesn't run with
unix_sockets by default.
2024-12-20 06:14:02 +01:00
Georg Richter
2fd03c8242
coverity fix: remove whitespace
2024-12-19 11:47:18 +01:00
Georg Richter
19495f1cdd
Fix logical error in parse_connection_string
...
removed dead code (in_curly_brace is always true)
2024-12-19 11:14:19 +01:00
Georg Richter
13c8815604
Fix test CONC-702
...
Drop procedure p2 to avoid failing mtr test
2024-12-17 19:04:08 +01:00
Georg Richter
dc8bc987d4
Test fix for character test conc223:
...
Show the missing collation IDs instead
of the total number of missing collations.
Patch submitted by Michael "Monty" Widenius.
2024-12-16 13:50:00 +01:00
Georg Richter
d90e911ef6
Merge branch '3.1' into 3.3
2024-12-12 10:43:07 +01:00
Georg Richter
6bf9557d00
CONC-709: Fix crash when sending NULL_LENGTH in field description
...
Instead of checking the lengths given by two offsets, we have to
check if NULL_LENGTH was sent before (and return an error).
2024-12-12 10:40:30 +01:00
Georg Richter
294b933606
CONC-708: buffer over-/underflow in ma_read_ok_packet
...
Added a helper function ma_check_buffer_bounaaries which
checks possible boffer over- or underflows when processing
ok packet.^
2024-12-10 08:01:37 +01:00
Georg Richter
16e5b88bab
MYSQL_OPT_ZSTD_COMPRESSION_LEVEL fixes:
...
Follow up for commit e633858c9e
2024-12-10 05:18:08 +01:00
Georg Richter
e633858c9e
Merge pull request #261 from markus456/3.3-zstd-compression-level
...
Add configurable zstd compression level
2024-12-09 22:22:08 +01:00
Georg Richter
136d295d02
Merge branch '3.1' into 3.3
2024-12-09 19:32:13 +01:00
Georg Richter
554893c269
CONC-711: Ubsan and ASAN fixes
...
- fixed write functions in my_auth.c
- fixed misalignment error when obtaining data via
option MARIADB_OPT_USERDATA (mysql_get_optionv).
2024-12-09 19:28:10 +01:00
Georg Richter
1c8b73c11f
Merge branch '3.1' into 3.3
2024-12-09 10:02:52 +01:00
Georg Richter
98ae464bf9
CONC-617: Update GnuTLS minimum required version to 3.4.2
...
GNUTLS_NO_SIGNAL is not supported in GnuTLS versions
< 3.4.2, so the minimum required version has been increased
from 3.3.24 to 3.4.2
2024-12-09 09:54:13 +01:00
Georg Richter
6d28fe89af
Merge branch '3.1' into 3.3
2024-12-08 11:50:43 +01:00
Georg Richter
af44fc5c5e
CONC-748: Allow to set TLSv1.3 ciphers in GnuTLS
...
- Added TLSv1.3 ciphers to cipher map.
- Fixed retrieval of cipher suite: Since gnutls_cipher_suite_get_name
supports only TLSv1.2 (and lower) cipher suites, we have to call
gnutls_ciphersuite_get() (requires GnuTLS 3.7.4 or newer).
2024-12-08 11:27:32 +01:00
Georg Richter
232e81f021
Add test case for CONC-176
2024-12-04 10:13:21 +01:00
Georg Richter
c7a46ed60c
Merge pull request #259 from markus456/3.3
...
CONC-738: Fix zstd compression level bytes
2024-12-02 13:54:33 +01:00
Georg Richter
fa987a3bc4
Added test case for CONC-163
2024-12-02 06:36:56 +01:00
Georg Richter
78e56a7fd3
Fixed replication build
...
With fix for CONC-710 (Remove UDF declarations) in 3.1 branch,
we also removed the variable types, which are also used by
the binary log api.
The enumeration for variable types were now added back in
mariadb_rpl.h
2024-11-27 16:03:45 +01:00
Georg Richter
b522ed1a43
Merge branch '3.1' into 3.3
2024-11-27 15:58:51 +01:00
Georg Richter
a13f65c4c6
Fix CMake deprecation warning
...
Minimum required CMake version is now 3.5.1
2024-11-27 07:52:29 +01:00
Georg Richter
bdc66d6b8f
Fix for CONC-703:
...
If connect failed and no error was set (apparently this happens
sometimes on Mac) we now set error to CR_SERVER_LOST.
2024-11-27 07:48:27 +01:00
Georg Richter
1a2ed3f67a
CONC-710: Remove UDF declarations
...
Removed UDF declarations from mariadb_com.h
2024-11-20 14:42:04 +01:00
Georg Richter
662a966056
CONC-702: Fix statement status
...
If a resultset in binary protpcpl doesn't contain data
(fields equal zero) and there are no more pending
result sets we need to change the statement status to
FETCH_DONE, otherwise it will be impossible to execute
other commands until the statement was closed.
2024-11-18 07:15:42 +01:00
Georg Richter
55e3b63c34
CONPY-739: prepared statement support AUTO_SEC_PART_DIGITS
...
FROM_UNIXTIME() function always returns AUTO_SEC_PART_DIGITS
(value=39). In case the microsecond value was set in MYSQL_TIME,
the decimal part should be SEC_PART_DIGITS (=6).
2024-11-15 17:41:23 +01:00
Daniel Bartholomew
581855782f
bump the VERSION
2024-11-12 13:18:19 -05:00
Daniel Bartholomew
225e1d6cfc
bump the VERSION
2024-11-12 13:15:53 -05:00
Oleksandr Byelkin
ad9cc27460
Bump version number -> 3.3.13
2024-11-08 06:58:54 +01:00
Vladislav Vaintroub
76564675fc
Merge 3.1 into 3.3
2024-11-07 08:47:12 +01:00
Vladislav Vaintroub
b1f1267805
CONC-527 post-fix.
...
Add fallback if CryptAcquireContext fails with ERROR_ACCESS_DENIED,
as seen in Jenkins CI.
The fallback, also suggested by https://stackoverflow.com/a/14053718/547065 ,
is to retry with machine-wide key container, if user-specific fails.
2024-11-07 08:30:59 +01:00
Markus Mäkelä
a2213b89d4
Add MYSQL_OPT_ZSTD_COMPRESSION_LEVEL
...
The compression level was always hard-coded to 3.
2024-11-07 06:51:57 +02:00
Markus Mäkelä
721103eba1
Fix zstd compression level bytes
...
The MySQL protocol documentation as well as the comments in code state
that the compression level is stored in one byte. The code, however,
used four bytes.
2024-11-07 06:49:41 +02:00
Daniel Bartholomew
3e96ab92f9
bump the VERSION
2024-11-06 11:56:12 -05:00
Georg Richter
3f2196d84e
Set manpage version to 3.3
2024-10-25 07:38:00 +02:00
Georg Richter
e06ff35fd7
Updated man pages (rebuilt with pandoc 3.5)
2024-10-24 20:50:13 +02:00
Sergei Golubchik
e8234ba791
remove "find_package(Doxygen)", it not used here
2024-10-24 20:34:23 +02:00
Sergei Golubchik
d9082c7244
restore manpages to allow builds w/o pandoc
2024-10-24 20:20:54 +02:00
Georg Richter
6635e4bdd6
Fix for CONC-735
...
If a reconnect occurs, we need to check if mysql->options.host was
already set and pass NULL instead of the previous host name.
2024-10-22 13:26:50 +02:00
Kristian Nielsen
3b29ff9c91
MDEV-34859: Failed to initialise non-blocking API on OpenBSD arm64
...
Follow-up patch to fix copy-paste error that causes incorrect restore of
registers in my_context_continue which can cause crashes on arm64.
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org >
2024-10-20 17:11:23 +02:00
