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