~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/server_includes.h

  • Committer: Monty Taylor
  • Date: 2009-03-04 02:48:12 UTC
  • mto: (917.1.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 918.
  • Revision ID: mordred@inaugust.com-20090304024812-5wb6wpye5c1iitbq
Applied atomic patch to current tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
115
115
extern uint64_t log_10_int[20];
116
116
extern uint64_t keybuff_size;
117
117
extern uint64_t session_startup_options;
118
 
extern ulong thread_id;
119
118
extern uint64_t aborted_threads;
120
119
extern uint64_t aborted_connects;
121
120
extern uint64_t slow_launch_threads;
144
143
extern ulong log_output_options;
145
144
extern bool opt_character_set_client_handshake;
146
145
extern bool volatile abort_loop, shutdown_in_progress;
147
 
extern uint32_t volatile thread_count, thread_running, global_read_lock;
148
 
extern uint32_t connection_count;
 
146
extern uint32_t volatile thread_running, global_read_lock;
149
147
extern bool opt_sql_bin_update;
150
148
extern bool opt_safe_user_create;
151
149
extern bool opt_no_mix_types;
167
165
       LOCK_timezone,
168
166
       LOCK_global_read_lock,
169
167
       LOCK_global_system_variables, LOCK_user_conn,
170
 
       LOCK_bytes_sent, LOCK_bytes_received, LOCK_connection_count;
 
168
       LOCK_bytes_sent, LOCK_bytes_received;
171
169
extern pthread_mutex_t LOCK_server_started;
172
170
extern pthread_rwlock_t LOCK_sys_init_connect;
173
171
extern pthread_rwlock_t LOCK_system_variables_hash;