Connection to Embedded server does not have socket

Connection to Embedded server is not socket orientated, so it does not have
socket. Fix code and tests for Embedded server connection.

Author: pali

dbdimp.c

@@ -2376,6 +2376,12 @@ static bool mariadb_dr_connect(
       sock->reconnect = FALSE;
 #endif
 
+    /* Connection to Embedded server does not have socket */
+    if (imp_dbh->is_embedded)
+    {
+      imp_dbh->sock_fd = -1;
+    }
+    else
     {
       my_socket sock_os;
       int retval;
@@ -3171,8 +3177,11 @@ static void mariadb_db_close_mysql(pTHX_ imp_drh_t *imp_drh, imp_dbh_t *imp_dbh)
       socket from C file descriptor sock_fd via _set_osfhnd() function and then
       close sock_fd via close() function.
     */
+    if (imp_dbh->sock_fd >= 0)
+    {
     _set_osfhnd(imp_dbh->sock_fd, INVALID_HANDLE_VALUE);
     close(imp_dbh->sock_fd);
+    }
 #endif
     imp_dbh->sock_fd = -1;
     svp = hv_fetchs((HV*)DBIc_MY_H(imp_dbh), "ChildHandles", FALSE);

t/15reconnect.t

@@ -38,12 +38,18 @@ ok($dbh->do("SELECT 1"), "implicitly reconnecting handle with 'do'");
 
 ok($dbh->{Active}, "checking for reactivated handle");
 
+SKIP: {
+
+skip "Connection to Embedded server does not have socket", 3 if $dbh->{mariadb_hostinfo} eq 'Embedded';
+
 ok(shutdown_mariadb_socket($dbh), "shutdown socket handle");
 
 ok($dbh->do("SELECT 1"), "implicitly reconnecting handle after shutdown with 'do'");
 
 ok($dbh->{Active}, "checking for reactivated handle");
 
+}
+
 ok($dbh->disconnect(), "disconnecting active handle");
 
 ok(!$dbh->{Active}, "checking for inactive handle");

t/17close_on_exec.t

@@ -10,6 +10,8 @@ require 'lib.pl';
 
 my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 });
 
+plan skip_all => "Connection to Embedded server does not have socket" if $dbh->{mariadb_hostinfo} eq 'Embedded';
+
 plan tests => 2;
 
 # Spawn new perl child process with MariaDB file descriptor passed as first argument and check that it is invalid (EBADF) in spawned process

t/18begin_work_without_raise_error.t

@@ -10,6 +10,8 @@ require 'lib.pl';
 
 my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 0, PrintError => 1 });
 
+plan skip_all => "Connection to Embedded server does not have socket" if $dbh->{mariadb_hostinfo} eq 'Embedded';
+
 plan tests => 12;
 
 my $warn;

t/lib.pl

@@ -91,7 +91,10 @@ sub shutdown_mariadb_socket {
     # close automatically close C file descriptor in Perl file handle
     # mysql client library does not expect if somebody closes its file descriptors
     # so always take a copy of mariadb_sockfd() C file descriptor and just shutdown it
-    open my $socket, '+<&', $dbh->mariadb_sockfd();
+    my $fd = $dbh->mariadb_sockfd();
+    return undef unless defined $fd;
+    open my $socket, '+<&', $fd;
+    return undef unless defined $socket;
     my $ret = shutdown($socket, 2);
     close $socket;
     return $ret;

t/rt110983-valid-mysqlfd.t

@@ -10,6 +10,8 @@ require "lib.pl";
 
 my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
 
+plan skip_all => "Connection to Embedded server does not have socket" if $dbh->{mariadb_hostinfo} eq 'Embedded';
+
 plan tests => 4;
 
 my $fd = $dbh->mariadb_sockfd;