diff options
author | unknown <monty@donna.mysql.com> | 2000-10-04 23:22:53 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-10-04 23:22:53 +0300 |
commit | d5a08d650617f70184385f703bd66264423983ff (patch) | |
tree | 63809510cb93baca8254eae9a6e89e290209407a /sql/sql_class.h | |
parent | 9c7ce9fe79d8df2cddb0b661223be134a495951d (diff) | |
parent | 4862cd1c7c4df4f308331167a0ba3ca75974364b (diff) | |
download | mariadb-git-d5a08d650617f70184385f703bd66264423983ff.tar.gz |
merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Docs/manual.texi:
Merge
support-files/mysql.spec.sh:
Merge
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 212a641f335..0543221799f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -264,6 +264,7 @@ public: ulonglong next_insert_id,last_insert_id,current_insert_id; ha_rows select_limit,offset_limit,default_select_limit,cuted_fields, max_join_size,sent_row_count; + table_map used_tables; ulong query_id,version, inactive_timeout,options,thread_id; long dbug_thread_id; pthread_t real_id; |