Skip to content

Commit f00ac20

Browse files
dr-mdr-m
committed
Merge 10.6 into 10.7
2 parents 2577ff2 + 571a8f4 commit f00ac20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+412
-110
lines changed

‎cmake/ssl.cmake

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ MACRO (MYSQL_CHECK_SSL)
118118
ENDIF()
119119
FIND_PACKAGE(OpenSSL)
120120
SET_PACKAGE_PROPERTIES(OpenSSL PROPERTIES TYPE RECOMMENDED)
121-
IF(OPENSSL_FOUND AND OPENSSL_VERSION AND OPENSSL_VERSION VERSION_LESS "3.0.0")
121+
IF(OPENSSL_FOUND)
122122
SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
123123
INCLUDE(CheckSymbolExists)
124124
SET(SSL_SOURCES "")
@@ -139,6 +139,13 @@ MACRO (MYSQL_CHECK_SSL)
139139
SET(SSL_INTERNAL_INCLUDE_DIRS "")
140140
SET(SSL_DEFINES "-DHAVE_OPENSSL")
141141

142+
# Silence "deprecated in OpenSSL 3.0"
143+
IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake
144+
OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0"))
145+
SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x10100000L")
146+
SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x10100000L)
147+
ENDIF()
148+
142149
SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
143150
SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES})
144151
SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
@@ -152,6 +159,7 @@ MACRO (MYSQL_CHECK_SSL)
152159
HAVE_X509_check_host)
153160
SET(CMAKE_REQUIRED_INCLUDES)
154161
SET(CMAKE_REQUIRED_LIBRARIES)
162+
SET(CMAKE_REQUIRED_DEFINITIONS)
155163
ELSE()
156164
IF(WITH_SSL STREQUAL "system")
157165
MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support")

‎debian/additions/mariadb-report

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -239,26 +239,56 @@ sub get_user_mycnf
239239

240240
sub connect_to_MySQL
241241
{
242-
print "connect_to_MySQL\n" if $op{debug};
243-
244-
my $dsn;
245-
246-
if($mycnf{'socket'} && -S $mycnf{'socket'})
247-
{
248-
$dsn = "DBI:MariaDB:mariadb_socket=$mycnf{socket}";
249-
}
250-
elsif($mycnf{'host'})
251-
{
252-
$dsn = "DBI:MariaDB:host=$mycnf{host}" . ($mycnf{port} ? ";port=$mycnf{port}" : "");
253-
}
254-
else
255-
{
256-
$dsn = "DBI:MariaDB:host=localhost";
257-
}
258-
259-
print "connect_to_MySQL: DBI DSN: $dsn\n" if $op{debug};
260-
261-
$dbh = DBI->connect($dsn, $mycnf{'user'}, $mycnf{'pass'}) or die;
242+
print "connect_to_MySQL\n" if $op{debug};
243+
244+
if(my @driverList = grep {/mariadb|mysql/i} DBI->available_drivers()) {
245+
my $dsn;
246+
my $driver = undef;
247+
248+
if(grep {/mariadb/i} @driverList)
249+
{
250+
$driver = "DBI:MariaDB";
251+
}
252+
elsif(grep {/mysql/i} @driverList)
253+
{
254+
$driver = "DBI:mysql";
255+
}
256+
257+
if($mycnf{'socket'} && -S $mycnf{'socket'})
258+
{
259+
if(grep {/mariadb/i} @driverList)
260+
{
261+
$dsn = $driver . ":mariadb_socket=$mycnf{socket}";
262+
}
263+
elsif(grep {/mysql/i} @driverList)
264+
{
265+
$dsn = $driver . ":mysql_socket=$mycnf{socket}";
266+
}
267+
}
268+
elsif($mycnf{'host'})
269+
{
270+
$dsn = $driver . ":host=$mycnf{host}" . ($mycnf{port} ? ";port=$mycnf{port}" : "");
271+
}
272+
else
273+
{
274+
$dsn = $driver . ":host=localhost";
275+
}
276+
277+
print "connect_to_MySQL: DBI DSN: " . $dsn . "\n" if $op{debug};
278+
279+
$dbh = DBI->connect($dsn, $mycnf{'user'}, $mycnf{'pass'}) or die;
280+
}
281+
else
282+
{
283+
print STDERR "Install Perl 5.x driver: DBD:mysql or DBD:MariaDB\n";
284+
print STDERR "currently installed Perl DBD drivers:\n";
285+
foreach my $driver (DBI->available_drivers())
286+
{
287+
print STDERR " * " . $driver . "\n";
288+
}
289+
print STDERR "\n";
290+
die("Exit as no MariaDB DBI driver found!\n");
291+
}
262292
}
263293

