diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-11 02:00:51 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-11 02:00:51 +0500 |
| commit | 6aa5fa3a1dbbee863fb4a0da153cedff6b69a418 (patch) | |
| tree | 2380b8a509f41895330745de2a1f4255304c4929 /sql/sql_class.h | |
| parent | 6930ac54068b88ce5ca2476f70d74ddb42f5d9fc (diff) | |
| parent | 124ad307e3306fc1de749234b7a4e7708f620d57 (diff) | |
| download | mariadb-git-6aa5fa3a1dbbee863fb4a0da153cedff6b69a418.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_select.cc:
Merge with main tree.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index ef4869fa244..df79d82732f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -424,6 +424,8 @@ typedef struct system_status_var #define last_system_status_var com_stmt_close +void mark_transaction_to_rollback(THD *thd, bool all); + #ifdef MYSQL_SERVER void free_tmp_table(THD *thd, TABLE *entry); @@ -2482,6 +2484,7 @@ public: /* Functions in sql_class.cc */ void add_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); void mark_transaction_to_rollback(THD *thd, bool all); |