database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-36324 MDEV-35452 Missing appending FROM ... in spider_mbase_handler::append_key_select

Browse Source 
The missing append_from causes ill-formed query construction.

This fixes spider/bugfix.mdev_35874 with --view-protocol.
This commit is contained in:
Yuchen Pei
2025-04-02 14:20:25 +11:00
parent c461188ca6
commit d3c5c47e0e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/spider/spd_db_mysql.cc
View File

@@ -8889,12 +8889,13 @@ int spider_mbase_handler::append_key_select_part(
default: default:
DBUG_RETURN(0); DBUG_RETURN(0);
} }
error_num = append_key_select(str, idx); error_num = append_key_select(str, sql_type, idx);
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
} }
int spider_mbase_handler::append_key_select( int spider_mbase_handler::append_key_select(
spider_string *str, spider_string *str,
ulong sql_type,
uint idx uint idx
) { ) {
st_select_lex *select_lex = NULL; st_select_lex *select_lex = NULL;
@@ -8943,6 +8944,7 @@ int spider_mbase_handler::append_key_select(
str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN); str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
} }
str->length(str->length() - SPIDER_SQL_COMMA_LEN); str->length(str->length() - SPIDER_SQL_COMMA_LEN);
DBUG_RETURN(append_from(str, sql_type, first_link_idx));
} else { } else {
table_name_pos = str->length() + mysql_share->key_select_pos[idx]; table_name_pos = str->length() + mysql_share->key_select_pos[idx];
if (str->append(mysql_share->key_select[idx])) if (str->append(mysql_share->key_select[idx]))

1
storage/spider/spd_db_mysql.h
View File

@@ -887,6 +887,7 @@ public:
) override; ) override;
int append_key_select( int append_key_select(
spider_string *str, spider_string *str,
ulong sql_type,
uint idx uint idx
); );
int append_minimum_select_part( int append_minimum_select_part(