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.1 into 11.2

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 15:49:24 +03:00
parent 742f960eeb c6ac1e39b6
commit e81fa34502
212 changed files with 4735 additions and 2471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_lex.h
View File

@@ -3065,9 +3065,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;
@@ -3102,7 +3102,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
@@ -3533,6 +3533,12 @@ public:
sp_name *spname;
MEM_ROOT sp_mem_root, *sp_mem_root_ptr;
void delete_if_not_sp_lex_in_use()
{
if (!sp_lex_in_use)
delete this;
}
sp_pcontext *spcont;
st_sp_chistics sp_chistics;