1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "MDEV-13115: SKIP LOCKED postfix"

Browse Source 
This reverts commit 51630d595d49c57946d71ab5cb06a552dc19d4be.

Monty has more comprehensive fix coming in his branch.
This commit is contained in:
Daniel Black 2021-04-10 11:18:05 +10:00
parent 51630d595d
commit 88af187db9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_lex.h
View File

@ -1295,14 +1295,14 @@ public:
bool exclude_from_table_unique_test;
/* the select is "service-select" and can not have tables*/
bool is_service_select;
/* SELECT [FOR UPDATE/LOCK IN SHARE MODE] [SKIP LOCKED] */
bool skip_locked;
enum select_lock_type {NONE, IN_SHARE_MODE, FOR_UPDATE};
enum select_lock_type select_lock;
/* index in the select list of the expression currently being fixed */
int cur_pos_in_select_list;
/* SELECT [FOR UPDATE/LOCK IN SHARE MODE] [SKIP LOCKED] */
enum select_lock_type {NONE, IN_SHARE_MODE, FOR_UPDATE};
enum select_lock_type select_lock;
bool skip_locked;
List<udf_func> udf_list; /* udf function calls stack */
/*