diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-22 18:43:46 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-22 18:43:46 +0300 |
| commit | 484a7f61a84912e8506772ae4cbee3880e140b70 (patch) | |
| tree | 6116b622fcbb528013b9fec903f0efd6927f75e2 /sql/sql_class.h | |
| parent | bd6347df9318f46f715615e2a33ff9ba2d9dbb59 (diff) | |
| parent | f300d40aa74525cd4ef2d434f396d70a253fe211 (diff) | |
| download | mariadb-git-484a7f61a84912e8506772ae4cbee3880e140b70.tar.gz | |
After merge fixes
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5e4e6184328..9bf4dc852d7 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -140,7 +140,7 @@ public: bool write(THD *thd, const char *query, uint query_length, time_t query_start=0); bool write(Log_event* event_info); // binary log write - bool write(THD *thd, IO_CACHE *cache); + bool write(THD *thd, IO_CACHE *cache, bool commit_or_rollback); /* v stands for vector @@ -452,7 +452,6 @@ public: /* variables.transaction_isolation is reset to this after each commit */ enum_tx_isolation session_tx_isolation; char scramble[9]; - uint8 query_cache_type; // type of query cache processing bool slave_thread; bool set_query_id,locked,count_cuted_fields,some_tables_deleted; bool no_errors, allow_sum_func, password, fatal_error; @@ -473,7 +472,6 @@ public: */ ulong slave_proxy_id; NET* slave_net; // network connection from slave -> m. - my_off_t log_pos; /* Used by the sys_var class to store temporary values */ union |