~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2008-11-25 18:01:59 UTC
  • Revision ID: brian@tangent.org-20081125180159-ym9v3mnxcdqnogb8
ulong fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
140
140
 
141
141
static sys_var_chain vars = { NULL, NULL };
142
142
 
143
 
static sys_var_session_ulong
 
143
static sys_var_session_uint32_t
144
144
sys_auto_increment_increment(&vars, "auto_increment_increment",
145
145
                             &SV::auto_increment_increment, NULL, NULL,
146
146
                             sys_var::SESSION_VARIABLE_IN_BINLOG);
147
 
static sys_var_session_ulong
 
147
static sys_var_session_uint32_t
148
148
sys_auto_increment_offset(&vars, "auto_increment_offset",
149
149
                          &SV::auto_increment_offset, NULL, NULL,
150
150
                          sys_var::SESSION_VARIABLE_IN_BINLOG);
187
187
sys_var_str             sys_init_slave(&vars, "init_slave", 0,
188
188
                                       sys_update_init_slave,
189
189
                                       sys_default_init_slave,0);
190
 
static sys_var_session_ulong    sys_interactive_timeout(&vars, "interactive_timeout",
191
 
                                                &SV::net_interactive_timeout);
192
 
static sys_var_session_ulong    sys_join_buffer_size(&vars, "join_buffer_size",
193
 
                                             &SV::join_buff_size);
 
190
static sys_var_session_uint32_t sys_interactive_timeout(&vars, "interactive_timeout",
 
191
                                                        &SV::net_interactive_timeout);
 
192
static sys_var_session_uint64_t sys_join_buffer_size(&vars, "join_buffer_size",
 
193
                                                     &SV::join_buff_size);
194
194
static sys_var_key_buffer_size  sys_key_buffer_size(&vars, "key_buffer_size");
195
195
static sys_var_key_cache_long  sys_key_cache_block_size(&vars, "key_cache_block_size",
196
 
                                                 offsetof(KEY_CACHE,
197
 
                                                          param_block_size));
 
196
                                                        offsetof(KEY_CACHE,
 
197
                                                                 param_block_size));
198
198
static sys_var_key_cache_long   sys_key_cache_division_limit(&vars, "key_cache_division_limit",
199
 
                                                     offsetof(KEY_CACHE,
200
 
                                                              param_division_limit));
 
199
                                                           offsetof(KEY_CACHE,
 
200
                                                                    param_division_limit));
201
201
static sys_var_key_cache_long  sys_key_cache_age_threshold(&vars, "key_cache_age_threshold",
202
 
                                                     offsetof(KEY_CACHE,
203
 
                                                              param_age_threshold));
 
202
                                                           offsetof(KEY_CACHE,
 
203
                                                                    param_age_threshold));
204
204
static sys_var_bool_ptr sys_local_infile(&vars, "local_infile",
205
 
                                         &opt_local_infile);
 
205
                                         &opt_local_infile);
206
206
static sys_var_session_bool     sys_low_priority_updates(&vars, "low_priority_updates",
207
 
                                                 &SV::low_priority_updates,
208
 
                                                 fix_low_priority_updates);
 
207
                                                     &SV::low_priority_updates,
 
208
                                                     fix_low_priority_updates);
209
209
#ifndef TO_BE_DELETED   /* Alias for the low_priority_updates */
210
210
static sys_var_session_bool     sys_sql_low_priority_updates(&vars, "sql_low_priority_updates",
211
 
                                                     &SV::low_priority_updates,
212
 
                                                     fix_low_priority_updates);
 
211
                                                         &SV::low_priority_updates,
 
212
                                                         fix_low_priority_updates);
213
213
#endif
214
 
static sys_var_session_ulong    sys_max_allowed_packet(&vars, "max_allowed_packet",
215
 
                                               &SV::max_allowed_packet);
 
214
static sys_var_session_uint32_t sys_max_allowed_packet(&vars, "max_allowed_packet",
 
215
                                                       &SV::max_allowed_packet);
216
216
static sys_var_long_ptr sys_max_binlog_cache_size(&vars, "max_binlog_cache_size",
217
 
                                                  &max_binlog_cache_size);
 
217
                                                  &max_binlog_cache_size);
218
218
static sys_var_long_ptr sys_max_binlog_size(&vars, "max_binlog_size",
219
 
                                            &max_binlog_size,
 
219
                                            &max_binlog_size,
220
220
                                            fix_max_binlog_size);
