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.5' into 10.6

Browse Source
This commit is contained in:
Yuchen Pei
2023-09-15 12:12:46 +10:00
parent 6a470db552 68a002071b
commit b70d8fbf18
41 changed files with 666 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/spider/spd_db_mysql.h
View File

@@ -1493,9 +1493,6 @@ public:
SPIDER_HS_STRING_REF &info
);
#endif
bool need_lock_before_set_sql_for_exec(
ulong sql_type
);
#ifdef SPIDER_HAS_GROUP_BY_HANDLER
int set_sql_for_exec(
ulong sql_type,