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 branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-04 14:11:46 +01:00
parent 3351dfaab0 d87979b48c
commit 9ed8deb656
910 changed files with 20135 additions and 6204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@@ -1232,7 +1232,7 @@ public:
void free_items();
/* Close the active state associated with execution of this statement */
virtual void cleanup_stmt(bool /*restore_set_statement_vars*/);
virtual bool cleanup_stmt(bool /*restore_set_statement_vars*/);
};
@@ -5374,9 +5374,9 @@ public:
thr_timer_end(&query_timer);
#endif
}
void restore_set_statement_var()
bool restore_set_statement_var()
{
main_lex.restore_set_statement_var();
return main_lex.restore_set_statement_var();
}
/* Copy relevant `stmt` transaction flags to `all` transaction. */
void merge_unsafe_rollback_flags()