Merge lp:~mordred/drizzle/split-session-header into lp:drizzle/7.0
- split-session-header
- Merge into 7.0
Proposed by
Monty Taylor
Status: | Work in progress |
---|---|
Proposed branch: | lp:~mordred/drizzle/split-session-header |
Merge into: | lp:drizzle/7.0 |
Prerequisite: | lp:~mordred/drizzle/give-in-to-pkg-config |
Diff against target: |
1205 lines (+455/-118) (has conflicts) 48 files modified
drizzled/base.h (+1/-1) drizzled/common.h (+0/-1) drizzled/copy_info.h (+121/-0) drizzled/daemon.cc (+5/-0) drizzled/definitions.h (+1/-4) drizzled/filesort.cc (+1/-0) drizzled/function/get_user_var.cc (+1/-0) drizzled/function/set_user_var.cc (+1/-0) drizzled/function/user_var_as_out_param.cc (+1/-0) drizzled/identifier/catalog.cc (+1/-0) drizzled/identifier/schema.cc (+1/-0) drizzled/include.am (+6/-1) drizzled/item/subselect.cc (+7/-0) drizzled/item/sum.cc (+2/-0) drizzled/join.h (+1/-0) drizzled/lex_column.h (+2/-0) drizzled/main.cc (+19/-16) drizzled/module/loader.cc (+0/-2) drizzled/optimizer/quick_index_merge_select.cc (+1/-0) drizzled/optimizer/range.cc (+1/-0) drizzled/select_create.h (+2/-0) drizzled/select_dump.h (+2/-0) drizzled/select_dumpvar.h (+1/-0) drizzled/select_singlerow_subselect.h (+2/-0) drizzled/session.cc (+17/-0) drizzled/session.h (+30/-89) drizzled/set_var.cc (+2/-0) drizzled/set_var.h (+0/-1) drizzled/show.cc (+2/-0) drizzled/sort_field.h (+70/-0) drizzled/sql_derived.cc (+1/-0) drizzled/sql_insert.cc (+2/-0) drizzled/sql_lex.h (+1/-0) drizzled/sql_parse.cc (+1/-0) drizzled/sql_select.cc (+1/-0) drizzled/sql_union.cc (+1/-0) drizzled/sql_yacc.yy (+6/-0) drizzled/statement/create_table.cc (+5/-0) drizzled/statement/insert_select.cc (+1/-0) drizzled/statement/replace_select.cc (+2/-0) drizzled/sys_var.h (+1/-1) drizzled/system_variables.h (+115/-0) drizzled/unique.cc (+1/-0) drizzled/user_var_entry.cc (+1/-0) drizzled/user_var_entry.h (+10/-1) plugin/logging_stats/user_commands.cc (+1/-0) plugin/mysql_protocol/mysql_protocol.cc (+3/-1) plugin/session_dictionary/variables.cc (+1/-0) Conflict adding file drizzled/copy_info.h. Moved existing file to drizzled/copy_info.h.moved. Text conflict in drizzled/cursor.cc Text conflict in drizzled/drizzled.cc Text conflict in drizzled/field.h Text conflict in drizzled/function/cast/boolean.cc Text conflict in drizzled/function/cast/boolean.h Text conflict in drizzled/function/cast/signed.cc Text conflict in drizzled/function/cast/unsigned.cc Text conflict in drizzled/function/func.h Text conflict in drizzled/generator.h Text conflict in drizzled/generator/table.h Text conflict in drizzled/handler_structs.h Text conflict in drizzled/hybrid_type_traits.cc Text conflict in drizzled/hybrid_type_traits_decimal.cc Text conflict in drizzled/hybrid_type_traits_integer.cc Text conflict in drizzled/include.am Text conflict in drizzled/item.h Text conflict in drizzled/item/cache.h Text conflict in drizzled/item/cmpfunc.h Text conflict in drizzled/item/int.cc Text conflict in drizzled/item/null.h Text conflict in drizzled/item/num.h Text conflict in drizzled/item/subselect.cc Text conflict in drizzled/item/sum.h Text conflict in drizzled/join.cc Text conflict in drizzled/join.h Text conflict in drizzled/key.cc Text conflict in drizzled/locking/global.cc Text conflict in drizzled/main.cc Text conflict in drizzled/open_tables_state.h Text conflict in drizzled/optimizer/quick_index_merge_select.h Text conflict in drizzled/optimizer/range.cc Text conflict in drizzled/optimizer/range.h Text conflict in drizzled/optimizer/sum.cc Text conflict in drizzled/plugin/client.cc Text conflict in drizzled/plugin/function.h Text conflict in drizzled/plugin/query_rewrite.h Text conflict in drizzled/plugin/storage_engine.h Text conflict in drizzled/plugin/table_function.cc Text conflict in drizzled/records.cc Text conflict in drizzled/session.cc Text conflict in drizzled/session.h Text conflict in drizzled/session/cache.cc Text conflict in drizzled/session/cache.h Text conflict in drizzled/show.cc Text conflict in drizzled/show.h Text conflict in drizzled/sql_base.cc Text conflict in drizzled/sql_parse.cc Text conflict in drizzled/sql_select.cc Text conflict in drizzled/sql_select.h Text conflict in drizzled/sql_table.cc Text conflict in drizzled/sql_update.cc Text conflict in drizzled/statement/alter_table.cc Text conflict in drizzled/statement/create_index.cc Text conflict in drizzled/statement/create_table.cc Text conflict in drizzled/statement/drop_index.cc Text conflict in drizzled/statement/flush.cc Text conflict in drizzled/statement/rename_table.cc Text conflict in drizzled/sys_var.cc Conflict adding file drizzled/system_variables.h. Moved existing file to drizzled/system_variables.h.moved. Text conflict in drizzled/table.cc Text conflict in drizzled/table/instance/base.cc Text conflict in drizzled/table_ident.h Text conflict in drizzled/table_proto_write.cc Text conflict in drizzled/temporal_interval.h Text conflict in drizzled/tztime.h Text conflict in plugin/blackhole/ha_blackhole.cc Text conflict in plugin/hex_functions/hex_functions.cc Text conflict in plugin/information_schema_dictionary/domains.cc Text conflict in plugin/innobase/handler/replication_dictionary.cc Text conflict in plugin/md5/md5.cc Text conflict in plugin/memory/ha_heap.cc Text conflict in plugin/show_schema_proto/show_schema_proto.cc Text conflict in plugin/signal_handler/signal_handler.cc Text conflict in plugin/string_functions/functions.cc Text conflict in plugin/string_functions/functions.h Text conflict in plugin/tableprototester/tableprototester.cc Text conflict in plugin/transaction_log/hexdump_transaction_message.cc Text conflict in plugin/transaction_log/print_transaction_message.cc Text conflict in plugin/utility_functions/functions.cc |
To merge this branch: | bzr merge lp:~mordred/drizzle/split-session-header |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Developers | Pending | ||
Review via email: mp+49520@code.launchpad.net |
Commit message
Description of the change
Split up session.h into a few different files, cleaned up where things where including things and got rid of the bits of session.h that required files to be included in the middle of the file.
To post a comment you must log in.
Unmerged revisions
- 2161. By Monty Taylor
-
Split apart session.h into smaller headers, which also removed the need for
us to have include statements in the middle of the file. While I was at it,
I converted daemon.c to c++. - 2160. By Monty Taylor
-
Be consistent about include usage.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'drizzled/base.h' | |||
2 | --- drizzled/base.h 2011-01-11 22:30:08 +0000 | |||
3 | +++ drizzled/base.h 2011-02-12 21:09:18 +0000 | |||
4 | @@ -25,7 +25,7 @@ | |||
5 | 25 | * @TODO Convert HA_XXX defines into enums and/or bitmaps | 25 | * @TODO Convert HA_XXX defines into enums and/or bitmaps |
6 | 26 | */ | 26 | */ |
7 | 27 | 27 | ||
9 | 28 | #include "definitions.h" | 28 | #include <drizzled/definitions.h> |
10 | 29 | 29 | ||
11 | 30 | #ifndef DRIZZLED_BASE_H | 30 | #ifndef DRIZZLED_BASE_H |
12 | 31 | #define DRIZZLED_BASE_H | 31 | #define DRIZZLED_BASE_H |
13 | 32 | 32 | ||
14 | === modified file 'drizzled/common.h' | |||
15 | --- drizzled/common.h 2011-01-04 04:05:27 +0000 | |||
16 | +++ drizzled/common.h 2011-02-12 21:09:18 +0000 | |||
17 | @@ -25,7 +25,6 @@ | |||
18 | 25 | #define DRIZZLED_COMMON_H | 25 | #define DRIZZLED_COMMON_H |
19 | 26 | 26 | ||
20 | 27 | #include <unistd.h> | 27 | #include <unistd.h> |
21 | 28 | #include <stdint.h> | ||
22 | 29 | #include <drizzled/korr.h> | 28 | #include <drizzled/korr.h> |
23 | 30 | 29 | ||
24 | 31 | /* | 30 | /* |
25 | 32 | 31 | ||
26 | === added file 'drizzled/copy_info.h' | |||
27 | --- drizzled/copy_info.h 1970-01-01 00:00:00 +0000 | |||
28 | +++ drizzled/copy_info.h 2011-02-12 21:09:18 +0000 | |||
29 | @@ -0,0 +1,121 @@ | |||
30 | 1 | /* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*- | ||
31 | 2 | * vim:expandtab:shiftwidth=2:tabstop=2:smarttab: | ||
32 | 3 | * | ||
33 | 4 | * Copyright (C) 2008 Sun Microsystems, Inc. | ||
34 | 5 | * | ||
35 | 6 | * This program is free software; you can redistribute it and/or modify | ||
36 | 7 | * it under the terms of the GNU General Public License as published by | ||
37 | 8 | * the Free Software Foundation; version 2 of the License. | ||
38 | 9 | * | ||
39 | 10 | * This program is distributed in the hope that it will be useful, | ||
40 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
41 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
42 | 13 | * GNU General Public License for more details. | ||
43 | 14 | * | ||
44 | 15 | * You should have received a copy of the GNU General Public License | ||
45 | 16 | * along with this program; if not, write to the Free Software | ||
46 | 17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
47 | 18 | */ | ||
48 | 19 | |||
49 | 20 | #ifndef DRIZZLED_COPY_INFO_H | ||
50 | 21 | #define DRIZZLED_COPY_INFO_H | ||
51 | 22 | |||
52 | 23 | |||
53 | 24 | namespace drizzled | ||
54 | 25 | { | ||
55 | 26 | |||
56 | 27 | namespace plugin | ||
57 | 28 | { | ||
58 | 29 | class Client; | ||
59 | 30 | class Scheduler; | ||
60 | 31 | class EventObserverList; | ||
61 | 32 | } | ||
62 | 33 | |||
63 | 34 | namespace message | ||
64 | 35 | { | ||
65 | 36 | class Transaction; | ||
66 | 37 | class Statement; | ||
67 | 38 | class Resultset; | ||
68 | 39 | } | ||
69 | 40 | |||
70 | 41 | namespace internal | ||
71 | 42 | { | ||
72 | 43 | struct st_my_thread_var; | ||
73 | 44 | } | ||
74 | 45 | |||
75 | 46 | namespace table | ||
76 | 47 | { | ||
77 | 48 | class Placeholder; | ||
78 | 49 | } | ||
79 | 50 | |||
80 | 51 | class Lex_input_stream; | ||
81 | 52 | class user_var_entry; | ||
82 | 53 | class CopyField; | ||
83 | 54 | class Table_ident; | ||
84 | 55 | |||
85 | 56 | class TableShareInstance; | ||
86 | 57 | |||
87 | 58 | extern char internal_table_name[2]; | ||
88 | 59 | extern char empty_c_string[1]; | ||
89 | 60 | extern const char **errmesg; | ||
90 | 61 | |||
91 | 62 | #define TC_HEURISTIC_RECOVER_COMMIT 1 | ||
92 | 63 | #define TC_HEURISTIC_RECOVER_ROLLBACK 2 | ||
93 | 64 | extern uint32_t tc_heuristic_recover; | ||
94 | 65 | |||
95 | 66 | /** | ||
96 | 67 | @brief | ||
97 | 68 | Local storage for proto that are tmp table. This should be enlarged | ||
98 | 69 | to hande the entire table-share for a local table. Once Hash is done, | ||
99 | 70 | we should consider exchanging the map for it. | ||
100 | 71 | */ | ||
101 | 72 | typedef std::map <std::string, message::Table> ProtoCache; | ||
102 | 73 | |||
103 | 74 | /** | ||
104 | 75 | The COPY_INFO structure is used by INSERT/REPLACE code. | ||
105 | 76 | The schema of the row counting by the INSERT/INSERT ... ON DUPLICATE KEY | ||
106 | 77 | UPDATE code: | ||
107 | 78 | If a row is inserted then the copied variable is incremented. | ||
108 | 79 | If a row is updated by the INSERT ... ON DUPLICATE KEY UPDATE and the | ||
109 | 80 | new data differs from the old one then the copied and the updated | ||
110 | 81 | variables are incremented. | ||
111 | 82 | The touched variable is incremented if a row was touched by the update part | ||
112 | 83 | of the INSERT ... ON DUPLICATE KEY UPDATE no matter whether the row | ||
113 | 84 | was actually changed or not. | ||
114 | 85 | */ | ||
115 | 86 | class CopyInfo | ||
116 | 87 | { | ||
117 | 88 | public: | ||
118 | 89 | ha_rows records; /**< Number of processed records */ | ||
119 | 90 | ha_rows deleted; /**< Number of deleted records */ | ||
120 | 91 | ha_rows updated; /**< Number of updated records */ | ||
121 | 92 | ha_rows copied; /**< Number of copied records */ | ||
122 | 93 | ha_rows error_count; | ||
123 | 94 | ha_rows touched; /* Number of touched records */ | ||
124 | 95 | enum enum_duplicates handle_duplicates; | ||
125 | 96 | int escape_char, last_errno; | ||
126 | 97 | bool ignore; | ||
127 | 98 | /* for INSERT ... UPDATE */ | ||
128 | 99 | List<Item> *update_fields; | ||
129 | 100 | List<Item> *update_values; | ||
130 | 101 | /* for VIEW ... WITH CHECK OPTION */ | ||
131 | 102 | |||
132 | 103 | CopyInfo() : | ||
133 | 104 | records(0), | ||
134 | 105 | deleted(0), | ||
135 | 106 | updated(0), | ||
136 | 107 | copied(0), | ||
137 | 108 | error_count(0), | ||
138 | 109 | touched(0), | ||
139 | 110 | escape_char(0), | ||
140 | 111 | last_errno(0), | ||
141 | 112 | ignore(0), | ||
142 | 113 | update_fields(0), | ||
143 | 114 | update_values(0) | ||
144 | 115 | { } | ||
145 | 116 | |||
146 | 117 | }; | ||
147 | 118 | |||
148 | 119 | } /* namespace drizzled */ | ||
149 | 120 | |||
150 | 121 | #endif /* DRIZZLED_COPY_INFO_H */ | ||
151 | 0 | 122 | ||
152 | === renamed file 'drizzled/copy_info.h' => 'drizzled/copy_info.h.moved' | |||
153 | === renamed file 'drizzled/daemon.c' => 'drizzled/daemon.cc' | |||
154 | --- drizzled/daemon.c 2011-02-02 02:49:45 +0000 | |||
155 | +++ drizzled/daemon.cc 2011-02-12 21:09:18 +0000 | |||
156 | @@ -45,6 +45,9 @@ | |||
157 | 45 | #include <unistd.h> | 45 | #include <unistd.h> |
158 | 46 | #include <sys/select.h> | 46 | #include <sys/select.h> |
159 | 47 | 47 | ||
160 | 48 | namespace drizzled | ||
161 | 49 | { | ||
162 | 50 | |||
163 | 48 | int daemonize(int nochdir, int noclose, int wait_sigusr1); | 51 | int daemonize(int nochdir, int noclose, int wait_sigusr1); |
164 | 49 | int daemon_is_ready(void); | 52 | int daemon_is_ready(void); |
165 | 50 | void sigusr1_handler(int sig); | 53 | void sigusr1_handler(int sig); |
166 | @@ -136,3 +139,5 @@ | |||
167 | 136 | } | 139 | } |
168 | 137 | return (0); | 140 | return (0); |
169 | 138 | } | 141 | } |
170 | 142 | |||
171 | 143 | } /* namespace drizzled */ | ||
172 | 139 | 144 | ||
173 | === modified file 'drizzled/definitions.h' | |||
174 | --- drizzled/definitions.h 2011-01-24 05:33:52 +0000 | |||
175 | +++ drizzled/definitions.h 2011-02-12 21:09:18 +0000 | |||
176 | @@ -27,10 +27,7 @@ | |||
177 | 27 | #define DRIZZLED_DEFINITIONS_H | 27 | #define DRIZZLED_DEFINITIONS_H |
178 | 28 | 28 | ||
179 | 29 | #include <drizzled/enum.h> | 29 | #include <drizzled/enum.h> |
184 | 30 | 30 | #include <drizzled/common.h> | |
181 | 31 | #include <stdint.h> | ||
182 | 32 | |||
183 | 33 | #include "common.h" | ||
185 | 34 | 31 | ||
186 | 35 | namespace drizzled | 32 | namespace drizzled |
187 | 36 | { | 33 | { |
188 | 37 | 34 | ||
189 | === modified file 'drizzled/filesort.cc' | |||
190 | --- drizzled/filesort.cc 2011-02-12 21:09:14 +0000 | |||
191 | +++ drizzled/filesort.cc 2011-02-12 21:09:18 +0000 | |||
192 | @@ -47,6 +47,7 @@ | |||
193 | 47 | #include <drizzled/atomics.h> | 47 | #include <drizzled/atomics.h> |
194 | 48 | #include <drizzled/global_buffer.h> | 48 | #include <drizzled/global_buffer.h> |
195 | 49 | 49 | ||
196 | 50 | #include <drizzled/sort_field.h> | ||
197 | 50 | 51 | ||
198 | 51 | using namespace std; | 52 | using namespace std; |
199 | 52 | 53 | ||
200 | 53 | 54 | ||
201 | === modified file 'drizzled/function/get_user_var.cc' | |||
202 | --- drizzled/function/get_user_var.cc 2010-12-25 01:27:46 +0000 | |||
203 | +++ drizzled/function/get_user_var.cc 2011-02-12 21:09:18 +0000 | |||
204 | @@ -25,6 +25,7 @@ | |||
205 | 25 | #include <drizzled/item/null.h> | 25 | #include <drizzled/item/null.h> |
206 | 26 | #include <drizzled/sql_parse.h> | 26 | #include <drizzled/sql_parse.h> |
207 | 27 | #include <drizzled/session.h> | 27 | #include <drizzled/session.h> |
208 | 28 | #include <drizzled/user_var_entry.h> | ||
209 | 28 | 29 | ||
210 | 29 | namespace drizzled | 30 | namespace drizzled |
211 | 30 | { | 31 | { |
212 | 31 | 32 | ||
213 | === modified file 'drizzled/function/set_user_var.cc' | |||
214 | --- drizzled/function/set_user_var.cc 2010-12-25 01:27:46 +0000 | |||
215 | +++ drizzled/function/set_user_var.cc 2011-02-12 21:09:18 +0000 | |||
216 | @@ -23,6 +23,7 @@ | |||
217 | 23 | #include <drizzled/field/num.h> | 23 | #include <drizzled/field/num.h> |
218 | 24 | #include <drizzled/session.h> | 24 | #include <drizzled/session.h> |
219 | 25 | #include <drizzled/plugin/client.h> | 25 | #include <drizzled/plugin/client.h> |
220 | 26 | #include <drizzled/user_var_entry.h> | ||
221 | 26 | 27 | ||
222 | 27 | namespace drizzled | 28 | namespace drizzled |
223 | 28 | { | 29 | { |
224 | 29 | 30 | ||
225 | === modified file 'drizzled/function/user_var_as_out_param.cc' | |||
226 | --- drizzled/function/user_var_as_out_param.cc 2010-12-25 01:27:46 +0000 | |||
227 | +++ drizzled/function/user_var_as_out_param.cc 2011-02-12 21:09:18 +0000 | |||
228 | @@ -23,6 +23,7 @@ | |||
229 | 23 | 23 | ||
230 | 24 | #include <drizzled/function/user_var_as_out_param.h> | 24 | #include <drizzled/function/user_var_as_out_param.h> |
231 | 25 | #include <drizzled/session.h> | 25 | #include <drizzled/session.h> |
232 | 26 | #include <drizzled/user_var_entry.h> | ||
233 | 26 | 27 | ||
234 | 27 | namespace drizzled | 28 | namespace drizzled |
235 | 28 | { | 29 | { |
236 | 29 | 30 | ||
237 | === modified file 'drizzled/identifier/catalog.cc' | |||
238 | --- drizzled/identifier/catalog.cc 2011-02-12 21:09:14 +0000 | |||
239 | +++ drizzled/identifier/catalog.cc 2011-02-12 21:09:18 +0000 | |||
240 | @@ -24,6 +24,7 @@ | |||
241 | 24 | 24 | ||
242 | 25 | #include <drizzled/identifier.h> | 25 | #include <drizzled/identifier.h> |
243 | 26 | #include <drizzled/session.h> | 26 | #include <drizzled/session.h> |
244 | 27 | #include <drizzled/current_session.h> | ||
245 | 27 | #include <drizzled/internal/my_sys.h> | 28 | #include <drizzled/internal/my_sys.h> |
246 | 28 | 29 | ||
247 | 29 | #include <drizzled/util/tablename_to_filename.h> | 30 | #include <drizzled/util/tablename_to_filename.h> |
248 | 30 | 31 | ||
249 | === modified file 'drizzled/identifier/schema.cc' | |||
250 | --- drizzled/identifier/schema.cc 2011-02-12 21:09:14 +0000 | |||
251 | +++ drizzled/identifier/schema.cc 2011-02-12 21:09:18 +0000 | |||
252 | @@ -24,6 +24,7 @@ | |||
253 | 24 | 24 | ||
254 | 25 | #include <drizzled/identifier.h> | 25 | #include <drizzled/identifier.h> |
255 | 26 | #include <drizzled/session.h> | 26 | #include <drizzled/session.h> |
256 | 27 | #include <drizzled/current_session.h> | ||
257 | 27 | #include <drizzled/internal/my_sys.h> | 28 | #include <drizzled/internal/my_sys.h> |
258 | 28 | 29 | ||
259 | 29 | #include <drizzled/util/tablename_to_filename.h> | 30 | #include <drizzled/util/tablename_to_filename.h> |
260 | 30 | 31 | ||
261 | === modified file 'drizzled/include.am' | |||
262 | --- drizzled/include.am 2011-02-12 21:09:14 +0000 | |||
263 | +++ drizzled/include.am 2011-02-12 21:09:18 +0000 | |||
264 | @@ -64,8 +64,12 @@ | |||
265 | 64 | drizzled/common.h \ | 64 | drizzled/common.h \ |
266 | 65 | drizzled/comp_creator.h \ | 65 | drizzled/comp_creator.h \ |
267 | 66 | drizzled/constrained_value.h \ | 66 | drizzled/constrained_value.h \ |
268 | 67 | <<<<<<< TREE | ||
269 | 67 | drizzled/copy_field.h \ | 68 | drizzled/copy_field.h \ |
270 | 68 | drizzled/copy_info.h \ | 69 | drizzled/copy_info.h \ |
271 | 70 | ======= | ||
272 | 71 | drizzled/copy_info.h \ | ||
273 | 72 | >>>>>>> MERGE-SOURCE | ||
274 | 69 | drizzled/create_field.h \ | 73 | drizzled/create_field.h \ |
275 | 70 | drizzled/current_session.h \ | 74 | drizzled/current_session.h \ |
276 | 71 | drizzled/cursor.h \ | 75 | drizzled/cursor.h \ |
277 | @@ -406,6 +410,7 @@ | |||
278 | 406 | drizzled/show.h \ | 410 | drizzled/show.h \ |
279 | 407 | drizzled/show_type.h \ | 411 | drizzled/show_type.h \ |
280 | 408 | drizzled/signal_handler.h \ | 412 | drizzled/signal_handler.h \ |
281 | 413 | drizzled/sort_field.h \ | ||
282 | 409 | drizzled/sql_base.h \ | 414 | drizzled/sql_base.h \ |
283 | 410 | drizzled/sql_error.h \ | 415 | drizzled/sql_error.h \ |
284 | 411 | drizzled/sql_lex.h \ | 416 | drizzled/sql_lex.h \ |
285 | @@ -734,7 +739,7 @@ | |||
286 | 734 | drizzled/locking/global.cc \ | 739 | drizzled/locking/global.cc \ |
287 | 735 | drizzled/lookup_symbol.cc \ | 740 | drizzled/lookup_symbol.cc \ |
288 | 736 | drizzled/main.cc \ | 741 | drizzled/main.cc \ |
290 | 737 | drizzled/daemon.c \ | 742 | drizzled/daemon.cc \ |
291 | 738 | drizzled/message.cc \ | 743 | drizzled/message.cc \ |
292 | 739 | drizzled/message/cache.cc \ | 744 | drizzled/message/cache.cc \ |
293 | 740 | drizzled/message/catalog.cc \ | 745 | drizzled/message/catalog.cc \ |
294 | 741 | 746 | ||
295 | === modified file 'drizzled/item/subselect.cc' | |||
296 | --- drizzled/item/subselect.cc 2011-02-09 22:48:12 +0000 | |||
297 | +++ drizzled/item/subselect.cc 2011-02-12 21:09:18 +0000 | |||
298 | @@ -39,7 +39,14 @@ | |||
299 | 39 | #include <drizzled/item/ref_null_helper.h> | 39 | #include <drizzled/item/ref_null_helper.h> |
300 | 40 | #include <drizzled/item/direct_ref.h> | 40 | #include <drizzled/item/direct_ref.h> |
301 | 41 | #include <drizzled/join.h> | 41 | #include <drizzled/join.h> |
302 | 42 | <<<<<<< TREE | ||
303 | 42 | #include <drizzled/plugin/storage_engine.h> | 43 | #include <drizzled/plugin/storage_engine.h> |
304 | 44 | ======= | ||
305 | 45 | #include <drizzled/select_singlerow_subselect.h> | ||
306 | 46 | #include <drizzled/select_max_min_finder_subselect.h> | ||
307 | 47 | #include <drizzled/select_exists_subselect.h> | ||
308 | 48 | #include <drizzled/select_union.h> | ||
309 | 49 | >>>>>>> MERGE-SOURCE | ||
310 | 43 | 50 | ||
311 | 44 | namespace drizzled | 51 | namespace drizzled |
312 | 45 | { | 52 | { |
313 | 46 | 53 | ||
314 | === modified file 'drizzled/item/sum.cc' | |||
315 | --- drizzled/item/sum.cc 2011-02-12 21:09:14 +0000 | |||
316 | +++ drizzled/item/sum.cc 2011-02-12 21:09:18 +0000 | |||
317 | @@ -36,6 +36,8 @@ | |||
318 | 36 | #include <drizzled/field/int64.h> | 36 | #include <drizzled/field/int64.h> |
319 | 37 | #include <drizzled/field/date.h> | 37 | #include <drizzled/field/date.h> |
320 | 38 | #include <drizzled/field/datetime.h> | 38 | #include <drizzled/field/datetime.h> |
321 | 39 | #include <drizzled/unique.h> | ||
322 | 40 | |||
323 | 39 | 41 | ||
324 | 40 | #include <drizzled/type/decimal.h> | 42 | #include <drizzled/type/decimal.h> |
325 | 41 | 43 | ||
326 | 42 | 44 | ||
327 | === modified file 'drizzled/join.h' | |||
328 | --- drizzled/join.h 2011-02-12 21:09:14 +0000 | |||
329 | +++ drizzled/join.h 2011-02-12 21:09:18 +0000 | |||
330 | @@ -33,6 +33,7 @@ | |||
331 | 33 | #include <drizzled/sql_select.h> | 33 | #include <drizzled/sql_select.h> |
332 | 34 | ======= | 34 | ======= |
333 | 35 | #include <drizzled/sql_select.h> | 35 | #include <drizzled/sql_select.h> |
334 | 36 | #include <drizzled/tmp_table_param.h> | ||
335 | 36 | >>>>>>> MERGE-SOURCE | 37 | >>>>>>> MERGE-SOURCE |
336 | 37 | #include <bitset> | 38 | #include <bitset> |
337 | 38 | 39 | ||
338 | 39 | 40 | ||
339 | === modified file 'drizzled/lex_column.h' | |||
340 | --- drizzled/lex_column.h 2010-12-18 04:43:40 +0000 | |||
341 | +++ drizzled/lex_column.h 2011-02-12 21:09:18 +0000 | |||
342 | @@ -21,6 +21,8 @@ | |||
343 | 21 | #ifndef DRIZZLED_LEX_COLUMN_H | 21 | #ifndef DRIZZLED_LEX_COLUMN_H |
344 | 22 | #define DRIZZLED_LEX_COLUMN_H | 22 | #define DRIZZLED_LEX_COLUMN_H |
345 | 23 | 23 | ||
346 | 24 | #include <drizzled/copy_info.h> | ||
347 | 25 | |||
348 | 24 | namespace drizzled | 26 | namespace drizzled |
349 | 25 | { | 27 | { |
350 | 26 | 28 | ||
351 | 27 | 29 | ||
352 | === modified file 'drizzled/main.cc' | |||
353 | --- drizzled/main.cc 2011-02-12 21:09:14 +0000 | |||
354 | +++ drizzled/main.cc 2011-02-12 21:09:18 +0000 | |||
355 | @@ -95,8 +95,11 @@ | |||
356 | 95 | #include <drizzled/util/backtrace.h> | 95 | #include <drizzled/util/backtrace.h> |
357 | 96 | >>>>>>> MERGE-SOURCE | 96 | >>>>>>> MERGE-SOURCE |
358 | 97 | 97 | ||
361 | 98 | extern "C" int daemonize(int nochdir, int noclose, int wait_sigusr1); | 98 | namespace drizzled |
362 | 99 | extern "C" int daemon_is_ready(void); | 99 | { |
363 | 100 | extern int daemonize(int nochdir, int noclose, int wait_sigusr1); | ||
364 | 101 | extern int daemon_is_ready(void); | ||
365 | 102 | } | ||
366 | 100 | 103 | ||
367 | 101 | using namespace drizzled; | 104 | using namespace drizzled; |
368 | 102 | using namespace std; | 105 | using namespace std; |
369 | @@ -114,7 +117,7 @@ | |||
370 | 114 | */ | 117 | */ |
371 | 115 | static void my_message_sql(drizzled::error_t error, const char *str, myf MyFlags) | 118 | static void my_message_sql(drizzled::error_t error, const char *str, myf MyFlags) |
372 | 116 | { | 119 | { |
374 | 117 | Session *session; | 120 | drizzled::Session *session; |
375 | 118 | /* | 121 | /* |
376 | 119 | Put here following assertion when situation with EE_* error codes | 122 | Put here following assertion when situation with EE_* error codes |
377 | 120 | will be fixed | 123 | will be fixed |
378 | @@ -373,11 +376,11 @@ | |||
379 | 373 | ReplicationServices &replication_services= ReplicationServices::singleton(); | 376 | ReplicationServices &replication_services= ReplicationServices::singleton(); |
380 | 374 | (void) replication_services.evaluateRegisteredPlugins(); | 377 | (void) replication_services.evaluateRegisteredPlugins(); |
381 | 375 | 378 | ||
383 | 376 | if (plugin::Listen::setup()) | 379 | if (drizzled::plugin::Listen::setup()) |
384 | 377 | unireg_abort(1); | 380 | unireg_abort(1); |
385 | 378 | 381 | ||
388 | 379 | assert(plugin::num_trx_monitored_objects > 0); | 382 | assert(drizzled::plugin::num_trx_monitored_objects > 0); |
389 | 380 | if (drizzle_rm_tmp_tables() || my_tz_init((Session *)0, default_tz_name)) | 383 | if (drizzle_rm_tmp_tables() || my_tz_init(NULL, default_tz_name)) |
390 | 381 | { | 384 | { |
391 | 382 | abort_loop= true; | 385 | abort_loop= true; |
392 | 383 | select_thread_in_use=0; | 386 | select_thread_in_use=0; |
393 | @@ -396,9 +399,9 @@ | |||
394 | 396 | 399 | ||
395 | 397 | /* Send server startup event */ | 400 | /* Send server startup event */ |
396 | 398 | { | 401 | { |
398 | 399 | Session::shared_ptr session; | 402 | drizzled::Session::shared_ptr session; |
399 | 400 | 403 | ||
401 | 401 | if ((session= Session::make_shared(plugin::Listen::getNullClient(), catalog::local()))) | 404 | if ((session= drizzled::Session::make_shared(drizzled::plugin::Listen::getNullClient(), catalog::local()))) |
402 | 402 | { | 405 | { |
403 | 403 | currentSession().release(); | 406 | currentSession().release(); |
404 | 404 | currentSession().reset(session.get()); | 407 | currentSession().reset(session.get()); |
405 | @@ -418,11 +421,11 @@ | |||
406 | 418 | accepted. The listen.getClient() method will return NULL when the server | 421 | accepted. The listen.getClient() method will return NULL when the server |
407 | 419 | should be shutdown. | 422 | should be shutdown. |
408 | 420 | */ | 423 | */ |
411 | 421 | plugin::Client *client; | 424 | drizzled::plugin::Client *client; |
412 | 422 | while ((client= plugin::Listen::getClient()) != NULL) | 425 | while ((client= drizzled::plugin::Listen::getClient()) != NULL) |
413 | 423 | { | 426 | { |
416 | 424 | Session::shared_ptr session; | 427 | drizzled::Session::shared_ptr session; |
417 | 425 | session= Session::make_shared(client, client->catalog()); | 428 | session= drizzled::Session::make_shared(client, client->catalog()); |
418 | 426 | 429 | ||
419 | 427 | if (not session) | 430 | if (not session) |
420 | 428 | { | 431 | { |
421 | @@ -431,15 +434,15 @@ | |||
422 | 431 | } | 434 | } |
423 | 432 | 435 | ||
424 | 433 | /* If we error on creation we drop the connection and delete the session. */ | 436 | /* If we error on creation we drop the connection and delete the session. */ |
427 | 434 | if (Session::schedule(session)) | 437 | if (drizzled::Session::schedule(session)) |
428 | 435 | Session::unlink(session); | 438 | drizzled::Session::unlink(session); |
429 | 436 | } | 439 | } |
430 | 437 | 440 | ||
431 | 438 | /* Send server shutdown event */ | 441 | /* Send server shutdown event */ |
432 | 439 | { | 442 | { |
434 | 440 | Session::shared_ptr session; | 443 | drizzled::Session::shared_ptr session; |
435 | 441 | 444 | ||
437 | 442 | if ((session= Session::make_shared(plugin::Listen::getNullClient(), catalog::local()))) | 445 | if ((session= drizzled::Session::make_shared(drizzled::plugin::Listen::getNullClient(), catalog::local()))) |
438 | 443 | { | 446 | { |
439 | 444 | currentSession().release(); | 447 | currentSession().release(); |
440 | 445 | currentSession().reset(session.get()); | 448 | currentSession().reset(session.get()); |
441 | 446 | 449 | ||
442 | === modified file 'drizzled/module/loader.cc' | |||
443 | --- drizzled/module/loader.cc 2011-02-12 21:09:14 +0000 | |||
444 | +++ drizzled/module/loader.cc 2011-02-12 21:09:18 +0000 | |||
445 | @@ -519,7 +519,6 @@ | |||
446 | 519 | session->variables.storage_engine= NULL; | 519 | session->variables.storage_engine= NULL; |
447 | 520 | 520 | ||
448 | 521 | /* we are going to allocate these lazily */ | 521 | /* we are going to allocate these lazily */ |
449 | 522 | session->variables.dynamic_variables_version= 0; | ||
450 | 523 | session->variables.dynamic_variables_size= 0; | 522 | session->variables.dynamic_variables_size= 0; |
451 | 524 | session->variables.dynamic_variables_ptr= 0; | 523 | session->variables.dynamic_variables_ptr= 0; |
452 | 525 | 524 | ||
453 | @@ -549,7 +548,6 @@ | |||
454 | 549 | free(vars->dynamic_variables_ptr); | 548 | free(vars->dynamic_variables_ptr); |
455 | 550 | vars->dynamic_variables_ptr= NULL; | 549 | vars->dynamic_variables_ptr= NULL; |
456 | 551 | vars->dynamic_variables_size= 0; | 550 | vars->dynamic_variables_size= 0; |
457 | 552 | vars->dynamic_variables_version= 0; | ||
458 | 553 | } | 551 | } |
459 | 554 | 552 | ||
460 | 555 | 553 | ||
461 | 556 | 554 | ||
462 | === modified file 'drizzled/optimizer/quick_index_merge_select.cc' | |||
463 | --- drizzled/optimizer/quick_index_merge_select.cc 2011-02-12 21:09:14 +0000 | |||
464 | +++ drizzled/optimizer/quick_index_merge_select.cc 2011-02-12 21:09:18 +0000 | |||
465 | @@ -24,6 +24,7 @@ | |||
466 | 24 | #include <drizzled/optimizer/quick_range_select.h> | 24 | #include <drizzled/optimizer/quick_range_select.h> |
467 | 25 | #include <drizzled/optimizer/quick_index_merge_select.h> | 25 | #include <drizzled/optimizer/quick_index_merge_select.h> |
468 | 26 | #include <drizzled/internal/m_string.h> | 26 | #include <drizzled/internal/m_string.h> |
469 | 27 | #include <drizzled/unique.h> | ||
470 | 27 | 28 | ||
471 | 28 | #include <vector> | 29 | #include <vector> |
472 | 29 | 30 | ||
473 | 30 | 31 | ||
474 | === modified file 'drizzled/optimizer/range.cc' | |||
475 | --- drizzled/optimizer/range.cc 2011-02-12 21:09:14 +0000 | |||
476 | +++ drizzled/optimizer/range.cc 2011-02-12 21:09:18 +0000 | |||
477 | @@ -161,6 +161,7 @@ | |||
478 | 161 | #include <drizzled/records.h> | 161 | #include <drizzled/records.h> |
479 | 162 | #include <drizzled/internal/my_sys.h> | 162 | #include <drizzled/internal/my_sys.h> |
480 | 163 | #include <drizzled/internal/iocache.h> | 163 | #include <drizzled/internal/iocache.h> |
481 | 164 | #include <drizzled/unique.h> | ||
482 | 164 | >>>>>>> MERGE-SOURCE | 165 | >>>>>>> MERGE-SOURCE |
483 | 165 | 166 | ||
484 | 166 | #include <drizzled/temporal.h> /* Needed in get_mm_leaf() for timestamp -> datetime comparisons */ | 167 | #include <drizzled/temporal.h> /* Needed in get_mm_leaf() for timestamp -> datetime comparisons */ |
485 | 167 | 168 | ||
486 | === modified file 'drizzled/select_create.h' | |||
487 | --- drizzled/select_create.h 2011-01-17 06:41:24 +0000 | |||
488 | +++ drizzled/select_create.h 2011-02-12 21:09:18 +0000 | |||
489 | @@ -20,6 +20,8 @@ | |||
490 | 20 | #ifndef DRIZZLED_SELECT_CREATE_H | 20 | #ifndef DRIZZLED_SELECT_CREATE_H |
491 | 21 | #define DRIZZLED_SELECT_CREATE_H | 21 | #define DRIZZLED_SELECT_CREATE_H |
492 | 22 | 22 | ||
493 | 23 | #include <drizzled/select_insert.h> | ||
494 | 24 | |||
495 | 23 | namespace drizzled | 25 | namespace drizzled |
496 | 24 | { | 26 | { |
497 | 25 | 27 | ||
498 | 26 | 28 | ||
499 | === modified file 'drizzled/select_dump.h' | |||
500 | --- drizzled/select_dump.h 2010-12-18 04:43:40 +0000 | |||
501 | +++ drizzled/select_dump.h 2011-02-12 21:09:18 +0000 | |||
502 | @@ -21,6 +21,8 @@ | |||
503 | 21 | #ifndef DRIZZLED_SELECT_DUMP_H | 21 | #ifndef DRIZZLED_SELECT_DUMP_H |
504 | 22 | #define DRIZZLED_SELECT_DUMP_H | 22 | #define DRIZZLED_SELECT_DUMP_H |
505 | 23 | 23 | ||
506 | 24 | #include <drizzled/select_to_file.h> | ||
507 | 25 | |||
508 | 24 | namespace drizzled | 26 | namespace drizzled |
509 | 25 | { | 27 | { |
510 | 26 | 28 | ||
511 | 27 | 29 | ||
512 | === modified file 'drizzled/select_dumpvar.h' | |||
513 | --- drizzled/select_dumpvar.h 2011-02-12 21:09:14 +0000 | |||
514 | +++ drizzled/select_dumpvar.h 2011-02-12 21:09:18 +0000 | |||
515 | @@ -22,6 +22,7 @@ | |||
516 | 22 | 22 | ||
517 | 23 | #include <drizzled/error.h> | 23 | #include <drizzled/error.h> |
518 | 24 | #include <drizzled/function/set_user_var.h> | 24 | #include <drizzled/function/set_user_var.h> |
519 | 25 | #include <drizzled/var.h> | ||
520 | 25 | 26 | ||
521 | 26 | #include <vector> | 27 | #include <vector> |
522 | 27 | 28 | ||
523 | 28 | 29 | ||
524 | === modified file 'drizzled/select_singlerow_subselect.h' | |||
525 | --- drizzled/select_singlerow_subselect.h 2010-12-18 04:43:40 +0000 | |||
526 | +++ drizzled/select_singlerow_subselect.h 2011-02-12 21:09:18 +0000 | |||
527 | @@ -21,6 +21,8 @@ | |||
528 | 21 | #ifndef DRIZZLED_SELECT_SINGLEROW_SUBSELECT_H | 21 | #ifndef DRIZZLED_SELECT_SINGLEROW_SUBSELECT_H |
529 | 22 | #define DRIZZLED_SELECT_SINGLEROW_SUBSELECT_H | 22 | #define DRIZZLED_SELECT_SINGLEROW_SUBSELECT_H |
530 | 23 | 23 | ||
531 | 24 | #include <drizzled/select_subselect.h> | ||
532 | 25 | |||
533 | 24 | namespace drizzled | 26 | namespace drizzled |
534 | 25 | { | 27 | { |
535 | 26 | 28 | ||
536 | 27 | 29 | ||
537 | === modified file 'drizzled/session.cc' | |||
538 | --- drizzled/session.cc 2011-02-12 21:09:14 +0000 | |||
539 | +++ drizzled/session.cc 2011-02-12 21:09:18 +0000 | |||
540 | @@ -117,6 +117,23 @@ | |||
541 | 117 | 117 | ||
542 | 118 | #include <drizzled/util/backtrace.h> | 118 | #include <drizzled/util/backtrace.h> |
543 | 119 | 119 | ||
544 | 120 | #include <drizzled/table_ident.h> | ||
545 | 121 | #include <drizzled/user_var_entry.h> | ||
546 | 122 | #include <drizzled/unique.h> | ||
547 | 123 | #include <drizzled/var.h> | ||
548 | 124 | |||
549 | 125 | #include <drizzled/select_to_file.h> | ||
550 | 126 | #include <drizzled/select_export.h> | ||
551 | 127 | #include <drizzled/select_dump.h> | ||
552 | 128 | #include <drizzled/select_insert.h> | ||
553 | 129 | #include <drizzled/select_create.h> | ||
554 | 130 | #include <drizzled/tmp_table_param.h> | ||
555 | 131 | #include <drizzled/select_union.h> | ||
556 | 132 | #include <drizzled/select_subselect.h> | ||
557 | 133 | #include <drizzled/select_singlerow_subselect.h> | ||
558 | 134 | #include <drizzled/select_max_min_finder_subselect.h> | ||
559 | 135 | #include <drizzled/select_exists_subselect.h> | ||
560 | 136 | |||
561 | 120 | using namespace std; | 137 | using namespace std; |
562 | 121 | 138 | ||
563 | 122 | namespace fs=boost::filesystem; | 139 | namespace fs=boost::filesystem; |
564 | 123 | 140 | ||
565 | === modified file 'drizzled/session.h' | |||
566 | --- drizzled/session.h 2011-02-12 21:09:14 +0000 | |||
567 | +++ drizzled/session.h 2011-02-12 21:09:18 +0000 | |||
568 | @@ -104,9 +104,6 @@ | |||
569 | 104 | #include "drizzled/sql_lex.h" | 104 | #include "drizzled/sql_lex.h" |
570 | 105 | 105 | ||
571 | 106 | #include "drizzled/visibility.h" | 106 | #include "drizzled/visibility.h" |
572 | 107 | ======= | ||
573 | 108 | #include <drizzled/visibility.h> | ||
574 | 109 | >>>>>>> MERGE-SOURCE | ||
575 | 110 | 107 | ||
576 | 111 | #define MIN_HANDSHAKE_SIZE 6 | 108 | #define MIN_HANDSHAKE_SIZE 6 |
577 | 112 | 109 | ||
578 | @@ -146,22 +143,45 @@ | |||
579 | 146 | #define TC_HEURISTIC_RECOVER_ROLLBACK 2 | 143 | #define TC_HEURISTIC_RECOVER_ROLLBACK 2 |
580 | 147 | extern uint32_t tc_heuristic_recover; | 144 | extern uint32_t tc_heuristic_recover; |
581 | 148 | 145 | ||
582 | 146 | ======= | ||
583 | 147 | #include <drizzled/visibility.h> | ||
584 | 148 | |||
585 | 149 | #include <drizzled/lex_column.h> | ||
586 | 150 | #include <drizzled/sql_lex.h> | ||
587 | 151 | |||
588 | 152 | namespace drizzled | ||
589 | 153 | { | ||
590 | 154 | |||
591 | 155 | >>>>>>> MERGE-SOURCE | ||
592 | 149 | class select_result; | 156 | class select_result; |
594 | 150 | class Time_zone; | 157 | class Join; |
595 | 151 | 158 | ||
596 | 152 | #define Session_SENTRY_MAGIC 0xfeedd1ff | 159 | #define Session_SENTRY_MAGIC 0xfeedd1ff |
597 | 153 | #define Session_SENTRY_GONE 0xdeadbeef | 160 | #define Session_SENTRY_GONE 0xdeadbeef |
598 | 161 | <<<<<<< TREE | ||
599 | 154 | 162 | ||
600 | 155 | extern DRIZZLED_API struct drizzle_system_variables global_system_variables; | 163 | extern DRIZZLED_API struct drizzle_system_variables global_system_variables; |
601 | 156 | 164 | ||
602 | 157 | <<<<<<< TREE | ||
603 | 158 | ======= | 165 | ======= |
609 | 159 | } /* namespace drizzled */ | 166 | #define ESCAPE_CHARS "ntrb0ZN" // keep synchronous with READ_INFO::unescape |
610 | 160 | 167 | ||
611 | 161 | #include <drizzled/sql_lex.h> | 168 | /* Bits in sql_command_flags */ |
612 | 162 | 169 | ||
613 | 163 | namespace drizzled | 170 | enum sql_command_flag_bits |
614 | 164 | { | 171 | { |
615 | 172 | CF_BIT_CHANGES_DATA, | ||
616 | 173 | CF_BIT_HAS_ROW_COUNT, | ||
617 | 174 | CF_BIT_STATUS_COMMAND, | ||
618 | 175 | CF_BIT_SHOW_TABLE_COMMAND, | ||
619 | 176 | CF_BIT_WRITE_LOGS_COMMAND, | ||
620 | 177 | CF_BIT_SIZE | ||
621 | 178 | }; | ||
622 | 179 | |||
623 | 180 | static const std::bitset<CF_BIT_SIZE> CF_CHANGES_DATA(1 << CF_BIT_CHANGES_DATA); | ||
624 | 181 | static const std::bitset<CF_BIT_SIZE> CF_HAS_ROW_COUNT(1 << CF_BIT_HAS_ROW_COUNT); | ||
625 | 182 | static const std::bitset<CF_BIT_SIZE> CF_STATUS_COMMAND(1 << CF_BIT_STATUS_COMMAND); | ||
626 | 183 | static const std::bitset<CF_BIT_SIZE> CF_SHOW_TABLE_COMMAND(1 << CF_BIT_SHOW_TABLE_COMMAND); | ||
627 | 184 | static const std::bitset<CF_BIT_SIZE> CF_WRITE_LOGS_COMMAND(1 << CF_BIT_WRITE_LOGS_COMMAND); | ||
628 | 165 | 185 | ||
629 | 166 | /** | 186 | /** |
630 | 167 | Storage engine specific thread local data. | 187 | Storage engine specific thread local data. |
631 | @@ -1756,85 +1776,6 @@ | |||
632 | 1756 | struct rusage usage; | 1776 | struct rusage usage; |
633 | 1757 | }; | 1777 | }; |
634 | 1758 | 1778 | ||
635 | 1759 | class Join; | ||
636 | 1760 | |||
637 | 1761 | #define ESCAPE_CHARS "ntrb0ZN" // keep synchronous with READ_INFO::unescape | ||
638 | 1762 | |||
639 | 1763 | } /* namespace drizzled */ | ||
640 | 1764 | |||
641 | 1765 | /** @TODO why is this in the middle of the file */ | ||
642 | 1766 | #include <drizzled/select_to_file.h> | ||
643 | 1767 | #include <drizzled/select_export.h> | ||
644 | 1768 | #include <drizzled/select_dump.h> | ||
645 | 1769 | #include <drizzled/select_insert.h> | ||
646 | 1770 | #include <drizzled/select_create.h> | ||
647 | 1771 | #include <drizzled/tmp_table_param.h> | ||
648 | 1772 | #include <drizzled/select_union.h> | ||
649 | 1773 | #include <drizzled/select_subselect.h> | ||
650 | 1774 | #include <drizzled/select_singlerow_subselect.h> | ||
651 | 1775 | #include <drizzled/select_max_min_finder_subselect.h> | ||
652 | 1776 | #include <drizzled/select_exists_subselect.h> | ||
653 | 1777 | |||
654 | 1778 | namespace drizzled | ||
655 | 1779 | { | ||
656 | 1780 | |||
657 | 1781 | /** | ||
658 | 1782 | * A structure used to describe sort information | ||
659 | 1783 | * for a field or item used in ORDER BY. | ||
660 | 1784 | */ | ||
661 | 1785 | class SortField | ||
662 | 1786 | { | ||
663 | 1787 | public: | ||
664 | 1788 | Field *field; /**< Field to sort */ | ||
665 | 1789 | Item *item; /**< Item if not sorting fields */ | ||
666 | 1790 | size_t length; /**< Length of sort field */ | ||
667 | 1791 | uint32_t suffix_length; /**< Length suffix (0-4) */ | ||
668 | 1792 | Item_result result_type; /**< Type of item */ | ||
669 | 1793 | bool reverse; /**< if descending sort */ | ||
670 | 1794 | bool need_strxnfrm; /**< If we have to use strxnfrm() */ | ||
671 | 1795 | |||
672 | 1796 | SortField() : | ||
673 | 1797 | field(0), | ||
674 | 1798 | item(0), | ||
675 | 1799 | length(0), | ||
676 | 1800 | suffix_length(0), | ||
677 | 1801 | result_type(STRING_RESULT), | ||
678 | 1802 | reverse(0), | ||
679 | 1803 | need_strxnfrm(0) | ||
680 | 1804 | { } | ||
681 | 1805 | |||
682 | 1806 | }; | ||
683 | 1807 | |||
684 | 1808 | } /* namespace drizzled */ | ||
685 | 1809 | |||
686 | 1810 | /** @TODO why is this in the middle of the file */ | ||
687 | 1811 | |||
688 | 1812 | #include <drizzled/table_ident.h> | ||
689 | 1813 | #include <drizzled/user_var_entry.h> | ||
690 | 1814 | #include <drizzled/unique.h> | ||
691 | 1815 | #include <drizzled/var.h> | ||
692 | 1816 | #include <drizzled/select_dumpvar.h> | ||
693 | 1817 | |||
694 | 1818 | namespace drizzled | ||
695 | 1819 | { | ||
696 | 1820 | |||
697 | 1821 | /* Bits in sql_command_flags */ | ||
698 | 1822 | |||
699 | 1823 | enum sql_command_flag_bits | ||
700 | 1824 | { | ||
701 | 1825 | CF_BIT_CHANGES_DATA, | ||
702 | 1826 | CF_BIT_HAS_ROW_COUNT, | ||
703 | 1827 | CF_BIT_STATUS_COMMAND, | ||
704 | 1828 | CF_BIT_SHOW_TABLE_COMMAND, | ||
705 | 1829 | CF_BIT_WRITE_LOGS_COMMAND, | ||
706 | 1830 | CF_BIT_SIZE | ||
707 | 1831 | }; | ||
708 | 1832 | |||
709 | 1833 | static const std::bitset<CF_BIT_SIZE> CF_CHANGES_DATA(1 << CF_BIT_CHANGES_DATA); | ||
710 | 1834 | static const std::bitset<CF_BIT_SIZE> CF_HAS_ROW_COUNT(1 << CF_BIT_HAS_ROW_COUNT); | ||
711 | 1835 | static const std::bitset<CF_BIT_SIZE> CF_STATUS_COMMAND(1 << CF_BIT_STATUS_COMMAND); | ||
712 | 1836 | static const std::bitset<CF_BIT_SIZE> CF_SHOW_TABLE_COMMAND(1 << CF_BIT_SHOW_TABLE_COMMAND); | ||
713 | 1837 | static const std::bitset<CF_BIT_SIZE> CF_WRITE_LOGS_COMMAND(1 << CF_BIT_WRITE_LOGS_COMMAND); | ||
714 | 1838 | 1779 | ||
715 | 1839 | namespace display { | 1780 | namespace display { |
716 | 1840 | const std::string &type(drizzled::Session::global_read_lock_t type); | 1781 | const std::string &type(drizzled::Session::global_read_lock_t type); |
717 | 1841 | 1782 | ||
718 | === modified file 'drizzled/set_var.cc' | |||
719 | --- drizzled/set_var.cc 2011-02-12 21:09:14 +0000 | |||
720 | +++ drizzled/set_var.cc 2011-02-12 21:09:18 +0000 | |||
721 | @@ -27,6 +27,8 @@ | |||
722 | 27 | #include <drizzled/item/string.h> | 27 | #include <drizzled/item/string.h> |
723 | 28 | #include <drizzled/sql_list.h> | 28 | #include <drizzled/sql_list.h> |
724 | 29 | 29 | ||
725 | 30 | #include <drizzled/function/set_user_var.h> | ||
726 | 31 | |||
727 | 30 | using namespace std; | 32 | using namespace std; |
728 | 31 | 33 | ||
729 | 32 | namespace drizzled | 34 | namespace drizzled |
730 | 33 | 35 | ||
731 | === modified file 'drizzled/set_var.h' | |||
732 | --- drizzled/set_var.h 2011-02-12 21:09:14 +0000 | |||
733 | +++ drizzled/set_var.h 2011-02-12 21:09:18 +0000 | |||
734 | @@ -37,7 +37,6 @@ | |||
735 | 37 | class sys_var; | 37 | class sys_var; |
736 | 38 | class Item; | 38 | class Item; |
737 | 39 | class Item_func_set_user_var; | 39 | class Item_func_set_user_var; |
738 | 40 | class Time_zone; | ||
739 | 41 | typedef struct my_locale_st MY_LOCALE; | 40 | typedef struct my_locale_st MY_LOCALE; |
740 | 42 | typedef struct charset_info_st CHARSET_INFO; | 41 | typedef struct charset_info_st CHARSET_INFO; |
741 | 43 | 42 | ||
742 | 44 | 43 | ||
743 | === modified file 'drizzled/show.cc' | |||
744 | --- drizzled/show.cc 2011-02-12 21:09:14 +0000 | |||
745 | +++ drizzled/show.cc 2011-02-12 21:09:18 +0000 | |||
746 | @@ -75,6 +75,8 @@ | |||
747 | 75 | #include <vector> | 75 | #include <vector> |
748 | 76 | #include <algorithm> | 76 | #include <algorithm> |
749 | 77 | 77 | ||
750 | 78 | #include <drizzled/table_ident.h> | ||
751 | 79 | |||
752 | 78 | using namespace std; | 80 | using namespace std; |
753 | 79 | 81 | ||
754 | 80 | namespace drizzled | 82 | namespace drizzled |
755 | 81 | 83 | ||
756 | === added file 'drizzled/sort_field.h' | |||
757 | --- drizzled/sort_field.h 1970-01-01 00:00:00 +0000 | |||
758 | +++ drizzled/sort_field.h 2011-02-12 21:09:18 +0000 | |||
759 | @@ -0,0 +1,70 @@ | |||
760 | 1 | /* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*- | ||
761 | 2 | * vim:expandtab:shiftwidth=2:tabstop=2:smarttab: | ||
762 | 3 | * | ||
763 | 4 | * Copyright (C) 2008 Sun Microsystems, Inc. | ||
764 | 5 | * | ||
765 | 6 | * This program is free software; you can redistribute it and/or modify | ||
766 | 7 | * it under the terms of the GNU General Public License as published by | ||
767 | 8 | * the Free Software Foundation; version 2 of the License. | ||
768 | 9 | * | ||
769 | 10 | * This program is distributed in the hope that it will be useful, | ||
770 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
771 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
772 | 13 | * GNU General Public License for more details. | ||
773 | 14 | * | ||
774 | 15 | * You should have received a copy of the GNU General Public License | ||
775 | 16 | * along with this program; if not, write to the Free Software | ||
776 | 17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
777 | 18 | */ | ||
778 | 19 | |||
779 | 20 | |||
780 | 21 | |||
781 | 22 | #ifndef DRIZZLED_SORT_FIELD_H | ||
782 | 23 | #define DRIZZLED_SORT_FIELD_H | ||
783 | 24 | |||
784 | 25 | #include <drizzled/session.h> | ||
785 | 26 | #include <drizzled/select_to_file.h> | ||
786 | 27 | #include <drizzled/select_export.h> | ||
787 | 28 | #include <drizzled/select_dump.h> | ||
788 | 29 | #include <drizzled/select_insert.h> | ||
789 | 30 | #include <drizzled/select_create.h> | ||
790 | 31 | #include <drizzled/tmp_table_param.h> | ||
791 | 32 | #include <drizzled/select_union.h> | ||
792 | 33 | #include <drizzled/select_subselect.h> | ||
793 | 34 | #include <drizzled/select_singlerow_subselect.h> | ||
794 | 35 | #include <drizzled/select_max_min_finder_subselect.h> | ||
795 | 36 | #include <drizzled/select_exists_subselect.h> | ||
796 | 37 | |||
797 | 38 | namespace drizzled | ||
798 | 39 | { | ||
799 | 40 | |||
800 | 41 | /** | ||
801 | 42 | * A structure used to describe sort information | ||
802 | 43 | * for a field or item used in ORDER BY. | ||
803 | 44 | */ | ||
804 | 45 | class SortField | ||
805 | 46 | { | ||
806 | 47 | public: | ||
807 | 48 | Field *field; /**< Field to sort */ | ||
808 | 49 | Item *item; /**< Item if not sorting fields */ | ||
809 | 50 | size_t length; /**< Length of sort field */ | ||
810 | 51 | uint32_t suffix_length; /**< Length suffix (0-4) */ | ||
811 | 52 | Item_result result_type; /**< Type of item */ | ||
812 | 53 | bool reverse; /**< if descending sort */ | ||
813 | 54 | bool need_strxnfrm; /**< If we have to use strxnfrm() */ | ||
814 | 55 | |||
815 | 56 | SortField() : | ||
816 | 57 | field(0), | ||
817 | 58 | item(0), | ||
818 | 59 | length(0), | ||
819 | 60 | suffix_length(0), | ||
820 | 61 | result_type(STRING_RESULT), | ||
821 | 62 | reverse(0), | ||
822 | 63 | need_strxnfrm(0) | ||
823 | 64 | { } | ||
824 | 65 | |||
825 | 66 | }; | ||
826 | 67 | |||
827 | 68 | } /* namespace drizzled */ | ||
828 | 69 | |||
829 | 70 | #endif /* DRIZZLED_SORT_FIELD_H */ | ||
830 | 0 | 71 | ||
831 | === modified file 'drizzled/sql_derived.cc' | |||
832 | --- drizzled/sql_derived.cc 2011-02-12 21:09:14 +0000 | |||
833 | +++ drizzled/sql_derived.cc 2011-02-12 21:09:18 +0000 | |||
834 | @@ -19,6 +19,7 @@ | |||
835 | 19 | */ | 19 | */ |
836 | 20 | #include "config.h" | 20 | #include "config.h" |
837 | 21 | #include <drizzled/sql_select.h> | 21 | #include <drizzled/sql_select.h> |
838 | 22 | #include <drizzled/select_union.h> | ||
839 | 22 | 23 | ||
840 | 23 | namespace drizzled | 24 | namespace drizzled |
841 | 24 | { | 25 | { |
842 | 25 | 26 | ||
843 | === modified file 'drizzled/sql_insert.cc' | |||
844 | --- drizzled/sql_insert.cc 2011-02-12 21:09:14 +0000 | |||
845 | +++ drizzled/sql_insert.cc 2011-02-12 21:09:18 +0000 | |||
846 | @@ -33,6 +33,8 @@ | |||
847 | 33 | #include <drizzled/plugin/transactional_storage_engine.h> | 33 | #include <drizzled/plugin/transactional_storage_engine.h> |
848 | 34 | 34 | ||
849 | 35 | #include <drizzled/table/shell.h> | 35 | #include <drizzled/table/shell.h> |
850 | 36 | #include <drizzled/select_insert.h> | ||
851 | 37 | #include <drizzled/select_create.h> | ||
852 | 36 | 38 | ||
853 | 37 | namespace drizzled | 39 | namespace drizzled |
854 | 38 | { | 40 | { |
855 | 39 | 41 | ||
856 | === modified file 'drizzled/sql_lex.h' | |||
857 | --- drizzled/sql_lex.h 2011-02-12 21:09:14 +0000 | |||
858 | +++ drizzled/sql_lex.h 2011-02-12 21:09:18 +0000 | |||
859 | @@ -37,6 +37,7 @@ | |||
860 | 37 | #include <drizzled/index_hint.h> | 37 | #include <drizzled/index_hint.h> |
861 | 38 | #include <drizzled/statement.h> | 38 | #include <drizzled/statement.h> |
862 | 39 | #include <drizzled/optimizer/explain_plan.h> | 39 | #include <drizzled/optimizer/explain_plan.h> |
863 | 40 | #include <drizzled/system_variables.h> | ||
864 | 40 | 41 | ||
865 | 41 | #include <bitset> | 42 | #include <bitset> |
866 | 42 | #include <string> | 43 | #include <string> |
867 | 43 | 44 | ||
868 | === modified file 'drizzled/sql_parse.cc' | |||
869 | --- drizzled/sql_parse.cc 2011-02-12 21:09:14 +0000 | |||
870 | +++ drizzled/sql_parse.cc 2011-02-12 21:09:18 +0000 | |||
871 | @@ -65,6 +65,7 @@ | |||
872 | 65 | #include <algorithm> | 65 | #include <algorithm> |
873 | 66 | #include <boost/date_time.hpp> | 66 | #include <boost/date_time.hpp> |
874 | 67 | #include <drizzled/internal/my_sys.h> | 67 | #include <drizzled/internal/my_sys.h> |
875 | 68 | #include <drizzled/table_ident.h> | ||
876 | 68 | 69 | ||
877 | 69 | using namespace std; | 70 | using namespace std; |
878 | 70 | 71 | ||
879 | 71 | 72 | ||
880 | === modified file 'drizzled/sql_select.cc' | |||
881 | --- drizzled/sql_select.cc 2011-02-12 21:09:14 +0000 | |||
882 | +++ drizzled/sql_select.cc 2011-02-12 21:09:18 +0000 | |||
883 | @@ -100,6 +100,7 @@ | |||
884 | 100 | #include <drizzled/optimizer/quick_ror_intersect_select.h> | 100 | #include <drizzled/optimizer/quick_ror_intersect_select.h> |
885 | 101 | 101 | ||
886 | 102 | #include <drizzled/filesort.h> | 102 | #include <drizzled/filesort.h> |
887 | 103 | #include <drizzled/sort_field.h> | ||
888 | 103 | >>>>>>> MERGE-SOURCE | 104 | >>>>>>> MERGE-SOURCE |
889 | 104 | 105 | ||
890 | 105 | using namespace std; | 106 | using namespace std; |
891 | 106 | 107 | ||
892 | === modified file 'drizzled/sql_union.cc' | |||
893 | --- drizzled/sql_union.cc 2010-12-24 07:15:43 +0000 | |||
894 | +++ drizzled/sql_union.cc 2011-02-12 21:09:18 +0000 | |||
895 | @@ -23,6 +23,7 @@ | |||
896 | 23 | #include <drizzled/item/type_holder.h> | 23 | #include <drizzled/item/type_holder.h> |
897 | 24 | #include <drizzled/sql_base.h> | 24 | #include <drizzled/sql_base.h> |
898 | 25 | #include <drizzled/sql_union.h> | 25 | #include <drizzled/sql_union.h> |
899 | 26 | #include <drizzled/select_union.h> | ||
900 | 26 | 27 | ||
901 | 27 | namespace drizzled | 28 | namespace drizzled |
902 | 28 | { | 29 | { |
903 | 29 | 30 | ||
904 | === modified file 'drizzled/sql_yacc.yy' | |||
905 | --- drizzled/sql_yacc.yy 2011-02-12 21:09:14 +0000 | |||
906 | +++ drizzled/sql_yacc.yy 2011-02-12 21:09:18 +0000 | |||
907 | @@ -40,6 +40,12 @@ | |||
908 | 40 | #include "config.h" | 40 | #include "config.h" |
909 | 41 | #include <cstdio> | 41 | #include <cstdio> |
910 | 42 | #include <drizzled/parser.h> | 42 | #include <drizzled/parser.h> |
911 | 43 | #include <drizzled/table_ident.h> | ||
912 | 44 | #include <drizzled/function/set_user_var.h> | ||
913 | 45 | #include <drizzled/select_dumpvar.h> | ||
914 | 46 | #include <drizzled/select_dump.h> | ||
915 | 47 | #include <drizzled/select_export.h> | ||
916 | 48 | #include <drizzled/select_result.h> | ||
917 | 43 | 49 | ||
918 | 44 | int yylex(void *yylval, void *yysession); | 50 | int yylex(void *yylval, void *yysession); |
919 | 45 | 51 | ||
920 | 46 | 52 | ||
921 | === modified file 'drizzled/statement/create_table.cc' | |||
922 | --- drizzled/statement/create_table.cc 2011-02-09 22:48:12 +0000 | |||
923 | +++ drizzled/statement/create_table.cc 2011-02-12 21:09:18 +0000 | |||
924 | @@ -25,7 +25,12 @@ | |||
925 | 25 | #include <drizzled/statement/create_table.h> | 25 | #include <drizzled/statement/create_table.h> |
926 | 26 | #include <drizzled/message.h> | 26 | #include <drizzled/message.h> |
927 | 27 | #include <drizzled/identifier.h> | 27 | #include <drizzled/identifier.h> |
928 | 28 | <<<<<<< TREE | ||
929 | 28 | #include <drizzled/plugin/storage_engine.h> | 29 | #include <drizzled/plugin/storage_engine.h> |
930 | 30 | ======= | ||
931 | 31 | #include <drizzled/table_ident.h> | ||
932 | 32 | #include <drizzled/select_create.h> | ||
933 | 33 | >>>>>>> MERGE-SOURCE | ||
934 | 29 | 34 | ||
935 | 30 | #include <iostream> | 35 | #include <iostream> |
936 | 31 | 36 | ||
937 | 32 | 37 | ||
938 | === modified file 'drizzled/statement/insert_select.cc' | |||
939 | --- drizzled/statement/insert_select.cc 2011-01-22 07:05:32 +0000 | |||
940 | +++ drizzled/statement/insert_select.cc 2011-02-12 21:09:18 +0000 | |||
941 | @@ -24,6 +24,7 @@ | |||
942 | 24 | #include <drizzled/session.h> | 24 | #include <drizzled/session.h> |
943 | 25 | #include <drizzled/probes.h> | 25 | #include <drizzled/probes.h> |
944 | 26 | #include <drizzled/statement/insert_select.h> | 26 | #include <drizzled/statement/insert_select.h> |
945 | 27 | #include <drizzled/select_insert.h> | ||
946 | 27 | 28 | ||
947 | 28 | namespace drizzled | 29 | namespace drizzled |
948 | 29 | { | 30 | { |
949 | 30 | 31 | ||
950 | === modified file 'drizzled/statement/replace_select.cc' | |||
951 | --- drizzled/statement/replace_select.cc 2011-01-22 07:05:32 +0000 | |||
952 | +++ drizzled/statement/replace_select.cc 2011-02-12 21:09:18 +0000 | |||
953 | @@ -23,6 +23,8 @@ | |||
954 | 23 | #include <drizzled/lock.h> | 23 | #include <drizzled/lock.h> |
955 | 24 | #include <drizzled/session.h> | 24 | #include <drizzled/session.h> |
956 | 25 | #include <drizzled/statement/replace_select.h> | 25 | #include <drizzled/statement/replace_select.h> |
957 | 26 | #include <drizzled/select_insert.h> | ||
958 | 27 | #include <drizzled/select_result.h> | ||
959 | 26 | 28 | ||
960 | 27 | namespace drizzled | 29 | namespace drizzled |
961 | 28 | { | 30 | { |
962 | 29 | 31 | ||
963 | === modified file 'drizzled/sys_var.h' | |||
964 | --- drizzled/sys_var.h 2011-02-12 21:09:14 +0000 | |||
965 | +++ drizzled/sys_var.h 2011-02-12 21:09:18 +0000 | |||
966 | @@ -26,6 +26,7 @@ | |||
967 | 26 | #include <drizzled/constrained_value.h> | 26 | #include <drizzled/constrained_value.h> |
968 | 27 | #include <drizzled/set_var.h> | 27 | #include <drizzled/set_var.h> |
969 | 28 | #include <drizzled/show_type.h> | 28 | #include <drizzled/show_type.h> |
970 | 29 | #include <drizzled/typelib.h> | ||
971 | 29 | #include <drizzled/item_result.h> | 30 | #include <drizzled/item_result.h> |
972 | 30 | #include <drizzled/base.h> | 31 | #include <drizzled/base.h> |
973 | 31 | #include <drizzled/global_charset_info.h> | 32 | #include <drizzled/global_charset_info.h> |
974 | @@ -37,7 +38,6 @@ | |||
975 | 37 | { | 38 | { |
976 | 38 | 39 | ||
977 | 39 | class sys_var; | 40 | class sys_var; |
978 | 40 | class Time_zone; | ||
979 | 41 | typedef struct my_locale_st MY_LOCALE; | 41 | typedef struct my_locale_st MY_LOCALE; |
980 | 42 | typedef struct st_typelib TYPELIB; | 42 | typedef struct st_typelib TYPELIB; |
981 | 43 | 43 | ||
982 | 44 | 44 | ||
983 | === added file 'drizzled/system_variables.h' | |||
984 | --- drizzled/system_variables.h 1970-01-01 00:00:00 +0000 | |||
985 | +++ drizzled/system_variables.h 2011-02-12 21:09:18 +0000 | |||
986 | @@ -0,0 +1,115 @@ | |||
987 | 1 | /* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*- | ||
988 | 2 | * vim:expandtab:shiftwidth=2:tabstop=2:smarttab: | ||
989 | 3 | * | ||
990 | 4 | * Copyright (C) 2008 Sun Microsystems, Inc. | ||
991 | 5 | * | ||
992 | 6 | * This program is free software; you can redistribute it and/or modify | ||
993 | 7 | * it under the terms of the GNU General Public License as published by | ||
994 | 8 | * the Free Software Foundation; version 2 of the License. | ||
995 | 9 | * | ||
996 | 10 | * This program is distributed in the hope that it will be useful, | ||
997 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
998 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
999 | 13 | * GNU General Public License for more details. | ||
1000 | 14 | * | ||
1001 | 15 | * You should have received a copy of the GNU General Public License | ||
1002 | 16 | * along with this program; if not, write to the Free Software | ||
1003 | 17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
1004 | 18 | */ | ||
1005 | 19 | |||
1006 | 20 | #ifndef DRIZZLED_SYSTEM_VARIABLES_H | ||
1007 | 21 | #define DRIZZLED_SYSTEM_VARIABLES_H | ||
1008 | 22 | |||
1009 | 23 | #include <drizzled/base.h> | ||
1010 | 24 | #include <drizzled/visibility.h> | ||
1011 | 25 | |||
1012 | 26 | namespace drizzled | ||
1013 | 27 | { | ||
1014 | 28 | |||
1015 | 29 | namespace plugin | ||
1016 | 30 | { | ||
1017 | 31 | class StorageEngine; | ||
1018 | 32 | } | ||
1019 | 33 | |||
1020 | 34 | class Time_zone; | ||
1021 | 35 | typedef struct charset_info_st CHARSET_INFO; | ||
1022 | 36 | typedef struct my_locale_st MY_LOCALE; | ||
1023 | 37 | |||
1024 | 38 | struct drizzle_system_variables | ||
1025 | 39 | { | ||
1026 | 40 | drizzle_system_variables() | ||
1027 | 41 | {} | ||
1028 | 42 | /* | ||
1029 | 43 | How dynamically allocated system variables are handled: | ||
1030 | 44 | |||
1031 | 45 | The global_system_variables and max_system_variables are "authoritative" | ||
1032 | 46 | They both should have the same 'version' and 'size'. | ||
1033 | 47 | When attempting to access a dynamic variable, if the session version | ||
1034 | 48 | is out of date, then the session version is updated and realloced if | ||
1035 | 49 | neccessary and bytes copied from global to make up for missing data. | ||
1036 | 50 | */ | ||
1037 | 51 | char * dynamic_variables_ptr; | ||
1038 | 52 | uint32_t dynamic_variables_head; /* largest valid variable offset */ | ||
1039 | 53 | uint32_t dynamic_variables_size; /* how many bytes are in use */ | ||
1040 | 54 | |||
1041 | 55 | uint64_t myisam_max_extra_sort_file_size; | ||
1042 | 56 | uint64_t max_heap_table_size; | ||
1043 | 57 | uint64_t tmp_table_size; | ||
1044 | 58 | ha_rows select_limit; | ||
1045 | 59 | ha_rows max_join_size; | ||
1046 | 60 | uint64_t auto_increment_increment; | ||
1047 | 61 | uint64_t auto_increment_offset; | ||
1048 | 62 | uint64_t bulk_insert_buff_size; | ||
1049 | 63 | uint64_t join_buff_size; | ||
1050 | 64 | uint32_t max_allowed_packet; | ||
1051 | 65 | uint64_t max_error_count; | ||
1052 | 66 | uint64_t max_length_for_sort_data; | ||
1053 | 67 | size_t max_sort_length; | ||
1054 | 68 | uint64_t min_examined_row_limit; | ||
1055 | 69 | bool optimizer_prune_level; | ||
1056 | 70 | bool log_warnings; | ||
1057 | 71 | |||
1058 | 72 | uint32_t optimizer_search_depth; | ||
1059 | 73 | uint32_t div_precincrement; | ||
1060 | 74 | uint64_t preload_buff_size; | ||
1061 | 75 | uint32_t read_buff_size; | ||
1062 | 76 | uint32_t read_rnd_buff_size; | ||
1063 | 77 | bool replicate_query; | ||
1064 | 78 | size_t sortbuff_size; | ||
1065 | 79 | uint32_t thread_handling; | ||
1066 | 80 | uint32_t tx_isolation; | ||
1067 | 81 | size_t transaction_message_threshold; | ||
1068 | 82 | uint32_t completion_type; | ||
1069 | 83 | /* Determines which non-standard SQL behaviour should be enabled */ | ||
1070 | 84 | uint32_t sql_mode; | ||
1071 | 85 | uint64_t max_seeks_for_key; | ||
1072 | 86 | size_t range_alloc_block_size; | ||
1073 | 87 | uint32_t query_alloc_block_size; | ||
1074 | 88 | uint32_t query_prealloc_size; | ||
1075 | 89 | uint64_t group_concat_max_len; | ||
1076 | 90 | uint64_t pseudo_thread_id; | ||
1077 | 91 | |||
1078 | 92 | plugin::StorageEngine *storage_engine; | ||
1079 | 93 | |||
1080 | 94 | /* Only charset part of these variables is sensible */ | ||
1081 | 95 | const CHARSET_INFO *character_set_filesystem; | ||
1082 | 96 | |||
1083 | 97 | /* Both charset and collation parts of these variables are important */ | ||
1084 | 98 | const CHARSET_INFO *collation_server; | ||
1085 | 99 | |||
1086 | 100 | inline const CHARSET_INFO *getCollation(void) | ||
1087 | 101 | { | ||
1088 | 102 | return collation_server; | ||
1089 | 103 | } | ||
1090 | 104 | |||
1091 | 105 | /* Locale Support */ | ||
1092 | 106 | MY_LOCALE *lc_time_names; | ||
1093 | 107 | |||
1094 | 108 | Time_zone *time_zone; | ||
1095 | 109 | }; | ||
1096 | 110 | |||
1097 | 111 | extern DRIZZLED_API struct drizzle_system_variables global_system_variables; | ||
1098 | 112 | |||
1099 | 113 | } /* namespace drizzled */ | ||
1100 | 114 | |||
1101 | 115 | #endif /* DRIZZLED_SYSTEM_VARIABLES_H */ | ||
1102 | 0 | 116 | ||
1103 | === renamed file 'drizzled/system_variables.h' => 'drizzled/system_variables.h.moved' | |||
1104 | === modified file 'drizzled/unique.cc' | |||
1105 | --- drizzled/unique.cc 2011-02-12 21:09:14 +0000 | |||
1106 | +++ drizzled/unique.cc 2011-02-12 21:09:18 +0000 | |||
1107 | @@ -36,6 +36,7 @@ | |||
1108 | 36 | #include <drizzled/session.h> | 36 | #include <drizzled/session.h> |
1109 | 37 | #include <drizzled/sql_list.h> | 37 | #include <drizzled/sql_list.h> |
1110 | 38 | #include <drizzled/internal/iocache.h> | 38 | #include <drizzled/internal/iocache.h> |
1111 | 39 | #include <drizzled/unique.h> | ||
1112 | 39 | 40 | ||
1113 | 40 | #if defined(CMATH_NAMESPACE) | 41 | #if defined(CMATH_NAMESPACE) |
1114 | 41 | using namespace CMATH_NAMESPACE; | 42 | using namespace CMATH_NAMESPACE; |
1115 | 42 | 43 | ||
1116 | === modified file 'drizzled/user_var_entry.cc' | |||
1117 | --- drizzled/user_var_entry.cc 2011-02-12 21:09:14 +0000 | |||
1118 | +++ drizzled/user_var_entry.cc 2011-02-12 21:09:18 +0000 | |||
1119 | @@ -20,6 +20,7 @@ | |||
1120 | 20 | #include "config.h" | 20 | #include "config.h" |
1121 | 21 | #include <drizzled/session.h> | 21 | #include <drizzled/session.h> |
1122 | 22 | #include <drizzled/internal/m_string.h> | 22 | #include <drizzled/internal/m_string.h> |
1123 | 23 | #include <drizzled/user_var_entry.h> | ||
1124 | 23 | 24 | ||
1125 | 24 | namespace drizzled | 25 | namespace drizzled |
1126 | 25 | { | 26 | { |
1127 | 26 | 27 | ||
1128 | === modified file 'drizzled/user_var_entry.h' | |||
1129 | --- drizzled/user_var_entry.h 2011-02-12 21:09:14 +0000 | |||
1130 | +++ drizzled/user_var_entry.h 2011-02-12 21:09:18 +0000 | |||
1131 | @@ -22,10 +22,19 @@ | |||
1132 | 22 | #define DRIZZLED_USER_VAR_ENTRY_H | 22 | #define DRIZZLED_USER_VAR_ENTRY_H |
1133 | 23 | 23 | ||
1134 | 24 | #include <drizzled/query_id.h> | 24 | #include <drizzled/query_id.h> |
1135 | 25 | #include <drizzled/lex_string.h> | ||
1136 | 26 | #include <drizzled/item_result.h> | ||
1137 | 27 | #include <drizzled/sql_string.h> | ||
1138 | 28 | #include <drizzled/dtcollation.h> | ||
1139 | 25 | 29 | ||
1140 | 26 | namespace drizzled | 30 | namespace drizzled |
1141 | 27 | { | 31 | { |
1142 | 28 | 32 | ||
1143 | 33 | namespace type | ||
1144 | 34 | { | ||
1145 | 35 | class Decimal; | ||
1146 | 36 | } | ||
1147 | 37 | |||
1148 | 29 | // this is needed for user_vars hash | 38 | // this is needed for user_vars hash |
1149 | 30 | class user_var_entry | 39 | class user_var_entry |
1150 | 31 | { | 40 | { |
1151 | @@ -54,7 +63,7 @@ | |||
1152 | 54 | } | 63 | } |
1153 | 55 | LEX_STRING name; | 64 | LEX_STRING name; |
1154 | 56 | char *value; | 65 | char *value; |
1156 | 57 | ulong length; | 66 | unsigned long length; |
1157 | 58 | size_t size; | 67 | size_t size; |
1158 | 59 | query_id_t update_query_id; | 68 | query_id_t update_query_id; |
1159 | 60 | query_id_t used_query_id; | 69 | query_id_t used_query_id; |
1160 | 61 | 70 | ||
1161 | === modified file 'plugin/logging_stats/user_commands.cc' | |||
1162 | --- plugin/logging_stats/user_commands.cc 2010-12-18 04:43:40 +0000 | |||
1163 | +++ plugin/logging_stats/user_commands.cc 2011-02-12 21:09:18 +0000 | |||
1164 | @@ -27,6 +27,7 @@ | |||
1165 | 27 | * THE POSSIBILITY OF SUCH DAMAGE. | 27 | * THE POSSIBILITY OF SUCH DAMAGE. |
1166 | 28 | */ | 28 | */ |
1167 | 29 | 29 | ||
1168 | 30 | #include "config.h" | ||
1169 | 30 | #include "user_commands.h" | 31 | #include "user_commands.h" |
1170 | 31 | 32 | ||
1171 | 32 | using namespace drizzled; | 33 | using namespace drizzled; |
1172 | 33 | 34 | ||
1173 | === modified file 'plugin/mysql_protocol/mysql_protocol.cc' | |||
1174 | --- plugin/mysql_protocol/mysql_protocol.cc 2011-02-12 21:09:14 +0000 | |||
1175 | +++ plugin/mysql_protocol/mysql_protocol.cc 2011-02-12 21:09:18 +0000 | |||
1176 | @@ -35,7 +35,6 @@ | |||
1177 | 35 | 35 | ||
1178 | 36 | #include <drizzled/identifier.h> | 36 | #include <drizzled/identifier.h> |
1179 | 37 | 37 | ||
1180 | 38 | #define PROTOCOL_VERSION 10 | ||
1181 | 39 | 38 | ||
1182 | 40 | namespace po= boost::program_options; | 39 | namespace po= boost::program_options; |
1183 | 41 | using namespace std; | 40 | using namespace std; |
1184 | @@ -44,6 +43,9 @@ | |||
1185 | 44 | namespace drizzle_plugin | 43 | namespace drizzle_plugin |
1186 | 45 | { | 44 | { |
1187 | 46 | 45 | ||
1188 | 46 | static const uint32_t PROTOCOL_VERSION= 10; | ||
1189 | 47 | static const uint32_t MIN_HANDSHAKE_SIZE= 6; | ||
1190 | 48 | |||
1191 | 47 | std::vector<std::string> ClientMySQLProtocol::mysql_admin_ip_addresses; | 49 | std::vector<std::string> ClientMySQLProtocol::mysql_admin_ip_addresses; |
1192 | 48 | static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024; | 50 | static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024; |
1193 | 49 | 51 | ||
1194 | 50 | 52 | ||
1195 | === modified file 'plugin/session_dictionary/variables.cc' | |||
1196 | --- plugin/session_dictionary/variables.cc 2011-02-12 21:09:14 +0000 | |||
1197 | +++ plugin/session_dictionary/variables.cc 2011-02-12 21:09:18 +0000 | |||
1198 | @@ -20,6 +20,7 @@ | |||
1199 | 20 | 20 | ||
1200 | 21 | #include "config.h" | 21 | #include "config.h" |
1201 | 22 | 22 | ||
1202 | 23 | #include <drizzled/user_var_entry.h> | ||
1203 | 23 | #include <plugin/session_dictionary/dictionary.h> | 24 | #include <plugin/session_dictionary/dictionary.h> |
1204 | 24 | 25 | ||
1205 | 25 | #define LARGEST_USER_VARIABLE_NAME 128 | 26 | #define LARGEST_USER_VARIABLE_NAME 128 |
I just did this :)
We will need to merge it.