sql_class.h:
After merge changes. sql/sql_class.h: After merge changes.
This commit is contained in:
parent
597ca958a0
commit
d24df2c6a7
@ -423,6 +423,8 @@ typedef struct system_status_var
|
|||||||
|
|
||||||
#define last_system_status_var com_stmt_close
|
#define last_system_status_var com_stmt_close
|
||||||
|
|
||||||
|
void mark_transaction_to_rollback(THD *thd, bool all);
|
||||||
|
|
||||||
#ifdef MYSQL_SERVER
|
#ifdef MYSQL_SERVER
|
||||||
|
|
||||||
void free_tmp_table(THD *thd, TABLE *entry);
|
void free_tmp_table(THD *thd, TABLE *entry);
|
||||||
@ -2464,7 +2466,6 @@ public:
|
|||||||
/* Functions in sql_class.cc */
|
/* Functions in sql_class.cc */
|
||||||
|
|
||||||
void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var);
|
void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var);
|
||||||
void mark_transaction_to_rollback(THD *thd, bool all);
|
|
||||||
|
|
||||||
void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
|
void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
|
||||||
STATUS_VAR *dec_var);
|
STATUS_VAR *dec_var);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user