Drizzle

Merge lp:~linuxjedi/drizzle/drizzle-gcc-4.7.0 into lp:drizzle

  1. drizzle-gcc-4.7.0
  2. Merge into 7.2
Proposed by Andrew Hutchings
Status: Merged
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~linuxjedi/drizzle/drizzle-gcc-4.7.0
Merge into: lp:drizzle
Diff against target: 86 lines (+10/-10)
1 file modified
drizzled/drizzled.cc (+10/-10)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/drizzle-gcc-4.7.0
Reviewer Review Type Date Requested Status
Olaf van der Spek (community) Needs Fixing
Drizzle Trunk Pending
Review via email: mp+102983@code.launchpad.net

Description of the change

Fixes for GCC 4.7.0. This combined with the bison fix makes us good for Fedora 17 compiling.

To post a comment you must log in.
Revision history for this message
Olaf van der Spek (olafvdspek) wrote :

Hi Andrew,

Why not update MAX_MEM_TABLE_SIZE to fix in int64?

review: Needs Fixing
Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

well, really the fact that the variable in the struct is an int64_t probably more of an issue. As far as the visual representation is concerned we want these to be uint64.

Revision history for this message
Olaf van der Spek (olafvdspek) wrote :

Why? Are values this big needed?
Are negative values never used?

Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

bigger than uint32_t, yes. Most of these are positive only (such as memory size)

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 2012-04-18 23:08:45 +0000
3+++ drizzled/drizzled.cc 2012-04-21 21:13:20 +0000
4@@ -1753,7 +1753,7 @@
5 "a limit per thread!"),
6 (char**) &global_system_variables.bulk_insert_buff_size,
7 NULL,
8- 0, GET_ULL, REQUIRED_ARG, 8192*1024, 0, ULONG_MAX, 0, 1, 0},
9+ 0, GET_ULL, REQUIRED_ARG, 8192*1024, 0, (int64_t)ULONG_MAX, 0, 1, 0},
10 { "div_precision_increment", OPT_DIV_PRECINCREMENT,
11 N_("Precision of the result of '/' operator will be increased on that "
12 "value."),
13@@ -1764,7 +1764,7 @@
14 N_("The size of the buffer that is used for full joins."),
15 (char**) &global_system_variables.join_buff_size,
16 NULL, 0, GET_UINT64,
17- REQUIRED_ARG, 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ULONG_MAX,
18+ REQUIRED_ARG, 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, (int64_t)ULONG_MAX,
19 MALLOC_OVERHEAD, IO_SIZE, 0},
20 {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET,
21 N_("Max packetlength to send/receive from to server."),
22@@ -1775,7 +1775,7 @@
23 N_("Don't allow creation of heap tables bigger than this."),
24 (char**) &global_system_variables.max_heap_table_size,
25 NULL, 0, GET_ULL,
26- REQUIRED_ARG, 16*1024*1024L, 16384, MAX_MEM_TABLE_SIZE,
27+ REQUIRED_ARG, 16*1024*1024L, 16384, (int64_t)MAX_MEM_TABLE_SIZE,
28 MALLOC_OVERHEAD, 1024, 0},
29 {"max_join_size", OPT_MAX_JOIN_SIZE,
30 N_("Joins that are probably going to read more than max_join_size records "
31@@ -1792,7 +1792,7 @@
32 N_("Limit assumed max number of seeks when looking up rows based on a key"),
33 (char**) &global_system_variables.max_seeks_for_key,
34 NULL, 0, GET_UINT64,
35- REQUIRED_ARG, ULONG_MAX, 1, ULONG_MAX, 0, 1, 0 },
36+ REQUIRED_ARG, (int64_t)ULONG_MAX, 1, (int64_t)ULONG_MAX, 0, 1, 0 },
37 {"max_sort_length", OPT_MAX_SORT_LENGTH,
38 N_("The number of bytes to use when sorting BLOB or TEXT values "
39 "(only the first max_sort_length bytes of each value are used; the "
40@@ -1803,13 +1803,13 @@
41 {"max_write_lock_count", OPT_MAX_WRITE_LOCK_COUNT,
42 N_("After this many write locks, allow some read locks to run in between."),
43 (char**) &max_write_lock_count, NULL, 0, GET_ULL,
44- REQUIRED_ARG, ULONG_MAX, 1, ULONG_MAX, 0, 1, 0},
45+ REQUIRED_ARG, (int64_t)ULONG_MAX, 1, (int64_t)ULONG_MAX, 0, 1, 0},
46 {"min_examined_row_limit", OPT_MIN_EXAMINED_ROW_LIMIT,
47 N_("Don't log queries which examine less than min_examined_row_limit "
48 "rows to file."),
49 (char**) &global_system_variables.min_examined_row_limit,
50 NULL, 0, GET_ULL,
51- REQUIRED_ARG, 0, 0, ULONG_MAX, 0, 1L, 0},
52+ REQUIRED_ARG, 0, 0, (int64_t)ULONG_MAX, 0, 1L, 0},
53 {"optimizer_prune_level", OPT_OPTIMIZER_PRUNE_LEVEL,
54 N_("Controls the heuristic(s) applied during query optimization to prune "
55 "less-promising partial plans from the optimizer search space. Meaning: "
56@@ -1861,13 +1861,13 @@
57 N_("Allocation block size for query parsing and execution"),
58 (char**) &global_system_variables.query_alloc_block_size,
59 NULL, 0, GET_UINT,
60- REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, ULONG_MAX, 0, 1024, 0},
61+ REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, (int64_t)ULONG_MAX, 0, 1024, 0},
62 {"query_prealloc_size", OPT_QUERY_PREALLOC_SIZE,
63 N_("Persistent buffer for query parsing and execution"),
64 (char**) &global_system_variables.query_prealloc_size,
65 NULL, 0, GET_UINT,
66 REQUIRED_ARG, QUERY_ALLOC_PREALLOC_SIZE, QUERY_ALLOC_PREALLOC_SIZE,
67- ULONG_MAX, 0, 1024, 0},
68+ (int64_t)ULONG_MAX, 0, 1024, 0},
69 {"range_alloc_block_size", OPT_RANGE_ALLOC_BLOCK_SIZE,
70 N_("Allocation block size for storing ranges during optimization"),
71 (char**) &global_system_variables.range_alloc_block_size,
72@@ -1915,13 +1915,13 @@
73 (char**) &my_thread_stack_size,
74 NULL, 0, GET_SIZE,
75 REQUIRED_ARG,0,
76- UINT32_C(1024*512), SIZE_MAX, 0, 1024, 0},
77+ UINT32_C(1024*512), (int64_t)SIZE_MAX, 0, 1024, 0},
78 {"tmp_table_size", OPT_TMP_TABLE_SIZE,
79 N_("If an internal in-memory temporary table exceeds this size, Drizzle will"
80 " automatically convert it to an on-disk MyISAM table."),
81 (char**) &global_system_variables.tmp_table_size,
82 NULL, 0, GET_ULL,
83- REQUIRED_ARG, 16*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},
84+ REQUIRED_ARG, 16*1024*1024L, 1024, (int64_t)MAX_MEM_TABLE_SIZE, 0, 1, 0},
85 {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
86 };
87

Subscribers

People subscribed via source and target branches