Fix $dbh->last_insert_id after $dbh->mariadb_async_result call

Last insert id for async result was updated only when it was called from
statement DBI handle, not when was called from database DBI handle.

Author: pali

dbdimp.c

@@ -6521,16 +6521,20 @@ my_ulonglong mariadb_db_async_result(SV* h, MYSQL_RES** resp)
         *resp= NULL;
       }
     }
+
+    /* Some MySQL client versions return correct value from mysql_insert_id()
+     * function only after non-SELECT operation. So store insert id into dbh
+     * cache and later read it only from cache. */
+    if (retval != (my_ulonglong)-1 && !*resp)
+      dbh->insertid = mysql_insert_id(svsock);
+
     if(htype == DBIt_ST) {
       D_imp_sth(h);
       D_imp_dbh_from_sth;
 
       if (retval != (my_ulonglong)-1) {
         if(! *resp) {
-          /* Some MySQL client versions return correct value from mysql_insert_id()
-           * function only after non-SELECT operation. So store insert id into dbh
-           * cache and later read it only from cache. */
-          imp_dbh->insertid = imp_sth->insertid = mysql_insert_id(svsock);
+          imp_sth->insertid = dbh->insertid;
           if(! mysql_more_results(svsock))
             DBIc_ACTIVE_off(imp_sth);
         } else {

t/88async-multi-stmts.t

@@ -9,17 +9,18 @@ use lib 't', '.';
 require 'lib.pl';
 
 my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
-                      { RaiseError => 0, PrintError => 0, AutoCommit => 0 });
-plan tests => 8;
+                      { RaiseError => 0, PrintError => 0, AutoCommit => 0, mariadb_multi_statements => 1 });
+plan tests => 45;
 
 $dbh->do(<<SQL);
 CREATE TEMPORARY TABLE async_test (
-    value INTEGER
+    value INTEGER AUTO_INCREMENT PRIMARY KEY
 );
 SQL
 
-my $sth0 = $dbh->prepare('INSERT INTO async_test VALUES(0)', { mariadb_async => 1 });
-my $sth1 = $dbh->prepare('INSERT INTO async_test VALUES(1)', { mariadb_async => 1 });
+my $sth0 = $dbh->prepare('INSERT INTO async_test VALUES(1)', { mariadb_async => 1 });
+my $sth1 = $dbh->prepare('INSERT INTO async_test VALUES(2)', { mariadb_async => 1 });
+my $sth2 = $dbh->prepare('INSERT INTO async_test VALUES(3); INSERT INTO async_test VALUES(4);', { mariadb_async => 1 });
 
 $sth0->execute;
 ok !defined($sth1->mariadb_async_ready);
@@ -32,7 +33,63 @@ ok !$sth1->errstr;
 ok defined($sth0->mariadb_async_result);
 ok !$sth1->errstr;
 
+is($sth0->last_insert_id(), 1);
+is($dbh->last_insert_id(undef, undef, undef, undef), 1);
+
+$sth2->execute;
+ok !defined($sth1->mariadb_async_ready);
+ok $sth1->err;
+ok !defined($sth1->mariadb_async_result);
+ok $sth1->err;
+
+is($sth0->last_insert_id(), 1);
+is($dbh->last_insert_id(undef, undef, undef, undef), 1);
+
+ok defined($sth2->mariadb_async_ready);
+ok !$sth2->err;
+
+is($sth0->last_insert_id(), 1);
+is($dbh->last_insert_id(undef, undef, undef, undef), 1);
+
+ok defined($sth2->mariadb_async_result);
+ok !$sth2->err;
+
+is($sth0->last_insert_id(), 1);
+is($sth2->last_insert_id(), 3);
+is($dbh->last_insert_id(undef, undef, undef, undef), 3);
+
+ok $sth2->more_results;
+ok defined($sth2->mariadb_async_result);
+ok !$sth2->err;
+
+is($sth0->last_insert_id(), 1);
+is($sth2->last_insert_id(), 4);
+is($dbh->last_insert_id(undef, undef, undef, undef), 4);
+
+ok !$sth2->more_results;
+
+$dbh->do('INSERT INTO async_test VALUES(5)', { mariadb_async => 1 });
+
+is($sth0->last_insert_id(), 1);
+is($sth2->last_insert_id(), 4);
+is($dbh->last_insert_id(undef, undef, undef, undef), 4);
+
+ok defined($dbh->mariadb_async_ready);
+ok !$dbh->err;
+
+is($sth0->last_insert_id(), 1);
+is($sth2->last_insert_id(), 4);
+is($dbh->last_insert_id(undef, undef, undef, undef), 4);
+
+ok defined($dbh->mariadb_async_result);
+ok !$sth2->err;
+
+is($sth0->last_insert_id(), 1);
+is($sth2->last_insert_id(), 4);
+is($dbh->last_insert_id(undef, undef, undef, undef), 5);
+
 undef $sth0;
 undef $sth1;
+undef $sth2;
 
 $dbh->disconnect;