Merge lp:~linuxjedi/libdrizzle/update-copyright-headers into lp:libdrizzle

Proposed by Andrew Hutchings on 2013-01-27
Status: Merged
Approved by: Andrew Hutchings on 2013-01-27
Approved revision: 108
Merged at revision: 104
Proposed branch: lp:~linuxjedi/libdrizzle/update-copyright-headers
Merge into: lp:libdrizzle
Diff against target: 948 lines (+206/-132)
54 files modified
docs/conf.py.in (+1/-1)
libdrizzle-5.1/binlog.h (+1/-1)
libdrizzle-5.1/column.h (+1/-0)
libdrizzle-5.1/column_client.h (+1/-0)
libdrizzle-5.1/conn.h (+1/-0)
libdrizzle-5.1/conn_client.h (+1/-0)
libdrizzle-5.1/constants.h (+1/-0)
libdrizzle-5.1/drizzle.h (+1/-0)
libdrizzle-5.1/drizzle_client.h (+1/-0)
libdrizzle-5.1/error.h (+1/-1)
libdrizzle-5.1/field_client.h (+1/-0)
libdrizzle-5.1/libdrizzle.h (+1/-1)
libdrizzle-5.1/query.h (+1/-0)
libdrizzle-5.1/result.h (+1/-0)
libdrizzle-5.1/result_client.h (+1/-0)
libdrizzle-5.1/return.h (+1/-0)
libdrizzle-5.1/row_client.h (+1/-0)
libdrizzle-5.1/ssl.h (+1/-1)
libdrizzle-5.1/statement.h (+1/-1)
libdrizzle-5.1/structs.h (+1/-1)
libdrizzle-5.1/verbose.h (+1/-0)
libdrizzle-5.1/version.h.in (+1/-0)
libdrizzle/binlog.cc (+1/-1)
libdrizzle/binlog.h (+1/-1)
libdrizzle/column.cc (+1/-0)
libdrizzle/column.h (+1/-1)
libdrizzle/command.cc (+1/-0)
libdrizzle/common.h (+2/-0)
libdrizzle/conn.cc (+1/-0)
libdrizzle/conn_local.h (+1/-1)
libdrizzle/conn_uds.cc (+1/-0)
libdrizzle/datetime.h (+1/-1)
libdrizzle/drizzle.cc (+1/-0)
libdrizzle/drizzle_local.h (+1/-0)
libdrizzle/error.cc (+1/-0)
libdrizzle/field.cc (+1/-0)
libdrizzle/handshake.cc (+1/-0)
libdrizzle/handshake_client.h (+1/-0)
libdrizzle/include.am (+1/-0)
libdrizzle/pack.cc (+1/-0)
libdrizzle/pack.h (+1/-0)
libdrizzle/poll.cc (+1/-0)
libdrizzle/poll.h (+1/-0)
libdrizzle/query.cc (+1/-0)
libdrizzle/result.cc (+1/-0)
libdrizzle/result.h (+143/-0)
libdrizzle/row.cc (+1/-0)
libdrizzle/ssl.cc (+1/-1)
libdrizzle/state.cc (+1/-0)
libdrizzle/state.h (+1/-0)
libdrizzle/statement_local.h (+1/-1)
libdrizzle/statement_param.cc (+1/-1)
libdrizzle/structs.h (+1/-100)
tests/unit/connect_uds.c (+10/-17)
To merge this branch: bzr merge lp:~linuxjedi/libdrizzle/update-copyright-headers
Reviewer Review Type Date Requested Status
Drizzle Trunk 2013-01-27 Pending
Review via email: mp+145088@code.launchpad.net

Description of the change

