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 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-28 09:38:59 +03:00
parent 3883eb63dc 1fe4bcbe05
commit 8290a46d50
86 changed files with 1983 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/spd_db_mysql.h
View File

@@ -514,8 +514,6 @@ public:
int *need_mon
);
/** Set the global lock wait time out */
int set_lock_wait_timeout(uint timeout);
/** Reset the global lock wait time out */
int reset_lock_wait_timeout();