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.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-03-11 17:52:49 +01:00
parent 9d7ed94f6a b7362d5fbc
commit fad47df995
132 changed files with 2878 additions and 2138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -3390,7 +3390,10 @@ public:
void reset_for_reuse();
bool store_globals();
void reset_globals();
bool trace_started();
bool trace_started()
{
return opt_trace.is_started();
}
#ifdef SIGNAL_WITH_VIO_CLOSE
inline void set_active_vio(Vio* vio)
{
@ -5137,6 +5140,7 @@ public:
Item *sp_fix_func_item(Item **it_addr);
Item *sp_prepare_func_item(Item **it_addr, uint cols= 1);
bool sp_eval_expr(Field *result_field, Item **expr_item_ptr);
};
/** A short cut for thd->get_stmt_da()->set_ok_status(). */