← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Lee Bieber
  • Date: 2011-01-18 20:05:06 UTC
  • mfrom: (2094.1.6 build)
  • Revision ID: kalebral@gmail.com-20110118200506-r1v72y174j5x7j0i
Merge Brian - fix processlist test, was failing under lcov
Merge Marisa - fix bug 684803: Need to update Drizzledump documentation with migration conversions / caveats
Merge Marisa - fix bug #686641: Need to document removal of multi-table update/delete from Drizzle
Merge Monty - fix bug 567387: quotes now appearing around module name and author in data_dicionary view
Merge Monty - fix bug 658752: Incorrect datadir value being stored
Merge Andrew - fix bug 680872: max-connect-errors appears to be unused 
Merge Stewart - Haildb updates, ANALYZE table as well as improved index statistics

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
149
149
                                                     &drizzle_system_variables::join_buff_size);
150
150
static sys_var_session_uint32_t sys_max_allowed_packet("max_allowed_packet",
151
151
                                                       &drizzle_system_variables::max_allowed_packet);
152
 
static sys_var_uint64_t_ptr     sys_max_connect_errors("max_connect_errors",
153
 
                                               &max_connect_errors);
154
152
static sys_var_session_uint64_t sys_max_error_count("max_error_count",
155
153
                                                  &drizzle_system_variables::max_error_count);
156
154
static sys_var_session_uint64_t sys_max_heap_table_size("max_heap_table_size",
1548
1546
    add_sys_var_to_list(&sys_last_insert_id, my_long_options);
1549
1547
    add_sys_var_to_list(&sys_lc_time_names, my_long_options);
1550
1548
    add_sys_var_to_list(&sys_max_allowed_packet, my_long_options);
1551
 
    add_sys_var_to_list(&sys_max_connect_errors, my_long_options);
1552
1549
    add_sys_var_to_list(&sys_max_error_count, my_long_options);
1553
1550
    add_sys_var_to_list(&sys_max_heap_table_size, my_long_options);
1554
1551
    add_sys_var_to_list(&sys_max_join_size, my_long_options);