Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix support for MySQL 8.0 #192

Merged
merged 7 commits into from
Sep 6, 2023
Merged

Fix support for MySQL 8.0 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f375f85
Add new versions for testing on Github Actions CI
pali Aug 13, 2023
c3da544
Do not use MYSQL_OPT_RECONNECT for MySQL 8.0.34+ clients
pali Aug 13, 2023
42b1cc8
MySQL 8.0.20 client library has fixed reinitialization bug
pali Aug 13, 2023
6c4b12d
Fix MariaDB server version check in t/40server_prepare.t test
pali Aug 21, 2023
d564c3c
Skip t/rt122541-decimals.t test for MySQL 8.0.22+ server versions
pali Aug 21, 2023
b6dd0c6
Add new DECIMAL testcase into t/rt122541-decimals.t
pali Aug 21, 2023
5f3037a
accept 4031 as a valid return code when connection closed
waltman Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
- 5.32.0
- 5.34.0
- 5.36.0
- 5.38.0
- system
dbi-version:
- 1.627
Expand All @@ -50,6 +51,7 @@ jobs:
- mysql-5.0.96
- mysql-5.1.30
- mysql-5.1.72
- mysql-5.1.73
- mysql-5.5.8
- mysql-5.5.47
- mysql-5.5.49
Expand All @@ -71,6 +73,7 @@ jobs:
- mysql-5.6.41
- mysql-5.6.43
- mysql-5.6.45
- mysql-5.6.51
- mysql-5.7.8-rc
- mysql-5.7.11
- mysql-5.7.12
Expand All @@ -83,6 +86,7 @@ jobs:
- mysql-5.7.23
- mysql-5.7.25
- mysql-5.7.27
- mysql-5.7.43
- mysql-8.0.0-dmr
- mysql-8.0.1-dmr
- mysql-8.0.2-dmr
Expand All @@ -95,6 +99,11 @@ jobs:
- mysql-8.0.15
- mysql-8.0.16
- mysql-8.0.17
- mysql-8.0.20
- mysql-8.0.21
- mysql-8.0.22
- mysql-8.0.33
- mysql-8.0.34
- mariadb-5.5.40
- mariadb-5.5.44
- mariadb-5.5.47
Expand All @@ -109,6 +118,7 @@ jobs:
- mariadb-5.5.61
- mariadb-5.5.63
- mariadb-5.5.65
- mariadb-5.5.68
- mariadb-10.0.14
- mariadb-10.0.20
- mariadb-10.0.23
Expand All @@ -132,6 +142,7 @@ jobs:
- mariadb-10.1.37
- mariadb-10.1.38
- mariadb-10.1.41
- mariadb-10.1.48
- mariadb-10.2.0
- mariadb-10.2.1
# Incompatible, broken mysql_config
Expand All @@ -154,6 +165,7 @@ jobs:
- mariadb-10.2.21
- mariadb-10.2.22
- mariadb-10.2.26
- mariadb-10.2.44
- mariadb-10.3.0
- mariadb-10.3.1
- mariadb-10.3.2
Expand All @@ -166,6 +178,7 @@ jobs:
- mariadb-10.3.11
- mariadb-10.3.12
- mariadb-10.3.17
- mariadb-10.3.39
- mariadb-10.4.0
- mariadb-10.4.1
- mariadb-10.4.2
Expand Down Expand Up @@ -213,6 +226,12 @@ jobs:
- mariadbconc-3.1.1
- mariadbconc-3.1.2
- mariadbconc-3.1.3
- mariadbconc-3.1.10
- mariadbconc-3.1.21
- mariadbconc-3.2.0
- mariadbconc-3.2.7
- mariadbconc-3.3.0-rc1
- mariadbconc-3.3.5
- system
- same-as-server
include:
Expand Down Expand Up @@ -338,10 +357,11 @@ jobs:
5.6.[12]*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.5-x86_64.tar.gz ;;
5.6.3[0123456]*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.5-x86_64.tar.gz ;;
5.6.*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.12-x86_64.tar.gz ;;
5.7.19*|5.7.[2]*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.12-x86_64.tar.gz ;;
5.7.19*|5.7.[234]*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.12-x86_64.tar.gz ;;
5.7.*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.5-x86_64.tar.gz ;;
8.0.?-*|8.0.11) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.12-x86_64.tar.gz ;;
8.0.*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.12-x86_64.tar.xz ;;
8.1.*) SANDBOX_URL=https://dev.mysql.com/get/mysql-$VERSION-linux-glibc2.28-x86_64.tar.xz ;;
*) echo "Unsupported MySQL version '$VERSION'"; exit 1 ;;
esac
SANDBOX_CACHE_FILE="$HOME/cache/$(basename "$SANDBOX_URL")"
Expand Down Expand Up @@ -376,8 +396,13 @@ jobs:
esac
CONC_FILE="$HOME/cache/$(basename "$CONC_URL")"
elif [ "$CONC_DB" = "MariaDB" ]; then
CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz
CONC_FILE="$HOME/cache/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz"
case "$CONC_VERSION" in
3.0.*) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz ;;
3.1.[01234567]) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz ;;
3.*) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-ubuntu-focal-amd64.tar.gz ;;
*) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz ;;
esac
CONC_FILE="$HOME/cache/$(basename "$CONC_URL")"
elif [ -n "$CONC_DB" ]; then
echo "Unsupported Connector/C '$CONC_DB'"; exit 1
fi
Expand Down
4 changes: 4 additions & 0 deletions dbdimp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2362,10 +2362,13 @@ static bool mariadb_dr_connect(
so that we can keep track of when this happens.
*/
#if MYSQL_VERSION_ID >= 50013
/* Beginning with MySQL 8.0.34, the automatic reconnection feature is deprecated and disabled by default. */
#if defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 80034
{
my_bool reconnect = FALSE;
mysql_options(sock, MYSQL_OPT_RECONNECT, &reconnect);
}
#endif
#else
sock->reconnect = FALSE;
#endif
Expand Down Expand Up @@ -3095,6 +3098,7 @@ static void mariadb_dr_close_mysql(pTHX_ imp_drh_t *imp_drh, MYSQL *pmysql)
* - infinite loop when calling mysql_server_end() more then once in case Embedded server was not started
* Therefore do not call mysql_server_end() when Embedded server was not in used.
* These bugs were fixed in MariaDB Connector/C 3.0.5, see: https://jira.mariadb.org/browse/CONC-336
* And fixed also in MySQL 8.0.20, see: https://bugs.mysql.com/bug.php?id=93276
* But remains in MariaDB Embedded server, see: https://jira.mariadb.org/browse/MDEV-16578
*/
#if !defined(HAVE_BROKEN_INIT) && (defined(HAVE_DEINITIALIZE_SSL) || !defined(HAVE_PROBLEM_WITH_OPENSSL))
Expand Down
4 changes: 2 additions & 2 deletions dbdimp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,9 @@ PERL_STATIC_INLINE unsigned long mariadb_get_client_version(void)
/*
* MySQL and MariaDB Embedded are affected by https://jira.mariadb.org/browse/MDEV-16578
* MariaDB 10.2.2+ prior to 10.2.19 and 10.3.9 and MariaDB Connector/C prior to 3.0.5 are affected by https://jira.mariadb.org/browse/CONC-336
* MySQL 8.0.4+ is affected too by https://bugs.mysql.com/bug.php?id=93276
* MySQL 8.0.4+ prior to 8.0.20 is affected too by https://bugs.mysql.com/bug.php?id=93276
*/
#if defined(HAVE_EMBEDDED) || (!defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80004) || (defined(MARIADB_PACKAGE_VERSION) && (!defined(MARIADB_PACKAGE_VERSION_ID) || MARIADB_PACKAGE_VERSION_ID < 30005)) || (defined(MARIADB_BASE_VERSION) && ((MYSQL_VERSION_ID >= 100202 && MYSQL_VERSION_ID < 100219) || (MYSQL_VERSION_ID >= 100300 && MYSQL_VERSION_ID < 100309)))
#if defined(HAVE_EMBEDDED) || (!defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80004 && MYSQL_VERSION_ID < 80020) || (defined(MARIADB_PACKAGE_VERSION) && (!defined(MARIADB_PACKAGE_VERSION_ID) || MARIADB_PACKAGE_VERSION_ID < 30005)) || (defined(MARIADB_BASE_VERSION) && ((MYSQL_VERSION_ID >= 100202 && MYSQL_VERSION_ID < 100219) || (MYSQL_VERSION_ID >= 100300 && MYSQL_VERSION_ID < 100309)))
#define HAVE_BROKEN_INIT
#endif

Expand Down
3 changes: 2 additions & 1 deletion t/40server_prepare.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use warnings;

use Test::More;
use DBI;
use DBI::Const::GetInfoType;
use lib 't', '.';
require 'lib.pl';
use vars qw($test_dsn $test_user $test_password $test_db);
Expand Down Expand Up @@ -73,7 +74,7 @@ ok($sth3->execute(1, 2), "insert t3");
is_deeply($dbh->selectall_arrayref('SELECT id, mydata FROM t3'), [[1, 2]]);

# MariaDB server since version 10.6.2 can prepare all statements except PREPARE, EXECUTE, and DEALLOCATE / DROP PREPARE. Previous MariaDB and MySQL versions cannot prepare USE statement.
my $non_preparable_statement = ($dbh->{mariadb_serverversion} >= 100602) ? q(PREPARE stmt FROM "SELECT 1") : ("USE " . $dbh->quote_identifier($test_db));
my $non_preparable_statement = ($dbh->get_info($GetInfoType{SQL_DBMS_NAME}) eq 'MariaDB' and $dbh->{mariadb_serverversion} >= 100602) ? q(PREPARE stmt FROM "SELECT 1") : ("USE " . $dbh->quote_identifier($test_db));

$dbh->{mariadb_server_prepare_disable_fallback} = 1;
my $error_handler_called = 0;
Expand Down
12 changes: 11 additions & 1 deletion t/rt122541-decimals.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@ use warnings;

use Test::More;
use DBI;
use DBI::Const::GetInfoType;

use vars qw($test_dsn $test_user $test_password);
use lib 't', '.';
require "lib.pl";

my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { PrintError => 0, RaiseError => 1 });

