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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-12-13 16:58:58 +02:00
parent 04efe13501 1dc2f35598
commit a8a5c8a1b8
178 changed files with 1981 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
storage/spider/spd_direct_sql.cc
View File

@@ -1956,17 +1956,6 @@ long long spider_direct_sql_body(
#else
}
TABLE_LIST *tables = &direct_sql->table_list[roop_count];
#ifdef SPIDER_use_LEX_CSTRING_for_database_tablename_alias
table_list.init_one_table(
&table_list.db, &table_list.table_name, 0, TL_WRITE);
#else
tables->init_one_table(
SPIDER_TABLE_LIST_db_str(&table_list),
SPIDER_TABLE_LIST_db_length(&table_list),
SPIDER_TABLE_LIST_table_name_str(&table_list),
SPIDER_TABLE_LIST_table_name_length(&table_list),
SPIDER_TABLE_LIST_table_name_str(&table_list), TL_WRITE);
#endif
MDL_REQUEST_INIT(&tables->mdl_request, MDL_key::TABLE,
SPIDER_TABLE_LIST_db_str(&table_list),
SPIDER_TABLE_LIST_table_name_str(&table_list),