diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2002-12-30 01:59:08 +0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2002-12-30 01:59:08 +0400 |
| commit | af3f9524f16819912b1f552eb1a15c2c0c9f3f95 (patch) | |
| tree | f63622989469d4b9dfa89f03428a5bbfc67b74c9 /sql/sql_class.h | |
| parent | a3fecf4ad407ceb34c428e1f7fe36663d5ffbd6a (diff) | |
| parent | 8dceb7c051526e9ceeedb19d91bd146bc2c32683 (diff) | |
| download | mariadb-git-af3f9524f16819912b1f552eb1a15c2c0c9f3f95.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1
BitKeeper/etc/logging_ok:
auto-union
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7ca66d9ffb7..e6fcdde31a6 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -370,6 +370,12 @@ struct system_variables ulong tmp_table_size; ulong tx_isolation; + /* + In slave thread we need to know in behalf of which + thread the query is being run to replicate temp tables properly + */ + ulong pseudo_thread_id; + my_bool log_warnings; my_bool low_priority_updates; @@ -525,11 +531,6 @@ public: each thread that is using LOG_INFO needs to adjust the pointer to it */ LOG_INFO* current_linfo; - /* - In slave thread we need to know in behalf of which - thread the query is being run to replicate temp tables properly - */ - 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 */ |