File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -4786,7 +4786,7 @@ int spider_db_store_result_for_reuse_cursor(
4786
4786
THD *thd = current_thd;
4787
4787
char buf[MAX_FIELD_WIDTH];
4788
4788
spider_string tmp_str (buf, MAX_FIELD_WIDTH, &my_charset_bin);
4789
- tmp_str.init_calc_mem (120 );
4789
+ tmp_str.init_calc_mem (SPD_MID_DB_STORE_RESULT_FOR_REUSE_CURSOR_1 );
4790
4790
4791
4791
DBUG_PRINT (" info" ,(" spider store result to temporary table" ));
4792
4792
DBUG_ASSERT (!current->result_tmp_tbl );
Original file line number Diff line number Diff line change @@ -3364,7 +3364,7 @@ int spider_db_mbase::set_loop_check(
3364
3364
spider_string sql_str(sql_buf, sizeof(sql_buf), &my_charset_bin);
3365
3365
DBUG_ENTER("spider_db_mbase::set_loop_check");
3366
3366
DBUG_PRINT("info",("spider this=%p", this));
3367
- sql_str.init_calc_mem(270 );
3367
+ sql_str.init_calc_mem(SPD_MID_DB_MBASE_SET_LOOP_CHECK_1 );
3368
3368
while ((lcptr = (SPIDER_CONN_LOOP_CHECK *) my_hash_element(
3369
3369
&conn->loop_check_queue, 0)))
3370
3370
{
Original file line number Diff line number Diff line change @@ -1719,8 +1719,7 @@ group_by_handler *spider_create_group_by_handler(
1719
1719
if (spider->dml_init ())
1720
1720
{
1721
1721
DBUG_PRINT (" info" ,(" spider can not init for dml" ));
1722
- delete fields;
1723
- DBUG_RETURN (NULL );
1722
+ goto skip_free_fields;
1724
1723
}
1725
1724
for (
1726
1725
roop_count = spider_conn_link_idx_next (share->link_statuses ,
@@ -1792,8 +1791,7 @@ group_by_handler *spider_create_group_by_handler(
1792
1791
if (spider->dml_init ())
1793
1792
{
1794
1793
DBUG_PRINT (" info" ,(" spider can not init for dml" ));
1795
- delete fields;
1796
- DBUG_RETURN (NULL );
1794
+ goto skip_free_fields;
1797
1795
}
1798
1796
for (
1799
1797
roop_count = spider_conn_link_idx_next (share->link_statuses ,
Original file line number Diff line number Diff line change @@ -377,6 +377,7 @@ enum spider_malloc_id {
377
377
SPD_MID_DB_MBASE_RESULT_FETCH_ROW_FROM_TMP_TABLE_3,
378
378
SPD_MID_DB_MBASE_ROW_APPEND_ESCAPED_TO_STR_1,
379
379
SPD_MID_DB_MBASE_ROW_CLONE_1,
380
+ SPD_MID_DB_MBASE_SET_LOOP_CHECK_1,
380
381
SPD_MID_DB_MBASE_SET_SQL_MODE_1,
381
382
SPD_MID_DB_MBASE_SET_TIME_ZONE_1,
382
383
SPD_MID_DB_MBASE_SET_WAIT_TIMEOUT_1,
@@ -412,6 +413,7 @@ enum spider_malloc_id {
412
413
SPD_MID_DB_STORE_RESULT_3,
413
414
SPD_MID_DB_STORE_RESULT_4,
414
415
SPD_MID_DB_STORE_RESULT_5,
416
+ SPD_MID_DB_STORE_RESULT_FOR_REUSE_CURSOR_1,
415
417
SPD_MID_DB_UDF_COPY_TABLES_1,
416
418
SPD_MID_DB_UDF_PING_TABLE_1,
417
419
SPD_MID_DB_UDF_PING_TABLE_2,
You can’t perform that action at this time.
0 commit comments