Fix mariadb_auto_reconnect for MySQL 8.0.24+

MySQL server version 8.0.24 started returning new error code
ER_CLIENT_INTERACTION_TIMEOUT for timeout disconnect reason.

Fix mariadb_auto_reconnect to handle this new code and extend
t/15reconnect.t test for timeout disconnect reason via changing
wait_timeout.

See: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-24.html#mysqld-8-0-24-connection-management
See: https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html#error_er_client_interaction_timeout

Author: pali

dbdimp.c

@@ -2834,7 +2834,7 @@ IV mariadb_db_do6(SV *dbh, imp_dbh_t *imp_dbh, SV *statement_sv, SV *attribs, I3
 #endif
     /* This is error for previous unfetched result ret. So do not report server errors to caller which is expecting new result set. */
     error = mysql_errno(imp_dbh->pmysql);
-    if (error == CR_COMMANDS_OUT_OF_SYNC || error == CR_OUT_OF_MEMORY || error == CR_SERVER_GONE_ERROR || error == CR_SERVER_LOST || error == CR_UNKNOWN_ERROR)
+    if (error == CR_COMMANDS_OUT_OF_SYNC || error == CR_OUT_OF_MEMORY || error == CR_SERVER_GONE_ERROR || error == CR_SERVER_LOST || error == ER_CLIENT_INTERACTION_TIMEOUT || error == CR_UNKNOWN_ERROR)
     {
       mariadb_dr_do_error(dbh, mysql_errno(imp_dbh->pmysql), mysql_error(imp_dbh->pmysql), mysql_sqlstate(imp_dbh->pmysql));
       return -2;
@@ -4241,7 +4241,7 @@ static bool mariadb_st_free_result_sets(SV *sth, imp_sth_t *imp_sth, bool free_l
 
     /* This is error for previous unfetched result ret. So do not report server errors to caller which is expecting new result set. */
     error = mysql_errno(imp_dbh->pmysql);
-    if (error == CR_COMMANDS_OUT_OF_SYNC || error == CR_OUT_OF_MEMORY || error == CR_SERVER_GONE_ERROR || error == CR_SERVER_LOST || error == CR_UNKNOWN_ERROR)
+    if (error == CR_COMMANDS_OUT_OF_SYNC || error == CR_OUT_OF_MEMORY || error == CR_SERVER_GONE_ERROR || error == CR_SERVER_LOST || error == ER_CLIENT_INTERACTION_TIMEOUT || error == CR_UNKNOWN_ERROR)
     {
       mariadb_dr_do_error(sth, mysql_errno(imp_dbh->pmysql), mysql_error(imp_dbh->pmysql), mysql_sqlstate(imp_dbh->pmysql));
       return FALSE;
@@ -6432,8 +6432,10 @@ bool mariadb_db_reconnect(SV *h, MYSQL_STMT *stmt)
   if (imp_dbh->pmysql &&
       mysql_errno(imp_dbh->pmysql) != CR_SERVER_GONE_ERROR &&
       mysql_errno(imp_dbh->pmysql) != CR_SERVER_LOST &&
+      mysql_errno(imp_dbh->pmysql) != ER_CLIENT_INTERACTION_TIMEOUT &&
       (!stmt || (mysql_stmt_errno(stmt) != CR_SERVER_GONE_ERROR &&
                  mysql_stmt_errno(stmt) != CR_SERVER_LOST &&
+                 mysql_stmt_errno(stmt) != ER_CLIENT_INTERACTION_TIMEOUT &&
                  mysql_stmt_errno(stmt) != CR_STMT_CLOSED)))
   {
     /* Other error */

dbdimp.h

@@ -86,6 +86,11 @@
 #define CR_STMT_CLOSED 2056
 #endif
 
+/* Macro was added in MySQL 8.0.24 */
+#ifndef ER_CLIENT_INTERACTION_TIMEOUT
+#define ER_CLIENT_INTERACTION_TIMEOUT 4031
+#endif
+
 
 /********************************************************************
  * Standard Perl macros which are not defined in every Perl version *

t/15reconnect.t

@@ -16,7 +16,7 @@ $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
   { RaiseError => 1, PrintError => 0 });
 $dbh->disconnect();
 
-plan tests => 21 * 2;
+plan tests => 30 * 2;
 
 for my $mariadb_server_prepare (0, 1) {
 $dbh= DBI->connect("$test_dsn;mariadb_server_prepare=$mariadb_server_prepare;mariadb_server_prepare_disable_fallback=1", $test_user, $test_password,
@@ -74,5 +74,34 @@ ok($dbh->{Active}, "checking for reactivated handle");
 
 $sth->finish();
 
+ok($dbh->do("SET SESSION wait_timeout=1"), "set wait_timeout to 1");
+
+note("call perl sleep 2 for implicit disconnect due to wait_timeout");
+sleep(2);
+
+ok($sth = $dbh->prepare("SELECT 1"), "implicitly reconnecting handle with preparing statement");
+
+ok($sth->execute(), "execute prepared statement");
+
+ok($dbh->{Active}, "checking for reactivated handle");
+
+ok($sth = $dbh->prepare("SELECT 1"), "prepare statement");
+
+note("call perl sleep 2 for implicit disconnect due to wait_timeout");
+sleep(2);
+
+ok($sth->execute(), "implicitly reconnecting handle with executing prepared statement");
+
+ok($dbh->{Active}, "checking for reactivated handle");
+
+$sth->finish();
+
+note("call perl sleep 2 for implicit disconnect due to wait_timeout");
+sleep(2);
+
+ok($dbh->do("SELECT 1"), "implicitly reconnecting handle with 'do'");
+
+ok($dbh->{Active}, "checking for reactivated handle");
+
 $dbh->disconnect();
 }