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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Yuchen Pei
2023-09-15 12:04:44 +10:00
parent 81e60f1a0a 96760d3acc
commit e95e9a221f
21 changed files with 280 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/spider/spd_db_mysql.cc
View File

@@ -13976,14 +13976,6 @@ int spider_mbase_handler::push_back_upds(
}
#endif
bool spider_mbase_handler::need_lock_before_set_sql_for_exec(
ulong sql_type
) {
DBUG_ENTER("spider_mbase_handler::need_lock_before_set_sql_for_exec");
DBUG_PRINT("info",("spider this=%p", this));
DBUG_RETURN(FALSE);
}
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int spider_mbase_handler::set_sql_for_exec(
ulong sql_type,