Drizzle

Merge lp:~mordred/drizzle/bug568752 into lp:~drizzle-trunk/drizzle/development

  1. bug568752
  2. Merge into development
Proposed by Monty Taylor
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mordred/drizzle/bug568752
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 292 lines (+28/-1)
24 files modified
drizzled/field.cc (+1/-0)
drizzled/function/time/date_add_interval.cc (+2/-0)
drizzled/function/time/date_format.cc (+1/-0)
drizzled/function/time/typecast.cc (+3/-0)
drizzled/item.cc (+1/-0)
drizzled/item/ident.cc (+2/-0)
drizzled/item/subselect.cc (+1/-0)
drizzled/item/sum.cc (+1/-0)
drizzled/message/statement_transform.cc (+1/-0)
drizzled/message/transaction_reader.cc (+1/-0)
drizzled/optimizer/explain_plan.cc (+1/-0)
drizzled/plugin/client.cc (+1/-0)
drizzled/plugin/error_message.cc (+1/-0)
drizzled/plugin/listen_tcp.cc (+1/-0)
drizzled/plugin/loader.cc (+1/-0)
drizzled/set_var.cc (+1/-0)
drizzled/sql_error.cc (+1/-0)
drizzled/sql_insert.cc (+1/-0)
drizzled/sql_lex.cc (+1/-0)
drizzled/temporal.cc (+1/-0)
drizzled/tztime.cc (+1/-0)
plugin/logging_gearman/logging_gearman.cc (+1/-1)
plugin/logging_query/logging_query.cc (+1/-0)
plugin/transaction_log/transaction_log_reader.cc (+1/-0)
To merge this branch: bzr merge lp:~mordred/drizzle/bug568752
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+24026@code.launchpad.net

Description of the change

