← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

Merged Eric from lp:~eday/drizzle/eday-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
98
98
static void fix_tx_isolation(Session *session, enum_var_type type);
99
99
static int check_completion_type(Session *session, set_var *var);
100
100
static void fix_completion_type(Session *session, enum_var_type type);
101
 
static void fix_net_read_timeout(Session *session, enum_var_type type);
102
 
static void fix_net_write_timeout(Session *session, enum_var_type type);
103
 
static void fix_net_retry_count(Session *session, enum_var_type type);
104
101
static void fix_max_join_size(Session *session, enum_var_type type);
105
102
static void fix_session_mem_root(Session *session, enum_var_type type);
106
103
static void fix_trans_mem_root(Session *session, enum_var_type type);
141
138
                                                    fix_completion_type);
142
139
static sys_var_collation_sv
143
140
sys_collation_server(&vars, "collation_server", &SV::collation_server, &default_charset_info);
144
 
static sys_var_uint32_t_ptr     sys_connect_timeout(&vars, "connect_timeout",
145
 
                                                &connect_timeout);
146
141
static sys_var_const_str       sys_datadir(&vars, "datadir", drizzle_real_data_home);
147
142
static sys_var_enum             sys_delay_key_write(&vars, "delay_key_write",
148
143
                                            &delay_key_write_options,
193
188
                                                            NULL);
194
189
static sys_var_session_uint32_t sys_net_buffer_length(&vars, "net_buffer_length",
195
190
                                                      &SV::net_buffer_length);
196
 
static sys_var_session_uint32_t sys_net_read_timeout(&vars, "net_read_timeout",
197
 
                                                     &SV::net_read_timeout,
198
 
                                                     0, fix_net_read_timeout);
199
 
static sys_var_session_uint32_t sys_net_write_timeout(&vars, "net_write_timeout",
200
 
                                                      &SV::net_write_timeout,
201
 
                                                      0, fix_net_write_timeout);
202
 
static sys_var_session_uint32_t sys_net_retry_count(&vars, "net_retry_count",
203
 
                                                    &SV::net_retry_count,
204
 
                                                    0, fix_net_retry_count);
205
191
/* these two cannot be static */
206
192
static sys_var_session_bool sys_optimizer_prune_level(&vars, "optimizer_prune_level",
207
193
                                                      &SV::optimizer_prune_level);
270
256
                                                 HOST_OS);
271
257
static sys_var_const_str        sys_version_compile_vendor(&vars, "version_compile_vendor",
272
258
                                                 HOST_VENDOR);
273
 
static sys_var_session_uint32_t sys_net_wait_timeout(&vars, "wait_timeout",
274
 
                                                     &SV::net_wait_timeout);
275
259
 
276
260
/* Variables that are bits in Session */
277
261
 
445
429
}
446
430
 
447
431
 
448
 
/*
449
 
  If we are changing the thread variable, we have to copy it to Protocol too
450
 
*/
451
 
 
452
 
static void fix_net_read_timeout(Session *session, enum_var_type type)
453
 
{
454
 
  if (type != OPT_GLOBAL)
455
 
    session->protocol->setReadTimeout(session->variables.net_read_timeout);
456
 
}
457
 
 
458
 
 
459
 
static void fix_net_write_timeout(Session *session, enum_var_type type)
460
 
{
461
 
  if (type != OPT_GLOBAL)
462
 
    session->protocol->setWriteTimeout(session->variables.net_write_timeout);
463
 
}
464
 
 
465
 
static void fix_net_retry_count(Session *session, enum_var_type type)
466
 
{
467
 
  if (type != OPT_GLOBAL)
468
 
    session->protocol->setRetryCount(session->variables.net_retry_count);
469
 
}
470
 
 
471
 
 
472
432
extern void fix_delay_key_write(Session *, enum_var_type)
473
433
{
474
434
  switch ((enum_delay_key_write) delay_key_write_options) {