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 10.6 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-10 11:22:21 +03:00
parent c358e216d9 6ed14bcc06
commit 7cde5c539b
39 changed files with 698 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.h
View File

@@ -3009,9 +3009,9 @@ public:
void set_impossible_where() { impossible_where= true; }
void set_no_partitions() { no_partitions= true; }
Explain_update* save_explain_update_data(MEM_ROOT *mem_root, THD *thd);
Explain_update* save_explain_update_data(THD *thd, MEM_ROOT *mem_root);
protected:
bool save_explain_data_intern(MEM_ROOT *mem_root, Explain_update *eu, bool is_analyze);
bool save_explain_data_intern(THD *thd, MEM_ROOT *mem_root, Explain_update *eu, bool is_analyze);
public:
virtual ~Update_plan() = default;
@@ -3046,7 +3046,7 @@ public:
deleting_all_rows= false;
}
Explain_delete* save_explain_delete_data(MEM_ROOT *mem_root, THD *thd);
Explain_delete* save_explain_delete_data(THD *thd, MEM_ROOT *mem_root);
};
enum account_lock_type