A build fix reported in Debian.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/field.cc'
2--- drizzled/field.cc 2010-04-19 20:12:22 +0000
3+++ drizzled/field.cc 2010-04-23 16:04:19 +0000
4@@ -23,6 +23,7 @@
5 */
6
7 #include "config.h"
8+#include <cstdio>
9 #include <errno.h>
10 #include <float.h>
11 #include "drizzled/sql_select.h"
12
13=== modified file 'drizzled/function/time/date_add_interval.cc'
14--- drizzled/function/time/date_add_interval.cc 2010-02-04 08:14:46 +0000
15+++ drizzled/function/time/date_add_interval.cc 2010-04-23 16:04:19 +0000
16@@ -19,6 +19,8 @@
17
18 #include "config.h"
19
20+#include <cstdio>
21+
22 #include "drizzled/function/time/date_add_interval.h"
23 #include "drizzled/temporal_interval.h"
24 #include "drizzled/time_functions.h"
25
26=== modified file 'drizzled/function/time/date_format.cc'
27--- drizzled/function/time/date_format.cc 2010-03-26 17:24:57 +0000
28+++ drizzled/function/time/date_format.cc 2010-04-23 16:04:19 +0000
29@@ -23,6 +23,7 @@
30 #include "drizzled/time_functions.h"
31 #include "drizzled/internal/m_string.h"
32
33+#include <cstdio>
34 #include <algorithm>
35
36 using namespace std;
37
38=== modified file 'drizzled/function/time/typecast.cc'
39--- drizzled/function/time/typecast.cc 2010-02-04 08:14:46 +0000
40+++ drizzled/function/time/typecast.cc 2010-04-23 16:04:19 +0000
41@@ -18,6 +18,9 @@
42 */
43
44 #include "config.h"
45+
46+#include <cstdio>
47+
48 #include "drizzled/current_session.h"
49 #include "drizzled/error.h"
50 #include "drizzled/function/time/typecast.h"
51
52=== modified file 'drizzled/item.cc'
53--- drizzled/item.cc 2010-03-31 21:15:40 +0000
54+++ drizzled/item.cc 2010-04-23 16:04:19 +0000
55@@ -49,6 +49,7 @@
56 #include "drizzled/field/varstring.h"
57 #include "drizzled/internal/m_string.h"
58
59+#include <cstdio>
60 #include <math.h>
61 #include <algorithm>
62 #include <float.h>
63
64=== modified file 'drizzled/item/ident.cc'
65--- drizzled/item/ident.cc 2010-03-26 11:10:37 +0000
66+++ drizzled/item/ident.cc 2010-04-23 16:04:19 +0000
67@@ -23,6 +23,8 @@
68 #include <drizzled/current_session.h>
69 #include <drizzled/item/ident.h>
70
71+#include <cstdio>
72+
73 using namespace std;
74
75 namespace drizzled
76
77=== modified file 'drizzled/item/subselect.cc'
78--- drizzled/item/subselect.cc 2010-03-26 16:11:54 +0000
79+++ drizzled/item/subselect.cc 2010-04-23 16:04:19 +0000
80@@ -25,6 +25,7 @@
81 */
82 #include "config.h"
83
84+#include <cstdio>
85 #include <limits.h>
86
87 #include <drizzled/sql_select.h>
88
89=== modified file 'drizzled/item/sum.cc'
90--- drizzled/item/sum.cc 2010-04-20 18:14:52 +0000
91+++ drizzled/item/sum.cc 2010-04-23 16:04:19 +0000
92@@ -21,6 +21,7 @@
93 Sum functions (COUNT, MIN...)
94 */
95 #include "config.h"
96+#include <cstdio>
97 #include <math.h>
98 #include <drizzled/sql_select.h>
99 #include <drizzled/error.h>
100
101=== modified file 'drizzled/message/statement_transform.cc'
102--- drizzled/message/statement_transform.cc 2010-03-24 19:36:31 +0000
103+++ drizzled/message/statement_transform.cc 2010-04-23 16:04:19 +0000
104@@ -38,6 +38,7 @@
105 #include <string>
106 #include <vector>
107 #include <sstream>
108+#include <cstdio>
109
110 using namespace std;
111
112
113=== modified file 'drizzled/message/transaction_reader.cc'
114--- drizzled/message/transaction_reader.cc 2010-03-29 22:01:35 +0000
115+++ drizzled/message/transaction_reader.cc 2010-04-23 16:04:19 +0000
116@@ -29,6 +29,7 @@
117 #include <sys/stat.h>
118 #include <fcntl.h>
119 #include <limits.h>
120+#include <cstdio>
121 #include <cerrno>
122 #include <iostream>
123 #include <string>
124
125=== modified file 'drizzled/optimizer/explain_plan.cc'
126--- drizzled/optimizer/explain_plan.cc 2010-02-04 08:14:46 +0000
127+++ drizzled/optimizer/explain_plan.cc 2010-04-23 16:04:19 +0000
128@@ -29,6 +29,7 @@
129 #include "drizzled/join.h"
130 #include "drizzled/internal/m_string.h"
131
132+#include <cstdio>
133 #include <string>
134 #include <sstream>
135
136
137=== modified file 'drizzled/plugin/client.cc'
138--- drizzled/plugin/client.cc 2010-03-26 21:08:09 +0000
139+++ drizzled/plugin/client.cc 2010-04-23 16:04:19 +0000
140@@ -18,6 +18,7 @@
141 */
142
143 #include "config.h"
144+#include <cstdio>
145 #include "drizzled/plugin/client.h"
146
147 using namespace std;
148
149=== modified file 'drizzled/plugin/error_message.cc'
150--- drizzled/plugin/error_message.cc 2010-01-20 08:53:21 +0000
151+++ drizzled/plugin/error_message.cc 2010-04-23 16:04:19 +0000
152@@ -23,6 +23,7 @@
153
154 #include "drizzled/gettext.h"
155
156+#include <cstdio>
157 #include <vector>
158
159 using namespace std;
160
161=== modified file 'drizzled/plugin/listen_tcp.cc'
162--- drizzled/plugin/listen_tcp.cc 2010-02-04 08:14:46 +0000
163+++ drizzled/plugin/listen_tcp.cc 2010-04-23 16:04:19 +0000
164@@ -23,6 +23,7 @@
165 #include <drizzled/plugin/listen_tcp.h>
166 #include <drizzled/errmsg_print.h>
167
168+#include <cstdio>
169 #include <unistd.h>
170 #include <sys/socket.h>
171 #include <fcntl.h>
172
173=== modified file 'drizzled/plugin/loader.cc'
174--- drizzled/plugin/loader.cc 2010-04-19 19:23:14 +0000
175+++ drizzled/plugin/loader.cc 2010-04-23 16:04:19 +0000
176@@ -17,6 +17,7 @@
177
178 #include <dlfcn.h>
179
180+#include <cstdio>
181 #include <string>
182 #include <vector>
183 #include <map>
184
185=== modified file 'drizzled/set_var.cc'
186--- drizzled/set_var.cc 2010-04-19 17:51:52 +0000
187+++ drizzled/set_var.cc 2010-04-23 16:04:19 +0000
188@@ -64,6 +64,7 @@
189 #include "drizzled/charset.h"
190 #include "drizzled/transaction_services.h"
191
192+#include <cstdio>
193 #include <map>
194 #include <algorithm>
195
196
197=== modified file 'drizzled/sql_error.cc'
198--- drizzled/sql_error.cc 2010-04-19 19:23:14 +0000
199+++ drizzled/sql_error.cc 2010-04-23 16:04:19 +0000
200@@ -43,6 +43,7 @@
201
202 #include "config.h"
203
204+#include <cstdio>
205 #include <stdarg.h>
206
207 #include <drizzled/session.h>
208
209=== modified file 'drizzled/sql_insert.cc'
210--- drizzled/sql_insert.cc 2010-04-20 19:05:03 +0000
211+++ drizzled/sql_insert.cc 2010-04-23 16:04:19 +0000
212@@ -17,6 +17,7 @@
213 /* Insert of records */
214
215 #include "config.h"
216+#include <cstdio>
217 #include <drizzled/sql_select.h>
218 #include <drizzled/show.h>
219 #include <drizzled/error.h>
220
221=== modified file 'drizzled/sql_lex.cc'
222--- drizzled/sql_lex.cc 2010-02-26 08:21:58 +0000
223+++ drizzled/sql_lex.cc 2010-04-23 16:04:19 +0000
224@@ -26,6 +26,7 @@
225 #include "drizzled/lookup_symbol.h"
226 #include "drizzled/index_hint.h"
227
228+#include <cstdio>
229 #include <ctype.h>
230
231 using namespace std;
232
233=== modified file 'drizzled/temporal.cc'
234--- drizzled/temporal.cc 2010-03-27 10:10:49 +0000
235+++ drizzled/temporal.cc 2010-04-23 16:04:19 +0000
236@@ -49,6 +49,7 @@
237
238 #include <time.h>
239
240+#include <cstdio>
241 #include <ostream>
242 #include <iomanip>
243 #include <vector>
244
245=== modified file 'drizzled/tztime.cc'
246--- drizzled/tztime.cc 2010-04-05 14:26:09 +0000
247+++ drizzled/tztime.cc 2010-04-23 16:04:19 +0000
248@@ -19,6 +19,7 @@
249
250
251 #include "config.h"
252+#include <cstdio>
253 #include "drizzled/tzfile.h"
254 #include "drizzled/tztime.h"
255 #include "drizzled/gettext.h"
256
257=== modified file 'plugin/logging_gearman/logging_gearman.cc'
258--- plugin/logging_gearman/logging_gearman.cc 2010-03-06 02:08:13 +0000
259+++ plugin/logging_gearman/logging_gearman.cc 2010-04-23 16:04:19 +0000
260@@ -28,7 +28,7 @@
261 #include <sys/types.h>
262 #include <sys/stat.h>
263 #include <fcntl.h>
264-
265+#include <cstdio>
266
267 using namespace drizzled;
268
269
270=== modified file 'plugin/logging_query/logging_query.cc'
271--- plugin/logging_query/logging_query.cc 2010-03-06 02:08:13 +0000
272+++ plugin/logging_query/logging_query.cc 2010-04-23 16:04:19 +0000
273@@ -28,6 +28,7 @@
274 #include <sys/stat.h>
275 #include <fcntl.h>
276
277+#include <cstdio>
278
279 using namespace drizzled;
280
281
282=== modified file 'plugin/transaction_log/transaction_log_reader.cc'
283--- plugin/transaction_log/transaction_log_reader.cc 2010-03-29 22:01:35 +0000
284+++ plugin/transaction_log/transaction_log_reader.cc 2010-04-23 16:04:19 +0000
285@@ -47,6 +47,7 @@
286
287 #include <climits>
288 #include <cerrno>
289+#include <cstdio>
290
291 #include "transaction_log_reader.h"
292 #include "transaction_log.h"