Fixes Brian's merge conflict

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 'docs/conf.py.in'
2--- docs/conf.py.in 2012-12-21 14:04:15 +0000
3+++ docs/conf.py.in 2013-01-27 14:02:20 +0000
4@@ -47,7 +47,7 @@
5
6 # General information about the project.
7 project = u'libdrizzle'
8-copyright = u'2012, Drizzle Development Group, http://drizzle.org/'
9+copyright = u'2008-2013, Drizzle Development Group, http://drizzle.org/'
10
11 # The version info for the project you're documenting, acts as replacement for
12 # |version| and |release|, also used in various other places throughout the
13
14=== modified file 'libdrizzle-5.1/binlog.h'
15--- libdrizzle-5.1/binlog.h 2013-01-27 05:08:57 +0000
16+++ libdrizzle-5.1/binlog.h 2013-01-27 14:02:20 +0000
17@@ -2,7 +2,7 @@
18 *
19 * Drizzle Client & Protocol Library
20 *
21- * Copyright (C) 2012 Drizzle Developer Group
22+ * Copyright (C) 2012-2013 Drizzle Developer Group
23 * All rights reserved.
24 *
25 * Redistribution and use in source and binary forms, with or without
26
27=== modified file 'libdrizzle-5.1/column.h'
28--- libdrizzle-5.1/column.h 2013-01-05 10:27:32 +0000
29+++ libdrizzle-5.1/column.h 2013-01-27 14:02:20 +0000
30@@ -1,6 +1,7 @@
31 /*
32 * Drizzle Client & Protocol Library
33 *
34+ * Copyright (C) 2008-2013 Drizzle Developer Group
35 * Copyright (C) 2008 Eric Day (eday@oddments.org)
36 * All rights reserved.
37 *
38
39=== modified file 'libdrizzle-5.1/column_client.h'
40--- libdrizzle-5.1/column_client.h 2012-12-18 11:36:28 +0000
41+++ libdrizzle-5.1/column_client.h 2013-01-27 14:02:20 +0000
42@@ -1,6 +1,7 @@
43 /*
44 * Drizzle Client & Protocol Library
45 *
46+ * Copyright (C) 2008-2013 Drizzle Developer Group
47 * Copyright (C) 2008 Eric Day (eday@oddments.org)
48 * All rights reserved.
49 *
50
51=== modified file 'libdrizzle-5.1/conn.h'
52--- libdrizzle-5.1/conn.h 2013-01-27 01:57:09 +0000
53+++ libdrizzle-5.1/conn.h 2013-01-27 14:02:20 +0000
54@@ -1,6 +1,7 @@
55 /*
56 * Drizzle Client & Protocol Library
57 *
58+ * Copyright (C) 2008-2013 Drizzle Developer Group
59 * Copyright (C) 2008 Eric Day (eday@oddments.org)
60 * All rights reserved.
61 *
62
63=== modified file 'libdrizzle-5.1/conn_client.h'
64--- libdrizzle-5.1/conn_client.h 2013-01-05 11:41:26 +0000
65+++ libdrizzle-5.1/conn_client.h 2013-01-27 14:02:20 +0000
66@@ -1,6 +1,7 @@
67 /*
68 * Drizzle Client & Protocol Library
69 *
70+ * Copyright (C) 2008-2013 Drizzle Developer Group
71 * Copyright (C) 2008 Eric Day (eday@oddments.org)
72 * All rights reserved.
73 *
74
75=== modified file 'libdrizzle-5.1/constants.h'
76--- libdrizzle-5.1/constants.h 2013-01-27 05:08:57 +0000
77+++ libdrizzle-5.1/constants.h 2013-01-27 14:02:20 +0000
78@@ -2,6 +2,7 @@
79 *
80 * Drizzle Client & Protocol Library
81 *
82+ * Copyright (C) 2008-2013 Drizzle Developer Group
83 * Copyright (C) 2011 Brian Aker (brian@tangent.org)
84 * Copyright (C) 2008 Eric Day (eday@oddments.org)
85 * All rights reserved.
86
87=== modified file 'libdrizzle-5.1/drizzle.h'
88--- libdrizzle-5.1/drizzle.h 2013-01-27 09:48:19 +0000
89+++ libdrizzle-5.1/drizzle.h 2013-01-27 14:02:20 +0000
90@@ -1,6 +1,7 @@
91 /*
92 * Drizzle Client & Protocol Library
93 *
94+ * Copyright (C) 2008-2013 Drizzle Developer Group
95 * Copyright (C) 2008 Eric Day (eday@oddments.org)
96 * All rights reserved.
97 *
98
99=== modified file 'libdrizzle-5.1/drizzle_client.h'
100--- libdrizzle-5.1/drizzle_client.h 2013-01-27 09:48:19 +0000
101+++ libdrizzle-5.1/drizzle_client.h 2013-01-27 14:02:20 +0000
102@@ -1,6 +1,7 @@
103 /*
104 * Drizzle Client & Protocol Library
105 *
106+ * Copyright (C) 2008-2013 Drizzle Developer Group
107 * Copyright (C) 2008 Eric Day (eday@oddments.org)
108 * All rights reserved.
109 *
110
111=== modified file 'libdrizzle-5.1/error.h'
112--- libdrizzle-5.1/error.h 2012-12-30 02:23:50 +0000
113+++ libdrizzle-5.1/error.h 2013-01-27 14:02:20 +0000
114@@ -1,7 +1,7 @@
115 /*
116 * Drizzle Client & Protocol Library
117 *
118- * Copyright (C) 2012 Drizzle Developer Group
119+ * Copyright (C) 2012-2013 Drizzle Developer Group
120 * All rights reserved.
121 *
122 * Redistribution and use in source and binary forms, with or without
123
124=== modified file 'libdrizzle-5.1/field_client.h'
125--- libdrizzle-5.1/field_client.h 2012-12-18 11:36:28 +0000
126+++ libdrizzle-5.1/field_client.h 2013-01-27 14:02:20 +0000
127@@ -1,6 +1,7 @@
128 /*
129 * Drizzle Client & Protocol Library
130 *
131+ * Copyright (C) 2008-2013 Drizzle Developer Group
132 * Copyright (C) 2008 Eric Day (eday@oddments.org)
133 * All rights reserved.
134 *
135
136=== modified file 'libdrizzle-5.1/libdrizzle.h'
137--- libdrizzle-5.1/libdrizzle.h 2012-12-24 10:20:04 +0000
138+++ libdrizzle-5.1/libdrizzle.h 2013-01-27 14:02:20 +0000
139@@ -1,5 +1,5 @@
140 /* Drizzle Client Library
141- * Copyright (C) 2011 Olaf van der Spek
142+ * Copyright (C) 2012-2013 Drizzle Developer Group
143 * All rights reserved.
144 *
145 * Redistribution and use in source and binary forms, with or without
146
147=== modified file 'libdrizzle-5.1/query.h'
148--- libdrizzle-5.1/query.h 2013-01-27 01:57:09 +0000
149+++ libdrizzle-5.1/query.h 2013-01-27 14:02:20 +0000
150@@ -1,6 +1,7 @@
151 /*
152 * Drizzle Client & Protocol Library
153 *
154+ * Copyright (C) 2008-2013 Drizzle Developer Group
155 * Copyright (C) 2008 Eric Day (eday@oddments.org)
156 * All rights reserved.
157 *
158
159=== modified file 'libdrizzle-5.1/result.h'
160--- libdrizzle-5.1/result.h 2012-12-30 11:18:18 +0000
161+++ libdrizzle-5.1/result.h 2013-01-27 14:02:20 +0000
162@@ -1,6 +1,7 @@
163 /*
164 * Drizzle Client & Protocol Library
165 *
166+ * Copyright (C) 2008-2013 Drizzle Developer Group
167 * Copyright (C) 2008 Eric Day (eday@oddments.org)
168 * All rights reserved.
169 *
170
171=== modified file 'libdrizzle-5.1/result_client.h'
172--- libdrizzle-5.1/result_client.h 2012-12-22 08:54:15 +0000
173+++ libdrizzle-5.1/result_client.h 2013-01-27 14:02:20 +0000
174@@ -1,6 +1,7 @@
175 /*
176 * Drizzle Client & Protocol Library
177 *
178+ * Copyright (C) 2008-2013 Drizzle Developer Group
179 * Copyright (C) 2008 Eric Day (eday@oddments.org)
180 * All rights reserved.
181 *
182
183=== modified file 'libdrizzle-5.1/return.h'
184--- libdrizzle-5.1/return.h 2013-01-26 23:44:28 +0000
185+++ libdrizzle-5.1/return.h 2013-01-27 14:02:20 +0000
186@@ -1,6 +1,7 @@
187 /*
188 * Drizzle Client & Protocol Library
189 *
190+ * Copyright (C) 2012-2013 Drizzle Developer Group
191 * Copyright (C) 2012 Brian Aker (brian@tangent.org)
192 * All rights reserved.
193 *
194
195=== modified file 'libdrizzle-5.1/row_client.h'
196--- libdrizzle-5.1/row_client.h 2012-12-18 11:36:28 +0000
197+++ libdrizzle-5.1/row_client.h 2013-01-27 14:02:20 +0000
198@@ -1,6 +1,7 @@
199 /*
200 * Drizzle Client & Protocol Library
201 *
202+ * Copyright (C) 2008-2013 Drizzle Developer Group
203 * Copyright (C) 2008 Eric Day (eday@oddments.org)
204 * All rights reserved.
205 *
206
207=== modified file 'libdrizzle-5.1/ssl.h'
208--- libdrizzle-5.1/ssl.h 2013-01-12 14:14:18 +0000
209+++ libdrizzle-5.1/ssl.h 2013-01-27 14:02:20 +0000
210@@ -1,7 +1,7 @@
211 /*
212 * Drizzle Client & Protocol Library
213 *
214- * Copyright (C) 2012 Drizzle Developer Group
215+ * Copyright (C) 2012-2013 Drizzle Developer Group
216 * All rights reserved.
217 *
218 * Redistribution and use in source and binary forms, with or without
219
220=== modified file 'libdrizzle-5.1/statement.h'
221--- libdrizzle-5.1/statement.h 2013-01-12 14:14:18 +0000
222+++ libdrizzle-5.1/statement.h 2013-01-27 14:02:20 +0000
223@@ -2,7 +2,7 @@
224 *
225 * Drizzle Client & Protocol Library
226 *
227- * Copyright (C) 2012 Drizzle Developer Group
228+ * Copyright (C) 2012-2013 Drizzle Developer Group
229 * All rights reserved.
230 *
231 * Redistribution and use in source and binary forms, with or without
232
233=== modified file 'libdrizzle-5.1/structs.h'
234--- libdrizzle-5.1/structs.h 2012-12-30 02:23:50 +0000
235+++ libdrizzle-5.1/structs.h 2013-01-27 14:02:20 +0000
236@@ -2,7 +2,7 @@
237 *
238 * Drizzle Client & Protocol Library
239 *
240- * Copyright (C) 2012 Drizzle Developer Group
241+ * Copyright (C) 2012-2013 Drizzle Developer Group
242 * All rights reserved.
243 *
244 * Redistribution and use in source and binary forms, with or without
245
246=== modified file 'libdrizzle-5.1/verbose.h'
247--- libdrizzle-5.1/verbose.h 2013-01-05 11:31:45 +0000
248+++ libdrizzle-5.1/verbose.h 2013-01-27 14:02:20 +0000
249@@ -1,6 +1,7 @@
250 /*
251 * Drizzle Client & Protocol Library
252 *
253+ * Copyright (C) 2012-2013 Drizzle Developer Group
254 * Copyright (C) 2012 Brian Aker (brian@tangent.org)
255 * All rights reserved.
256 *
257
258=== modified file 'libdrizzle-5.1/version.h.in'
259--- libdrizzle-5.1/version.h.in 2012-12-18 11:36:28 +0000
260+++ libdrizzle-5.1/version.h.in 2013-01-27 14:02:20 +0000
261@@ -2,6 +2,7 @@
262 *
263 * Drizzle Client & Protocol Library
264 *
265+ * Copyright (C) 2012-2013 Drizzle Developer Group
266 * Copyright (C) 2012 Brian Aker, http://tangent.org/
267 * All rights reserved.
268 *
269
270=== modified file 'libdrizzle/binlog.cc'
271--- libdrizzle/binlog.cc 2013-01-27 05:22:31 +0000
272+++ libdrizzle/binlog.cc 2013-01-27 14:02:20 +0000
273@@ -2,7 +2,7 @@
274 *
275 * Drizzle Client & Protocol Library
276 *
277- * Copyright (C) 2012 Drizzle Developer Group
278+ * Copyright (C) 2012-2013 Drizzle Developer Group
279 * All rights reserved.
280 *
281 * Redistribution and use in source and binary forms, with or without
282
283=== modified file 'libdrizzle/binlog.h'
284--- libdrizzle/binlog.h 2013-01-12 14:14:18 +0000
285+++ libdrizzle/binlog.h 2013-01-27 14:02:20 +0000
286@@ -2,7 +2,7 @@
287 *
288 * Drizzle Client & Protocol Library
289 *
290- * Copyright (C) 2012 Drizzle Developer Group
291+ * Copyright (C) 2012-2013 Drizzle Developer Group
292 * All rights reserved.
293 *
294 * Redistribution and use in source and binary forms, with or without
295
296=== modified file 'libdrizzle/column.cc'
297--- libdrizzle/column.cc 2013-01-27 04:54:08 +0000
298+++ libdrizzle/column.cc 2013-01-27 14:02:20 +0000
299@@ -2,6 +2,7 @@
300 *
301 * Drizzle Client & Protocol Library
302 *
303+ * Copyright (C) 2008-2013 Drizzle Developer Group
304 * Copyright (C) 2008 Eric Day (eday@oddments.org)
305 * All rights reserved.
306 *
307
308=== modified file 'libdrizzle/column.h'
309--- libdrizzle/column.h 2013-01-05 10:27:32 +0000
310+++ libdrizzle/column.h 2013-01-27 14:02:20 +0000
311@@ -2,7 +2,7 @@
312 *
313 * Drizzle Client & Protocol Library
314 *
315- * Copyright (C) 2012 Drizzle Developer Group
316+ * Copyright (C) 2012-2013 Drizzle Developer Group
317 * All rights reserved.
318 *
319 * Redistribution and use in source and binary forms, with or without
320
321=== modified file 'libdrizzle/command.cc'
322--- libdrizzle/command.cc 2013-01-27 04:54:08 +0000
323+++ libdrizzle/command.cc 2013-01-27 14:02:20 +0000
324@@ -2,6 +2,7 @@
325 *
326 * Drizzle Client & Protocol Library
327 *
328+ * Copyright (C) 2008-2013 Drizzle Developer Group
329 * Copyright (C) 2008 Eric Day (eday@oddments.org)
330 * All rights reserved.
331 *
332
333=== modified file 'libdrizzle/common.h'
334--- libdrizzle/common.h 2013-01-27 09:48:19 +0000
335+++ libdrizzle/common.h 2013-01-27 14:02:20 +0000
336@@ -1,6 +1,7 @@
337 /*
338 * Drizzle Client & Protocol Library
339 *
340+ * Copyright (C) 2008-2013 Drizzle Developer Group
341 * Copyright (C) 2008 Eric Day (eday@oddments.org)
342 * All rights reserved.
343 *
344@@ -89,5 +90,6 @@
345 #include "libdrizzle/column.h"
346 #include "libdrizzle/binlog.h"
347 #include "libdrizzle/handshake_client.h"
348+#include "libdrizzle/result.h"
349
350 #include <memory.h>
351
352=== modified file 'libdrizzle/conn.cc'
353--- libdrizzle/conn.cc 2013-01-27 09:48:19 +0000
354+++ libdrizzle/conn.cc 2013-01-27 14:02:20 +0000
355@@ -2,6 +2,7 @@
356 *
357 * Drizzle Client & Protocol Library
358 *
359+ * Copyright (C) 2008-2013 Drizzle Developer Group
360 * Copyright (C) 2008 Eric Day (eday@oddments.org)
361 * All rights reserved.
362 *
363
364=== modified file 'libdrizzle/conn_local.h'
365--- libdrizzle/conn_local.h 2013-01-27 04:54:08 +0000
366+++ libdrizzle/conn_local.h 2013-01-27 14:02:20 +0000
367@@ -2,7 +2,7 @@
368 *
369 * Drizzle Client & Protocol Library
370 *
371- * Copyright (C) 2012 Drizzle Developer Group
372+ * Copyright (C) 2008-2013 Drizzle Developer Group
373 * Copyright (C) 2008 Eric Day (eday@oddments.org)
374 * All rights reserved.
375 *
376
377=== modified file 'libdrizzle/conn_uds.cc'
378--- libdrizzle/conn_uds.cc 2013-01-12 13:36:22 +0000
379+++ libdrizzle/conn_uds.cc 2013-01-27 14:02:20 +0000
380@@ -2,6 +2,7 @@
381 *
382 * Drizzle Client & Protocol Library
383 *
384+ * Copyright (C) 2008-2013 Drizzle Developer Group
385 * Copyright (C) 2008 Eric Day (eday@oddments.org)
386 * All rights reserved.
387 *
388
389=== modified file 'libdrizzle/datetime.h'
390--- libdrizzle/datetime.h 2012-12-30 02:23:50 +0000
391+++ libdrizzle/datetime.h 2013-01-27 14:02:20 +0000
392@@ -2,7 +2,7 @@
393 *
394 * Drizzle Client & Protocol Library
395 *
396- * Copyright (C) 2012 Drizzle Developer Group
397+ * Copyright (C) 2008-2013 Drizzle Developer Group
398 * All rights reserved.
399 *
400 * Redistribution and use in source and binary forms, with or without
401
402=== modified file 'libdrizzle/drizzle.cc'
403--- libdrizzle/drizzle.cc 2013-01-27 10:02:07 +0000
404+++ libdrizzle/drizzle.cc 2013-01-27 14:02:20 +0000
405@@ -2,6 +2,7 @@
406 *
407 * Drizzle Client & Protocol Library
408 *
409+ * Copyright (C) 2008-2013 Drizzle Developer Group
410 * Copyright (C) 2008 Eric Day (eday@oddments.org)
411 * All rights reserved.
412 *
413
414=== modified file 'libdrizzle/drizzle_local.h'
415--- libdrizzle/drizzle_local.h 2013-01-27 09:48:19 +0000
416+++ libdrizzle/drizzle_local.h 2013-01-27 14:02:20 +0000
417@@ -1,6 +1,7 @@
418 /*
419 * Drizzle Client & Protocol Library
420 *
421+ * Copyright (C) 2008-2013 Drizzle Developer Group
422 * Copyright (C) 2008 Eric Day (eday@oddments.org)
423 * All rights reserved.
424 *
425
426=== modified file 'libdrizzle/error.cc'
427--- libdrizzle/error.cc 2013-01-05 15:56:07 +0000
428+++ libdrizzle/error.cc 2013-01-27 14:02:20 +0000
429@@ -1,6 +1,7 @@
430 /*
431 * Drizzle Client & Protocol Library
432 *
433+ * Copyright (C) 2008-2013 Drizzle Developer Group
434 * Copyright (C) 2012 Brian Aker (brian@tangent.org)
435 * All rights reserved.
436 *
437
438=== modified file 'libdrizzle/field.cc'
439--- libdrizzle/field.cc 2013-01-27 04:54:08 +0000
440+++ libdrizzle/field.cc 2013-01-27 14:02:20 +0000
441@@ -2,6 +2,7 @@
442 *
443 * Drizzle Client & Protocol Library
444 *
445+ * Copyright (C) 2008-2013 Drizzle Developer Group
446 * Copyright (C) 2008 Eric Day (eday@oddments.org)
447 * All rights reserved.
448 *
449
450=== modified file 'libdrizzle/handshake.cc'
451--- libdrizzle/handshake.cc 2013-01-27 04:54:08 +0000
452+++ libdrizzle/handshake.cc 2013-01-27 14:02:20 +0000
453@@ -2,6 +2,7 @@
454 *
455 * Drizzle Client & Protocol Library
456 *
457+ * Copyright (C) 2008-2013 Drizzle Developer Group
458 * Copyright (C) 2008 Eric Day (eday@oddments.org)
459 * All rights reserved.
460 *
461
462=== modified file 'libdrizzle/handshake_client.h'
463--- libdrizzle/handshake_client.h 2013-01-27 09:48:19 +0000
464+++ libdrizzle/handshake_client.h 2013-01-27 14:02:20 +0000
465@@ -1,6 +1,7 @@
466 /*
467 * Drizzle Client & Protocol Library
468 *
469+ * Copyright (C) 2008-2013 Drizzle Developer Group
470 * Copyright (C) 2008 Eric Day (eday@oddments.org)
471 * All rights reserved.
472 *
473
474=== modified file 'libdrizzle/include.am'
475--- libdrizzle/include.am 2013-01-27 09:48:19 +0000
476+++ libdrizzle/include.am 2013-01-27 14:02:20 +0000
477@@ -12,6 +12,7 @@
478 noinst_HEADERS+= libdrizzle/pack.h
479 noinst_HEADERS+= libdrizzle/packet.h
480 noinst_HEADERS+= libdrizzle/poll.h
481+noinst_HEADERS+= libdrizzle/result.h
482 noinst_HEADERS+= libdrizzle/sha1.h
483 noinst_HEADERS+= libdrizzle/state.h
484 noinst_HEADERS+= libdrizzle/statement_local.h
485
486=== modified file 'libdrizzle/pack.cc'
487--- libdrizzle/pack.cc 2013-01-26 23:31:43 +0000
488+++ libdrizzle/pack.cc 2013-01-27 14:02:20 +0000
489@@ -2,6 +2,7 @@
490 *
491 * Drizzle Client & Protocol Library
492 *
493+ * Copyright (C) 2008-2013 Drizzle Developer Group
494 * Copyright (C) 2008 Eric Day (eday@oddments.org)
495 * All rights reserved.
496 *
497
498=== modified file 'libdrizzle/pack.h'
499--- libdrizzle/pack.h 2013-01-05 10:27:32 +0000
500+++ libdrizzle/pack.h 2013-01-27 14:02:20 +0000
501@@ -1,6 +1,7 @@
502 /*
503 * Drizzle Client & Protocol Library
504 *
505+ * Copyright (C) 2008-2013 Drizzle Developer Group
506 * Copyright (C) 2008 Eric Day (eday@oddments.org)
507 * All rights reserved.
508 *
509
510=== modified file 'libdrizzle/poll.cc'
511--- libdrizzle/poll.cc 2013-01-05 15:46:05 +0000
512+++ libdrizzle/poll.cc 2013-01-27 14:02:20 +0000
513@@ -1,4 +1,5 @@
514 /* LibMemcached
515+ * Copyright (C) 2013 Drizzle Developer Group
516 * Copyright (C) 2010 Brian Aker, Trond Norbye
517 * All rights reserved.
518 *
519
520=== modified file 'libdrizzle/poll.h'
521--- libdrizzle/poll.h 2013-01-05 15:46:05 +0000
522+++ libdrizzle/poll.h 2013-01-27 14:02:20 +0000
523@@ -1,4 +1,5 @@
524 /* LibMemcached
525+ * Copyright (C) 2012-2013 Drizzle Developer Group
526 * Copyright (C) 2010 Brian Aker, Trond Norbye
527 * All rights reserved.
528 *
529
530=== modified file 'libdrizzle/query.cc'
531--- libdrizzle/query.cc 2013-01-27 01:57:09 +0000
532+++ libdrizzle/query.cc 2013-01-27 14:02:20 +0000
533@@ -2,6 +2,7 @@
534 *
535 * Drizzle Client & Protocol Library
536 *
537+ * Copyright (C) 2008-2013 Drizzle Developer Group
538 * Copyright (C) 2008 Eric Day (eday@oddments.org)
539 * All rights reserved.
540 *
541
542=== modified file 'libdrizzle/result.cc'
543--- libdrizzle/result.cc 2013-01-27 05:22:31 +0000
544+++ libdrizzle/result.cc 2013-01-27 14:02:20 +0000
545@@ -2,6 +2,7 @@
546 *
547 * Drizzle Client & Protocol Library
548 *
549+ * Copyright (C) 2008-2013 Drizzle Developer Group
550 * Copyright (C) 2008 Eric Day (eday@oddments.org)
551 * All rights reserved.
552 *
553
554=== added file 'libdrizzle/result.h'
555--- libdrizzle/result.h 1970-01-01 00:00:00 +0000
556+++ libdrizzle/result.h 2013-01-27 14:02:20 +0000
557@@ -0,0 +1,143 @@
558+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
559+ *
560+ * Drizzle Client & Protocol Library
561+ *
562+ * Copyright (C) 2013 Drizzle Developer Group
563+ * All rights reserved.
564+ *
565+ * Redistribution and use in source and binary forms, with or without
566+ * modification, are permitted provided that the following conditions are
567+ * met:
568+ *
569+ * * Redistributions of source code must retain the above copyright
570+ * notice, this list of conditions and the following disclaimer.
571+ *
572+ * * Redistributions in binary form must reproduce the above
573+ * copyright notice, this list of conditions and the following disclaimer
574+ * in the documentation and/or other materials provided with the
575+ * distribution.
576+ *
577+ * * The names of its contributors may not be used to endorse or
578+ * promote products derived from this software without specific prior
579+ * written permission.
580+ *
581+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
582+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
583+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
584+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
585+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
586+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
587+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
588+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
589+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
590+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
591+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
592+ *
593+ */
594+
595+
596+#pragma once
597+
598+/**
599+ * @ingroup drizzle_result
600+ */
601+struct drizzle_result_st
602+{
603+ drizzle_st *con;
604+ drizzle_result_st *next;
605+ drizzle_result_st *prev;
606+ drizzle_result_options_t options;
607+
608+ char info[DRIZZLE_MAX_INFO_SIZE];
609+ uint16_t error_code;
610+ char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
611+ uint64_t insert_id;
612+ uint16_t warning_count;
613+ uint64_t affected_rows;
614+
615+ uint16_t column_count;
616+ uint16_t column_current;
617+ drizzle_column_st *column_list;
618+ drizzle_column_st *column;
619+ drizzle_column_st *column_buffer;
620+
621+ uint64_t row_count;
622+ uint64_t row_current;
623+
624+ uint16_t field_current;
625+ size_t field_total;
626+ size_t field_offset;
627+ size_t field_size;
628+ drizzle_field_t field;
629+ drizzle_field_t field_buffer;
630+
631+ uint64_t row_list_size;
632+ drizzle_row_t row;
633+ drizzle_row_t *row_list;
634+ size_t *field_sizes;
635+ size_t **field_sizes_list;
636+ drizzle_binlog_st *binlog_event;
637+ bool binlog_checksums;
638+ uint8_t **null_bitmap_list;
639+ uint8_t *null_bitmap;
640+ uint8_t null_bitmap_length;
641+ bool binary_rows;
642+
643+ drizzle_result_st() :
644+ con(NULL),
645+ next(NULL),
646+ prev(NULL),
647+ options(DRIZZLE_RESULT_NONE),
648+ error_code(0),
649+ insert_id(0),
650+ warning_count(0),
651+ affected_rows(0),
652+ column_count(0),
653+ column_current(0),
654+ column_list(NULL),
655+ column(NULL),
656+ column_buffer(NULL),
657+ row_count(0),
658+ row_current(0),
659+ field_current(0),
660+ field_total(0),
661+ field_offset(0),
662+ field_size(0),
663+ field(NULL),
664+ field_buffer(NULL),
665+ row_list_size(0),
666+ row(NULL),
667+ row_list(NULL),
668+ field_sizes(NULL),
669+ field_sizes_list(NULL),
670+ binlog_event(NULL),
671+ binlog_checksums(false),
672+ null_bitmap_list(NULL),
673+ null_bitmap(NULL),
674+ null_bitmap_length(0),
675+ binary_rows(false)
676+ {
677+ info[0]= '\0';
678+ sqlstate[0]= '\0';
679+ }
680+
681+ bool push_state(drizzle_state_fn* func_)
682+ {
683+ if (con)
684+ {
685+ return con->push_state(func_);
686+ }
687+
688+ return false;
689+ }
690+
691+ bool has_state() const
692+ {
693+ if (con)
694+ {
695+ return con->has_state();
696+ }
697+
698+ return false;
699+ }
700+};
701
702=== modified file 'libdrizzle/row.cc'
703--- libdrizzle/row.cc 2013-01-27 04:54:08 +0000
704+++ libdrizzle/row.cc 2013-01-27 14:02:20 +0000
705@@ -2,6 +2,7 @@
706 *
707 * Drizzle Client & Protocol Library
708 *
709+ * Copyright (C) 2008-2013 Drizzle Developer Group
710 * Copyright (C) 2008 Eric Day (eday@oddments.org)
711 * All rights reserved.
712 *
713
714=== modified file 'libdrizzle/ssl.cc'
715--- libdrizzle/ssl.cc 2013-01-12 14:14:18 +0000
716+++ libdrizzle/ssl.cc 2013-01-27 14:02:20 +0000
717@@ -2,7 +2,7 @@
718 *
719 * Drizzle Client & Protocol Library
720 *
721- * Copyright (C) 2012 Drizzle Developer Group
722+ * Copyright (C) 2012-2013 Drizzle Developer Group
723 * All rights reserved.
724 *
725 * Redistribution and use in source and binary forms, with or without
726
727=== modified file 'libdrizzle/state.cc'
728--- libdrizzle/state.cc 2013-01-27 04:54:08 +0000
729+++ libdrizzle/state.cc 2013-01-27 14:02:20 +0000
730@@ -2,6 +2,7 @@
731 *
732 * Drizzle Client & Protocol Library
733 *
734+ * Copyright (C) 2008-2013 Drizzle Developer Group
735 * Copyright (C) 2008 Eric Day (eday@oddments.org)
736 * All rights reserved.
737 *
738
739=== modified file 'libdrizzle/state.h'
740--- libdrizzle/state.h 2012-12-23 01:05:57 +0000
741+++ libdrizzle/state.h 2013-01-27 14:02:20 +0000
742@@ -1,6 +1,7 @@
743 /*
744 * Drizzle Client & Protocol Library
745 *
746+ * Copyright (C) 2008-2013 Drizzle Developer Group
747 * Copyright (C) 2008 Eric Day (eday@oddments.org)
748 * All rights reserved.
749 *
750
751=== modified file 'libdrizzle/statement_local.h'
752--- libdrizzle/statement_local.h 2013-01-14 21:18:05 +0000
753+++ libdrizzle/statement_local.h 2013-01-27 14:02:20 +0000
754@@ -2,7 +2,7 @@
755 *
756 * Drizzle Client & Protocol Library
757 *
758- * Copyright (C) 2012 Drizzle Developer Group
759+ * Copyright (C) 2012-2013 Drizzle Developer Group
760 * All rights reserved.
761 *
762 * Redistribution and use in source and binary forms, with or without
763
764=== modified file 'libdrizzle/statement_param.cc'
765--- libdrizzle/statement_param.cc 2013-01-15 13:37:21 +0000
766+++ libdrizzle/statement_param.cc 2013-01-27 14:02:20 +0000
767@@ -2,7 +2,7 @@
768 *
769 * Drizzle Client & Protocol Library
770 *
771- * Copyright (C) 2012 Drizzle Developer Group
772+ * Copyright (C) 2012-2013 Drizzle Developer Group
773 * All rights reserved.
774 *
775 * Redistribution and use in source and binary forms, with or without
776
777=== modified file 'libdrizzle/structs.h'
778--- libdrizzle/structs.h 2013-01-27 06:03:16 +0000
779+++ libdrizzle/structs.h 2013-01-27 14:02:20 +0000
780@@ -2,6 +2,7 @@
781 *
782 * Drizzle Client & Protocol Library
783 *
784+ * Copyright (C) 2008-2013 Drizzle Developer Group
785 * Copyright (C) 2008 Eric Day (eday@oddments.org)
786 * All rights reserved.
787 *
788@@ -391,106 +392,6 @@
789 }
790 };
791
792-/**
793- * @ingroup drizzle_result
794- */
795-struct drizzle_result_st
796-{
797- drizzle_st *con;
798- drizzle_result_st *next;
799- drizzle_result_st *prev;
800- drizzle_result_options_t options;
801-
802- char info[DRIZZLE_MAX_INFO_SIZE];
803- uint16_t error_code;
804- char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
805- uint64_t insert_id;
806- uint16_t warning_count;
807- uint64_t affected_rows;
808-
809- uint16_t column_count;
810- uint16_t column_current;
811- drizzle_column_st *column_list;
812- drizzle_column_st *column;
813- drizzle_column_st *column_buffer;
814-
815- uint64_t row_count;
816- uint64_t row_current;
817-
818- uint16_t field_current;
819- size_t field_total;
820- size_t field_offset;
821- size_t field_size;
822- drizzle_field_t field;
823- drizzle_field_t field_buffer;
824-
825- uint64_t row_list_size;
826- drizzle_row_t row;
827- drizzle_row_t *row_list;
828- size_t *field_sizes;
829- size_t **field_sizes_list;
830- uint8_t **null_bitmap_list;
831- uint8_t *null_bitmap;
832- uint8_t null_bitmap_length;
833- bool binary_rows;
834-
835- drizzle_result_st() :
836- con(NULL),
837- next(NULL),
838- prev(NULL),
839- options(DRIZZLE_RESULT_NONE),
840- error_code(0),
841- insert_id(0),
842- warning_count(0),
843- affected_rows(0),
844- column_count(0),
845- column_current(0),
846- column_list(NULL),
847- column(NULL),
848- column_buffer(NULL),
849- row_count(0),
850- row_current(0),
851- field_current(0),
852- field_total(0),
853- field_offset(0),
854- field_size(0),
855- field(NULL),
856- field_buffer(NULL),
857- row_list_size(0),
858- row(NULL),
859- row_list(NULL),
860- field_sizes(NULL),
861- field_sizes_list(NULL),
862- null_bitmap_list(NULL),
863- null_bitmap(NULL),
864- null_bitmap_length(0),
865- binary_rows(false)
866- {
867- info[0]= '\0';
868- sqlstate[0]= '\0';
869- }
870-
871- bool push_state(drizzle_state_fn* func_)
872- {
873- if (con)
874- {
875- return con->push_state(func_);
876- }
877-
878- return false;
879- }
880-
881- bool has_state() const
882- {
883- if (con)
884- {
885- return con->has_state();
886- }
887-
888- return false;
889- }
890-};
891-
892 struct drizzle_binlog_event_st
893 {
894 uint32_t timestamp;
895
896=== modified file 'tests/unit/connect_uds.c'
897--- tests/unit/connect_uds.c 2013-01-27 09:48:19 +0000
898+++ tests/unit/connect_uds.c 2013-01-27 14:02:20 +0000
899@@ -37,6 +37,8 @@
900
901 #include <yatl/lite.h>
902
903+#include "tests/unit/cleanup.h"
904+
905 #include <libdrizzle-5.1/libdrizzle.h>
906 #include <stdio.h>
907 #include <stdlib.h>
908@@ -47,23 +49,17 @@
909 (void) argc;
910 (void) argv;
911
912- drizzle_st *con= drizzle_create(getenv("MYSQL_SOCK"),
913- 0,
914- getenv("MYSQL_USER"),
915- getenv("MYSQL_PASSWORD"),
916- getenv("MYSQL_SCHEMA"), 0);
917+ con= drizzle_create(getenv("MYSQL_SOCK"),
918+ 0,
919+ getenv("MYSQL_USER"),
920+ getenv("MYSQL_PASSWORD"),
921+ getenv("MYSQL_SCHEMA"), 0);
922+ CLOSE_ON_EXIT(con);
923 ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
924
925 drizzle_return_t ret= drizzle_connect(con);
926- if (ret == DRIZZLE_RETURN_COULD_NOT_CONNECT)
927- {
928- char error[DRIZZLE_MAX_ERROR_SIZE];
929- strncpy(error, drizzle_error(con), DRIZZLE_MAX_ERROR_SIZE);
930- drizzle_quit(con);
931-
932- SKIP_IF_(ret == DRIZZLE_RETURN_COULD_NOT_CONNECT, "%s(%s)", error, drizzle_strerror(ret));
933- }
934- ASSERT_EQ(DRIZZLE_RETURN_OK, ret);
935+ SKIP_IF_(ret == DRIZZLE_RETURN_COULD_NOT_CONNECT, "%s(%s)", drizzle_error(con), drizzle_strerror(ret));
936+ ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s socket: %s", drizzle_strerror(ret), getenv("MYSQL_SOCK"));
937
938 drizzle_query(con, "SELECT 1", 0, &ret);
939 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "SELECT 1 (%s)", drizzle_error(con));
940@@ -84,8 +80,5 @@
941 drizzle_close(con);
942 }
943
944- ret= drizzle_quit(con);
945- ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));
946-
947 return EXIT_SUCCESS;
948 }

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: