Merge lp:~gthorslund/drizzle/add-constraints-to-kernel-sysvars into lp:drizzle/7.0

Proposed by Gustaf Thorslund
Status: Merged
Approved by: Brian Aker
Approved revision: 1978
Merged at revision: 2070
Proposed branch: lp:~gthorslund/drizzle/add-constraints-to-kernel-sysvars
Merge into: lp:drizzle/7.0
Diff against target: 87 lines (+0/-35)
1 file modified
drizzled/drizzled.cc (+0/-35)
To merge this branch: bzr merge lp:~gthorslund/drizzle/add-constraints-to-kernel-sysvars
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+45525@code.launchpad.net

Description of the change

Some sys_vars fixed earlier.

To post a comment you must log in.
1978. By Gustaf Thorslund

https://blueprints.launchpad.net/drizzle/+spec/add-constraints-to-kernel-sysvars
  sys_storage_engine
  sys_tmpdir
  sys_scheduler
  sys_system_time_zone

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/drizzled.cc'
2--- drizzled/drizzled.cc 2010-12-30 17:09:51 +0000
3+++ drizzled/drizzled.cc 2011-01-09 19:34:47 +0000
4@@ -1788,14 +1788,6 @@
5 {"datadir", 'h',
6 N_("Path to the database root."),
7 NULL, NULL, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
8- {"default-storage-engine", OPT_STORAGE_ENGINE,
9- N_("Set the default storage engine (table type) for tables."),
10- (char**)&default_storage_engine_str, (char**)&default_storage_engine_str,
11- 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
12- {"default-time-zone", OPT_DEFAULT_TIME_ZONE,
13- N_("Set the default time zone."),
14- (char**) &default_tz_name, (char**) &default_tz_name,
15- 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
16 /* See how it's handled in get_one_option() */
17 {"exit-info", 'T',
18 N_("Used for debugging; Use at your own risk!"),
19@@ -1806,11 +1798,6 @@
20 N_("Set up signals usable for debugging"),
21 (char**) &opt_debugging, (char**) &opt_debugging,
22 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
23- {"lc-time-names", OPT_LC_TIME_NAMES,
24- N_("Set the language used for the month names and the days of the week."),
25- (char**) &lc_time_names_name,
26- (char**) &lc_time_names_name,
27- 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
28 {"log-warnings", 'W',
29 N_("Log some not critical warnings to the log file."),
30 (char**) &global_system_variables.log_warnings,
31@@ -1853,10 +1840,6 @@
32 "supported)"),
33 (char**) &internal::timed_mutexes, (char**) &internal::timed_mutexes, 0, GET_BOOL, NO_ARG, 0,
34 0, 0, 0, 0, 0},
35- {"tmpdir", 't',
36- N_("Path for temporary files."),
37- (char**) &opt_drizzle_tmpdir,
38- (char**) &opt_drizzle_tmpdir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
39 {"transaction-isolation", OPT_TX_ISOLATION,
40 N_("Default transaction isolation level."),
41 0, 0, 0, GET_STR, REQUIRED_ARG, 0,
42@@ -1865,10 +1848,6 @@
43 N_("Run drizzled daemon as user."),
44 0, 0, 0, GET_STR, REQUIRED_ARG,
45 0, 0, 0, 0, 0, 0},
46- {"version", 'V',
47- N_("Output version information and exit."),
48- 0, 0, 0, GET_NO_ARG,
49- NO_ARG, 0, 0, 0, 0, 0, 0},
50 {"back_log", OPT_BACK_LOG,
51 N_("The number of outstanding connection requests Drizzle can have. This "
52 "comes into play when the main Drizzle thread gets very many connection "
53@@ -1887,11 +1866,6 @@
54 (char**) &global_system_variables.div_precincrement,
55 (char**) &max_system_variables.div_precincrement, 0, GET_UINT,
56 REQUIRED_ARG, 4, 0, DECIMAL_MAX_SCALE, 0, 0, 0},
57- { "group_concat_max_len", OPT_GROUP_CONCAT_MAX_LEN,
58- N_("The maximum length of the result of function group_concat."),
59- (char**) &global_system_variables.group_concat_max_len,
60- (char**) &max_system_variables.group_concat_max_len, 0, GET_UINT64,
61- REQUIRED_ARG, 1024, 4, ULONG_MAX, 0, 1, 0},
62 { "join_buffer_size", OPT_JOIN_BUFF_SIZE,
63 N_("The size of the buffer that is used for full joins."),
64 (char**) &global_system_variables.join_buff_size,
65@@ -1908,11 +1882,6 @@
66 "host this host will be blocked from further connections."),
67 (char**) &max_connect_errors, (char**) &max_connect_errors, 0, GET_UINT64,
68 REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ULONG_MAX, 0, 1, 0},
69- {"max_error_count", OPT_MAX_ERROR_COUNT,
70- N_("Max number of errors/warnings to store for a statement."),
71- (char**) &global_system_variables.max_error_count,
72- (char**) &max_system_variables.max_error_count,
73- 0, GET_UINT64, REQUIRED_ARG, DEFAULT_ERROR_COUNT, 0, 65535, 0, 1, 0},
74 {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE,
75 N_("Don't allow creation of heap tables bigger than this."),
76 (char**) &global_system_variables.max_heap_table_size,
77@@ -2032,10 +2001,6 @@
78 (char**) &max_system_variables.read_rnd_buff_size, 0,
79 GET_UINT, REQUIRED_ARG, 256*1024L, 64 /*IO_SIZE*2+MALLOC_OVERHEAD*/ ,
80 UINT32_MAX, MALLOC_OVERHEAD, 1 /* Small lower limit to be able to test MRR */, 0},
81- {"scheduler", OPT_SCHEDULER,
82- N_("Select scheduler to be used (by default multi-thread)."),
83- (char**)&opt_scheduler, (char**)&opt_scheduler,
84- 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
85 /* x8 compared to MySQL's x2. We have UTF8 to consider. */
86 {"sort_buffer_size", OPT_SORT_BUFFER,
87 N_("Each thread that needs to do a sort allocates a buffer of this size."),

Subscribers

People subscribed via source and target branches