221
221
static sys_var_long_ptr sys_max_connections(&vars, "max_connections",
222
 
                                            &max_connections,
 
222
                                            &max_connections,
223
223
                                            fix_max_connections);
224
224
static sys_var_long_ptr sys_max_connect_errors(&vars, "max_connect_errors",
225
 
                                               &max_connect_errors);
226
 
static sys_var_session_ulong    sys_max_error_count(&vars, "max_error_count",
227
 
                                            &SV::max_error_count);
 
225
                                               &max_connect_errors);
 
226
static sys_var_session_uint64_t sys_max_error_count(&vars, "max_error_count",
 
227
                                                  &SV::max_error_count);
228
228
static sys_var_session_uint64_t sys_max_heap_table_size(&vars, "max_heap_table_size",
229
 
                                                &SV::max_heap_table_size);
 
229
                                                        &SV::max_heap_table_size);
230
230
static sys_var_session_uint64_t sys_pseudo_thread_id(&vars, "pseudo_thread_id",
231
231
                                              &SV::pseudo_thread_id,
232
232
                                              0, check_pseudo_thread_id,
257
257
                                                &SV::myisam_stats_method,
258
258
                                                &myisam_stats_method_typelib,
259
259
                                                NULL);
260
 
static sys_var_session_ulong    sys_net_buffer_length(&vars, "net_buffer_length",
261
 
                                              &SV::net_buffer_length);
262
 
static sys_var_session_ulong    sys_net_read_timeout(&vars, "net_read_timeout",
263
 
                                             &SV::net_read_timeout,
264
 
                                             0, fix_net_read_timeout);
265
 
static sys_var_session_ulong    sys_net_write_timeout(&vars, "net_write_timeout",
266
 
                                              &SV::net_write_timeout,
267
 
                                              0, fix_net_write_timeout);
268
 
static sys_var_session_ulong    sys_net_retry_count(&vars, "net_retry_count",
269
 
                                            &SV::net_retry_count,
270
 
                                            0, fix_net_retry_count);
 
260
static sys_var_session_uint32_t sys_net_buffer_length(&vars, "net_buffer_length",
 
261
                                                      &SV::net_buffer_length);
 
262
static sys_var_session_uint32_t sys_net_read_timeout(&vars, "net_read_timeout",
 
263
                                                     &SV::net_read_timeout,
 
264
                                                     0, fix_net_read_timeout);
 
265
static sys_var_session_uint32_t sys_net_write_timeout(&vars, "net_write_timeout",
 
266
                                                      &SV::net_write_timeout,
 
267
                                                      0, fix_net_write_timeout);
 
268
static sys_var_session_uint32_t sys_net_retry_count(&vars, "net_retry_count",
 
269
                                                    &SV::net_retry_count,
 
270
                                                    0, fix_net_retry_count);
271
271
static sys_var_session_bool     sys_new_mode(&vars, "new", &SV::new_mode);
272
272
static sys_var_bool_ptr_readonly sys_old_mode(&vars, "old",
273
 
                                       &global_system_variables.old_mode);
 
273
                                              &global_system_variables.old_mode);
274
274
/* these two cannot be static */
275
275
sys_var_session_bool                sys_old_alter_table(&vars, "old_alter_table",
276
 
                                            &SV::old_alter_table);
 
276
                                                        &SV::old_alter_table);
277
277
static sys_var_session_ulong        sys_optimizer_prune_level(&vars, "optimizer_prune_level",
278
 
                                                  &SV::optimizer_prune_level);
 
278
                                                              &SV::optimizer_prune_level);
279
279
static sys_var_session_ulong        sys_optimizer_search_depth(&vars, "optimizer_search_depth",
280
 
                                                   &SV::optimizer_search_depth);
 
280
                                                               &SV::optimizer_search_depth);
281
281
 
282
282
const char *optimizer_use_mrr_names[] = {"auto", "force", "disable", NULL};
283
283
TYPELIB optimizer_use_mrr_typelib= {
372
372
                                                    MACHINE_TYPE);
373
373
static sys_var_const_str        sys_version_compile_os(&vars, "version_compile_os",
374
374
                                               SYSTEM_TYPE);
375
 
static sys_var_session_ulong    sys_net_wait_timeout(&vars, "wait_timeout",
376
 
                                             &SV::net_wait_timeout);
 
375
static sys_var_session_uint32_t sys_net_wait_timeout(&vars, "wait_timeout",
 
376
                                                     &SV::net_wait_timeout);
377
377
 
378
378
/* Condition pushdown to storage engine */
379
379
static sys_var_session_bool