264294
sub collect_reports

‎debian/mariadb-test-data.lintian-overrides

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
11
# These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
22
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
33
arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
4+
# Intentional for test files
5+
national-encoding usr/share/mysql/mysql-test/*
6+
# Extra test documentation files that really need to be kept in context in test directory
7+
package-contains-documentation-outside-usr-share-doc usr/share/mysql/mysql-test/*
8+
# Intentional directory structure
9+
repeated-path-segment auth_gssapi usr/share/mysql/mysql-test/plugin/auth_gssapi/auth_gssapi/
10+
repeated-path-segment connect usr/share/mysql/mysql-test/plugin/connect/connect/
11+
repeated-path-segment disks usr/share/mysql/mysql-test/plugin/disks/disks/
12+
repeated-path-segment func_test usr/share/mysql/mysql-test/plugin/func_test/func_test/
13+
repeated-path-segment metadata_lock_info usr/share/mysql/mysql-test/plugin/metadata_lock_info/metadata_lock_info/
14+
repeated-path-segment mroonga usr/share/mysql/mysql-test/plugin/mroonga/mroonga/
15+
repeated-path-segment mroonga usr/share/mysql/mysql-test/plugin/mroonga/mroonga/include/mroonga/
16+
repeated-path-segment oqgraph usr/share/mysql/mysql-test/plugin/oqgraph/oqgraph/
17+
repeated-path-segment query_response_time usr/share/mysql/mysql-test/plugin/query_response_time/query_response_time/
18+
repeated-path-segment rocksdb usr/share/mysql/mysql-test/plugin/rocksdb/rocksdb/
19+
repeated-path-segment sequence usr/share/mysql/mysql-test/plugin/sequence/sequence/
20+
repeated-path-segment sphinx usr/share/mysql/mysql-test/plugin/sphinx/sphinx/
21+
repeated-path-segment spider usr/share/mysql/mysql-test/plugin/spider/spider/
22+
repeated-path-segment type_inet usr/share/mysql/mysql-test/plugin/type_inet/type_inet/
23+
repeated-path-segment type_test usr/share/mysql/mysql-test/plugin/type_test/type_test/
24+
repeated-path-segment user_variables usr/share/mysql/mysql-test/plugin/user_variables/user_variables/
25+
repeated-path-segment wsrep_info usr/share/mysql/mysql-test/plugin/wsrep_info/wsrep_info/

‎include/mysql/service_my_crypt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extern "C" {
4545
/* The max key length of all supported algorithms */
4646
#define MY_AES_MAX_KEY_LENGTH 32
4747

48-
#define MY_AES_CTX_SIZE 656
48+
#define MY_AES_CTX_SIZE 672
4949

5050
enum my_aes_mode {
5151
MY_AES_ECB, MY_AES_CBC

‎include/ssl_compat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
2525
#define ERR_remove_state(X) ERR_clear_error()
2626
#define EVP_CIPHER_CTX_SIZE 176
27-
#define EVP_MD_CTX_SIZE 48
27+
#define EVP_MD_CTX_SIZE 72
2828
#undef EVP_MD_CTX_init
2929
#define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
3030
#undef EVP_CIPHER_CTX_init
@@ -77,7 +77,6 @@
7777
#define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G))
7878
#endif
7979

80-
#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
8180
#define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt)
8281
#define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX)
8382

‎man/mysql.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQL\FR" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
3+
.TH "\FBMARIADB\FR" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------

‎man/mysql_client_test.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQL_CLIENT_TEST" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
3+
.TH "\FBMARIADB-CLIENT-TEST" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------

‎man/mysql_convert_table_format.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQL_CONVERT_TAB" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
3+
.TH "\FBMARIADB-CONVERT-TAB" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------

‎man/mysql_find_rows.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQL_FIND_ROWS\F" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
3+
.TH "\FBMARIADB-FIND-ROWS\F" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------

‎man/mysql_fix_extensions.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQL_FIX_EXTENSI" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
3+
.TH "\FBMARIADB-FIX-EXTENSI" "1" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------

0 commit comments

Comments
 (0)