database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-05-12 17:20:23 +02:00
parent a89f199c64 8ce702aa90
commit c51f85f882
255 changed files with 3975 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.h
View File

@ -1229,7 +1229,7 @@ public:
TABLE_LIST *convert_right_join();
List<Item>* get_item_list();
ulong get_table_join_options();
void set_lock_for_tables(thr_lock_type lock_type);
void set_lock_for_tables(thr_lock_type lock_type, bool for_update);
inline void init_order()
{
order_list.elements= 0;