Skip to content

Commit 86adee3

Browse files
MDEV-31475 remove unnecessary assignment to spider share init_error
The init, init_error, and init_error_time fields of a SPIDER_SHARE should only be assigned when actually doing the initialisation of a SPIDER_SHARE, otherwise they could result in spurious failures from spider_get_share() in a subsequent statement.
1 parent ac2e02e commit 86adee3

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

storage/spider/ha_spider.cc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8328,8 +8328,6 @@ int ha_spider::info(
83288328
spider_init_error_table->init_error_time =
83298329
(time_t) time((time_t*) 0);
83308330
}
8331-
share->init_error = TRUE;
8332-
share->init = TRUE;
83338331
}
83348332
if (wide_handler->sql_command == SQLCOM_SHOW_CREATE ||
83358333
wide_handler->sql_command == SQLCOM_SHOW_FIELDS)
@@ -8382,19 +8380,13 @@ int ha_spider::info(
83828380
share, TRUE))
83838381
) {
83848382
spider_init_error_table->init_error = error_num;
8385-
/*
8386-
if (!thd->is_error())
8387-
my_error(error_num, MYF(0), "");
8388-
*/
83898383
if ((spider_init_error_table->init_error_with_message =
83908384
thd->is_error()))
83918385
strmov(spider_init_error_table->init_error_msg,
83928386
spider_stmt_da_message(thd));
83938387
spider_init_error_table->init_error_time =
83948388
(time_t) time((time_t*) 0);
83958389
}
8396-
share->init_error = TRUE;
8397-
share->init = TRUE;
83988390
}
83998391
if (wide_handler->sql_command == SQLCOM_SHOW_CREATE ||
84008392
wide_handler->sql_command == SQLCOM_SHOW_FIELDS)
@@ -8688,8 +8680,6 @@ ha_rows ha_spider::records_in_range(
86888680
spider_init_error_table->init_error_time =
86898681
(time_t) time((time_t*) 0);
86908682
}
8691-
share->init_error = TRUE;
8692-
share->init = TRUE;
86938683
}
86948684
if (check_error_mode(error_num))
86958685
my_errno = error_num;
@@ -8993,8 +8983,6 @@ int ha_spider::check_crd()
89938983
spider_init_error_table->init_error_time =
89948984
(time_t) time((time_t*) 0);
89958985
}
8996-
share->init_error = TRUE;
8997-
share->init = TRUE;
89988986
}
89998987
DBUG_RETURN(check_error_mode(error_num));
90008988
}

0 commit comments

Comments
 (0)