Fix $dbh->last_insert_id for multi result statements

$dbh->last_insert_id was not correctly set for unfinished multi statement
result followed by $dbh->do or $dbh->prepare call with statement which does
not modify $dbh->last_insert_id.

Author: pali

dbdimp.c

@@ -2652,6 +2652,7 @@ IV mariadb_db_do6(SV *dbh, imp_dbh_t *imp_dbh, SV *statement_sv, SV *attribs, I3
         mariadb_dr_do_error(dbh, mysql_errno(imp_dbh->pmysql), mysql_error(imp_dbh->pmysql), mysql_sqlstate(imp_dbh->pmysql));
         return -2;
       }
+      imp_dbh->insertid = mysql_insert_id(imp_dbh->pmysql);
     }
     if (result)
     {
@@ -4021,6 +4022,7 @@ static bool mariadb_st_free_result_sets(SV *sth, imp_sth_t *imp_sth)
                    mysql_sqlstate(imp_dbh->pmysql));
           return FALSE;
         }
+        imp_dbh->insertid = imp_sth->insertid = mysql_insert_id(imp_dbh->pmysql);
       }
     }
     if (imp_sth->result)

t/76multi_statement.t

@@ -13,7 +13,7 @@ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
                       { RaiseError => 1, PrintError => 0, AutoCommit => 0,
                         mariadb_multi_statements => 1 });
 
-plan tests => 36;
+plan tests => 51;
 
 ok (defined $dbh, "Connected to database with multi statement support");
 
@@ -73,4 +73,27 @@ $dbh->{mariadb_server_prepare}= 0;
   ok(not $sth->more_results());
   ok($sth->finish());
 
+  # Check that $dbh->last_insert_id works after $dbh->do with multi statements
+  ok($dbh->do("INSERT INTO dbd_mysql_t76multi2 VALUES(3); INSERT INTO dbd_mysql_t76multi2 VALUES(4);"));
+  is($dbh->last_insert_id(undef, undef, undef, undef), 4, '$dbh->last_insert_id is correct after $dbh->do with multi statements');
+
+  # Check that $dbh->last_insert_id works after prepare, execute and finish but without more_results
+  ok($sth = $dbh->prepare("INSERT INTO dbd_mysql_t76multi2 VALUES(5); INSERT INTO dbd_mysql_t76multi2 VALUES(6);"));
+  ok($sth->execute());
+  ok($sth->finish());
+  is($dbh->last_insert_id(undef, undef, undef, undef), 6, '$dbh->last_insert_id is correct after multi statement prepare, execute and finish');
+
+  # Check that $dbh->last_insert_id works after prepare and execute, but without more_results; after preparing new statement
+  ok($sth = $dbh->prepare("INSERT INTO dbd_mysql_t76multi2 VALUES(7); INSERT INTO dbd_mysql_t76multi2 VALUES(8);"));
+  ok($sth->execute());
+  ok($sth = $dbh->prepare("SELECT 1"));
+  is($dbh->last_insert_id(undef, undef, undef, undef), 8, '$dbh->last_insert_id is correct after multi statement prepare and execute without finish followed by new prepare');
+
+  # Check that $dbh->last_insert_id works after prepare and execute, but without more_results; after calling $dbh->do which do not modify last_insert_id
+  ok($sth = $dbh->prepare("INSERT INTO dbd_mysql_t76multi2 VALUES(9); INSERT INTO dbd_mysql_t76multi2 VALUES(10);"));
+  ok($sth->execute());
+  ok($dbh->do("SELECT 1"));
+  is($dbh->last_insert_id(undef, undef, undef, undef), 10, '$dbh->last_insert_id is correct after multi statement prepare and execute without finish followed by $dbh->do');
+  ok($sth->finish());
+
 $dbh->disconnect();