diff options
| author | unknown <serg@serg.mylan> | 2004-08-20 21:56:29 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-20 21:56:29 +0200 |
| commit | adf4e7a82284e5cbacff5c38e02064e73533b997 (patch) | |
| tree | d3bc4a6cf5270e88d92f8b8cc86572fd34a9405c /sql/sql_class.h | |
| parent | 91df160829a7e7699f2665716d860da069cd0f95 (diff) | |
| parent | 4f0e2da3169968b826f0b180dfe5de0ca99b40b9 (diff) | |
| download | mariadb-git-adf4e7a82284e5cbacff5c38e02064e73533b997.tar.gz | |
merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 875f60d6806..cdcb389292c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -812,7 +812,7 @@ public: ulong row_count; // Row counter, mainly for errors and warnings long dbug_thread_id; pthread_t real_id; - uint current_tablenr,tmp_table; + uint current_tablenr,tmp_table,global_read_lock; uint server_status,open_options,system_thread; uint32 db_length; uint select_number; //number of select (used for EXPLAIN) @@ -831,7 +831,7 @@ public: bool no_errors, password, is_fatal_error; bool query_start_used,last_insert_id_used,insert_id_used,rand_used; bool time_zone_used; - bool in_lock_tables,global_read_lock; + bool in_lock_tables; bool query_error, bootstrap, cleanup_done; bool tmp_table_used; bool charset_is_system_charset, charset_is_collation_connection; |