---

yaml --- r: 1724454 b: refs/heads/bb-10.5-serg c: bbb1140 h: refs/heads/10.6
tempesta-tech · Jun 5, 2020 · 7065600 · 7065600
1 parent 4ad9023
commit 7065600
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1229,7 +1229,7 @@ refs/heads/bb-10.5-19708: 4c76c25603482c8a71972daa675fb5b92d0ca191
 refs/heads/bb-10.5-MDEV-16978-without-overlaps: bbe056ac3fa8e3ca3e25f54fb397cba30989ac65
 refs/heads/bb-10.5-MDEV-18565: 5cc2096f93b7f130b36f8bc0fc43440db9a848e4
 refs/heads/bb-10.5-MDEV-20297: dfe6e624ca92a82532212cc9262bfff9ac56696c
-refs/heads/bb-10.5-serg: f16633c175ea50fe60c69fd8e5f3e64d0683eb56
+refs/heads/bb-10.5-serg: bbb1140d474465ef70eec961b837ae7614732d88
 refs/heads/bb-10.5-svoj-MDEV-17084: 7b6ff1f2582feecf8084d86285c50afd50ae0d06
 refs/heads/bb-10.5-wlad-2: 83e219bf89f19d656d5c9848511170745bbc5e9b
 refs/tags/mariadb-10.1.41: 403e6615fdd3f5f4de6d159457b2bd2fe566e0ad

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_conn.cc b/branches/bb-10.5-serg/storage/spider/spd_db_conn.cc
@@ -4197,7 +4197,7 @@ int spider_db_store_result(
         request_key.handler = spider;
         request_key.request_id = spider->db_request_id[link_idx];
         request_key.next = NULL;
-        if (!(current->result = conn->db_conn->use_result(&request_key,
+        if (!(current->result = conn->db_conn->use_result(spider, &request_key,
           &error_num)))
         {
           if (!error_num)
@@ -4930,7 +4930,7 @@ void spider_db_discard_result(
   request_key.handler = spider;
   request_key.request_id = spider->db_request_id[link_idx];
   request_key.next = NULL;
-  if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+  if ((result = conn->db_conn->use_result(spider, &request_key, &error_num)))
   {
     result->free_result();
     delete result;
@@ -4960,7 +4960,7 @@ void spider_db_discard_multiple_result(
   {
     if (!conn->db_conn->cmp_request_key_to_snd(&request_key))
       break;
-    if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+    if ((result = conn->db_conn->use_result(spider, &request_key, &error_num)))
     {
       result->free_result();
       delete result;
@@ -6845,7 +6845,8 @@ int spider_db_bulk_insert(
             request_key.handler = spider;
             request_key.request_id = spider->db_request_id[roop_count2];
             request_key.next = NULL;
-            if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+            if ((result = conn->db_conn->use_result(spider, &request_key,
+              &error_num)))
             {
               result->free_result();
               delete result;
@@ -7015,7 +7016,8 @@ int spider_db_bulk_bulk_insert(
         request_key.handler = spider;
         request_key.request_id = spider->db_request_id[roop_count2];
         request_key.next = NULL;
-        if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+        if ((result = conn->db_conn->use_result(spider, &request_key,
+          &error_num)))
         {
           result->free_result();
           delete result;
@@ -7873,7 +7875,8 @@ int spider_db_direct_update(
         request_key.handler = spider;
         request_key.request_id = spider->db_request_id[roop_count];
         request_key.next = NULL;
-        if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+        if ((result = conn->db_conn->use_result(spider, &request_key,
+          &error_num)))
         {
           if (!counted)
           {
@@ -8199,7 +8202,8 @@ int spider_db_bulk_direct_update(
       request_key.handler = spider;
       request_key.request_id = spider->db_request_id[roop_count];
       request_key.next = NULL;
-      if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+      if ((result = conn->db_conn->use_result(spider, &request_key,
+        &error_num)))
       {
         if (!counted)
         {
@@ -8526,7 +8530,8 @@ int spider_db_direct_delete(
         request_key.handler = spider;
         request_key.request_id = spider->db_request_id[roop_count];
         request_key.next = NULL;
-        if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+        if ((result = conn->db_conn->use_result(spider, &request_key,
+          &error_num)))
         {
           if (!counted)
           {
@@ -10868,7 +10873,7 @@ int spider_db_udf_direct_sql(
         request_key.handler = direct_sql;
         request_key.request_id = 1;
         request_key.next = NULL;
-        if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+        if ((result = conn->db_conn->use_result(NULL, &request_key, &error_num)))
         {
           end_of_file = FALSE;
           if (roop_count >= 0)
@@ -11813,7 +11818,7 @@ int spider_db_udf_copy_tables(
       request_key.handler = copy_tables;
       request_key.request_id = 1;
       request_key.next = NULL;
-      if ((result = tmp_conn->db_conn->use_result(&request_key, &error_num)))
+      if ((result = tmp_conn->db_conn->use_result(NULL, &request_key, &error_num)))
       {
         SPIDER_DB_ROW *row;
         roop_count = 0;
@@ -12290,7 +12295,8 @@ int spider_db_open_handler(
       request_key.handler = spider;
       request_key.request_id = spider->db_request_id[link_idx];
       request_key.next = NULL;
-      if (!(result = conn->db_conn->use_result(&request_key, &error_num)))
+      if (!(result = conn->db_conn->use_result(spider, &request_key,
+        &error_num)))
       {
         if (!error_num)
         {
@@ -12429,7 +12435,8 @@ int spider_db_bulk_open_handler(
     request_key.handler = spider;
     request_key.request_id = spider->db_request_id[link_idx];
     request_key.next = NULL;
-    if (!(result = conn->db_conn->use_result(&request_key, &error_num)))
+    if (!(result = conn->db_conn->use_result(spider, &request_key,
+      &error_num)))
     {
       if (!error_num)
       {

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_handlersocket.cc b/branches/bb-10.5-serg/storage/spider/spd_db_handlersocket.cc
@@ -1438,6 +1438,7 @@ spider_db_result *spider_db_handlersocket::store_result(
 }
 
 spider_db_result *spider_db_handlersocket::use_result(
+  ha_spider *spider,
   st_spider_db_request_key *request_key,
   int *error_num
 ) {

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_handlersocket.h b/branches/bb-10.5-serg/storage/spider/spd_db_handlersocket.h
@@ -330,6 +330,7 @@ class spider_db_handlersocket: public spider_db_conn
     int *error_num
   );
   spider_db_result *use_result(
+    ha_spider *spider,
     st_spider_db_request_key *request_key,
     int *error_num
   );

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_include.h b/branches/bb-10.5-serg/storage/spider/spd_db_include.h
@@ -1123,6 +1123,7 @@ class spider_db_conn
     int *error_num
   ) = 0;
   virtual spider_db_result *use_result(
+    ha_spider *spider,
     st_spider_db_request_key *request_key,
     int *error_num
   ) = 0;

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_mysql.cc b/branches/bb-10.5-serg/storage/spider/spd_db_mysql.cc
@@ -2407,6 +2407,7 @@ spider_db_result *spider_db_mbase::store_result(
 }
 
 spider_db_result *spider_db_mbase::use_result(
+  ha_spider *spider,
   st_spider_db_request_key *request_key,
   int *error_num
 ) {

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_mysql.h b/branches/bb-10.5-serg/storage/spider/spd_db_mysql.h
@@ -453,6 +453,7 @@ class spider_db_mbase: public spider_db_conn
     int *error_num
   );
   spider_db_result *use_result(
+    ha_spider *spider,
     st_spider_db_request_key *request_key,
     int *error_num
   );

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_oracle.cc b/branches/bb-10.5-serg/storage/spider/spd_db_oracle.cc
@@ -1700,6 +1700,7 @@ spider_db_result *spider_db_oracle::store_result(
 }
 
 spider_db_result *spider_db_oracle::use_result(
+  ha_spider *spider,
   st_spider_db_request_key *request_key,
   int *error_num
 ) {

diff --git a/branches/bb-10.5-serg/storage/spider/spd_db_oracle.h b/branches/bb-10.5-serg/storage/spider/spd_db_oracle.h
@@ -380,6 +380,7 @@ class spider_db_oracle: public spider_db_conn
     int *error_num
   );
   spider_db_result *use_result(
+    ha_spider *spider,
     st_spider_db_request_key *request_key,
     int *error_num
   );