plan tests => 2;
plan tests => 4;

for my $mariadb_server_prepare (0, 1) {
$dbh->{mariadb_server_prepare} = $mariadb_server_prepare;
SKIP: {
skip "Servers < 5.0.8 do not support DECIMAL argument for CAST()", 1 if $dbh->{mariadb_serverversion} < 50008;
skip "Clients < 5.0.3 do not support new decimal type from servers >= 5.0.3", 1 if $dbh->{mariadb_serverversion} >= 50003 and $dbh->{mariadb_clientversion} < 50003;
is $dbh->selectrow_arrayref('SELECT CAST(DEGREES(0.00043) * 69 AS DECIMAL(65, 2))')->[0], '1.70',
'float casted to decimal with fixed length and trailing zeros returns correct value for mariadb_server_prepare=' . $mariadb_server_prepare;
}
SKIP: {
skip 'MySQL 8.0.22+ server have broken ROUND() function', 1 if $dbh->get_info($GetInfoType{SQL_DBMS_NAME}) eq 'MySQL' and $dbh->{mariadb_serverversion} >= 80022;
is $dbh->selectrow_arrayref('SELECT round(degrees(0.00043) * 69, 2)')->[0], '1.70',
'floats with fixed-length of decimals returns correct value for mariadb_server_prepare=' . $mariadb_server_prepare;
}
}
8 changes: 7 additions & 1 deletion t/rt85919-fetch-lost-connection.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,18 @@ if (not $ok) {
# if we're connected via a local socket we receive error 2006
# (CR_SERVER_GONE_ERROR) but if we're connected using TCP/IP we get
# 2013 (CR_SERVER_LOST)
#
# as of 8.0.24 MySQL writes the reason the connection was closed
# before closing it, so 4031 (ER_CLIENT_INTERACTION_TIMEOUT) is
# now an valid return code
if ($DBI::err == 2006) {
pass("received error 2006 (CR_SERVER_GONE_ERROR)");
} elsif ($DBI::err == 2013) {
pass("received error 2013 (CR_SERVER_LOST)");
} elsif ($DBI::err == 4031) {
pass("received error 4031 (ER_CLIENT_INTERACTION_TIMEOUT)");
} else {
fail('Should return error 2006 or 2013');
fail("Should return error 2006 or 2013 or 4031 but returned $DBI::err");
}
eval { $sth->finish(); } if defined $sth;
eval { $dbh->disconnect(); } if defined $dbh;
Expand Down
Loading