database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2018-01-29 12:44:20 +04:00
parent b4a2baffa8 b12430adc7
commit c7a2f23a7b
56 changed files with 639 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sql/sql_class.h
View File

@ -4707,6 +4707,10 @@ public:
*/
bool restore_from_local_lex_to_old_lex(LEX *oldlex);
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);
inline void prepare_logs_for_admin_command()
{
enable_slow_log&= !MY_TEST(variables.log_slow_disabled_statements &
@ -6412,6 +6416,48 @@ public:
};
/*
A helper class to set THD flags to emit warnings/errors in case of
overflow/type errors during assigning values into the SP variable fields.
Saves original flags values in constructor.
Restores original flags in destructor.
*/
class Sp_eval_expr_state
{
THD *m_thd;
enum_check_fields m_count_cuted_fields;
bool m_abort_on_warning;
bool m_stmt_modified_non_trans_table;
void start()
{
m_thd->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL;
m_thd->abort_on_warning= m_thd->is_strict_mode();
m_thd->transaction.stmt.modified_non_trans_table= false;
}
void stop()
{
m_thd->count_cuted_fields= m_count_cuted_fields;
m_thd->abort_on_warning= m_abort_on_warning;
m_thd->transaction.stmt.modified_non_trans_table=
m_stmt_modified_non_trans_table;
}
public:
Sp_eval_expr_state(THD *thd)
:m_thd(thd),
m_count_cuted_fields(thd->count_cuted_fields),
m_abort_on_warning(thd->abort_on_warning),
m_stmt_modified_non_trans_table(thd->transaction.stmt.
modified_non_trans_table)
{
start();
}
~Sp_eval_expr_state()
{
stop();
}
};
#ifndef DBUG_OFF
void dbug_serve_apcs(THD *thd, int n_calls);
#endif