Drizzle

Merge lp:~kalebral-deactivatedaccount/drizzle/remove-unused-error-messages-2 into lp:~drizzle-trunk/drizzle/development

  1. remove-unused-error-messages-2
  2. Merge into development
Proposed by Lee Bieber
Status: Merged
Approved by: Brian Aker
Approved revision: 1751
Merged at revision: 1753
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle/remove-unused-error-messages-2
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 434 lines (+66/-131)
4 files modified
client/errname.cc (+33/-33)
drizzled/enum.h (+33/-33)
drizzled/error.cc (+0/-33)
drizzled/sql_state.cc (+0/-32)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle/remove-unused-error-messages-2
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+34939@code.launchpad.net

Description of the change

A few remaining unused error messages to be removed

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 'client/errname.cc'
2--- client/errname.cc 2010-09-02 18:47:14 +0000
3+++ client/errname.cc 2010-09-09 01:38:40 +0000
4@@ -251,7 +251,7 @@
5 { "ER_CANNOT_ADD_FOREIGN",1215 },
6 { "ER_NO_REFERENCED_ROW",1216 },
7 { "ER_ROW_IS_REFERENCED",1217 },
8- { "ER_CONNECT_TO_MASTER",1218 },
9+ { "ER_UNUSED1218",1218 },
10 { "ER_UNUSED1219",1219 },
11 { "ER_UNUSED1220",1220 },
12 { "ER_WRONG_USAGE",1221 },
13@@ -259,7 +259,7 @@
14 { "ER_CANT_UPDATE_WITH_READLOCK",1223 },
15 { "ER_UNUSED1224",1224 },
16 { "ER_UNUSED1225",1225 },
17- { "ER_USER_LIMIT_REACHED",1226 },
18+ { "ER_UNUSED1226",1226 },
19 { "ER_UNUSED1227",1227 },
20 { "ER_LOCAL_VARIABLE",1228 },
21 { "ER_GLOBAL_VARIABLE",1229 },
22@@ -341,15 +341,15 @@
23 { "ER_SP_DOES_NOT_EXIST",1305 },
24 { "ER_UNUSED1306",1306 },
25 { "ER_UNUSED1307",1307 },
26- { "ER_SP_LILABEL_MISMATCH",1308 },
27- { "ER_SP_LABEL_REDEFINE",1309 },
28- { "ER_SP_LABEL_MISMATCH",1310 },
29+ { "ER_UNUSED1308",1308 },
30+ { "ER_UNUSED1309",1309 },
31+ { "ER_UNUSED1310",1310 },
32 { "ER_UNUSED1311",1311 },
33 { "ER_UNUSED1312",1312 },
34 { "ER_UNUSED1313",1313 },
35 { "ER_UNUSED1314",1314 },
36- { "ER_UPDATE_LOG_DEPRECATED_IGNORED",1315 },
37- { "ER_UPDATE_LOG_DEPRECATED_TRANSLATED",1316 },
38+ { "ER_UNUSED1315",1315 },
39+ { "ER_UNUSED1316",1316 },
40 { "ER_QUERY_INTERRUPTED",1317 },
41 { "ER_UNUSED1318",1318 },
42 { "ER_UNUSED1319",1319 },
43@@ -363,15 +363,15 @@
44 { "ER_UNUSED1327",1327 },
45 { "ER_UNUSED1328",1328 },
46 { "ER_SP_FETCH_NO_DATA",1329 },
47- { "ER_SP_DUP_PARAM",1330 },
48- { "ER_SP_DUP_VAR",1331 },
49- { "ER_SP_DUP_COND",1332 },
50- { "ER_SP_DUP_CURS",1333 },
51+ { "ER_UNUSED1330",1330 },
52+ { "ER_UNUSED1331",1331 },
53+ { "ER_UNUSED1332",1332 },
54+ { "ER_UNUSED1333",1333 },
55 { "ER_UNUSED1334",1334 },
56- { "ER_SP_SUBSELECT_NYI",1335 },
57- { "ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG",1336 },
58- { "ER_SP_VARCOND_AFTER_CURSHNDLR",1337 },
59- { "ER_SP_CURSOR_AFTER_HANDLER",1338 },
60+ { "ER_UNUSED1335",1335 },
61+ { "ER_UNUSED1336",1336 },
62+ { "ER_UNUSED1337",1337 },
63+ { "ER_UNUSED1338",1338 },
64 { "ER_UNUSED1339",1339 },
65 { "ER_UNUSED1340",1340 },
66 { "ER_UNUSED1341",1341 },
67@@ -403,7 +403,7 @@
68 { "ER_ILLEGAL_VALUE_FOR_TYPE",1367 },
69 { "ER_UNUSED1368",1368 },
70 { "ER_UNUSED1369",1369 },
71- { "ER_PROCACCESS_DENIED_ERROR",1370 },
72+ { "ER_UNUSED1370",1370 },
73 { "ER_UNUSED1371",1371 },
74 { "ER_UNUSED1372",1372 },
75 { "ER_UNUSED1373",1373 },
76@@ -430,24 +430,24 @@
77 { "ER_UNUSED1394",1394 },
78 { "ER_UNUSED1395",1395 },
79 { "ER_UNUSED1396",1396 },
80- { "ER_XAER_NOTA",1397 },
81- { "ER_XAER_INVAL",1398 },
82+ { "ER_UNUSED1397",1397 },
83+ { "ER_UNUSED1398",1398 },
84 { "ER_XAER_RMFAIL",1399 },
85- { "ER_XAER_OUTSIDE",1400 },
86- { "ER_XAER_RMERR",1401 },
87- { "ER_XA_RBROLLBACK",1402 },
88- { "ER_NONEXISTING_PROC_GRANT",1403 },
89+ { "ER_UNUSED1400",1400 },
90+ { "ER_UNUSED1401",1401 },
91+ { "ER_UNUSED1402",1402 },
92+ { "ER_UNUSED1403",1403 },
93 { "ER_UNUSED1404",1404 },
94 { "ER_UNUSED1405",1405 },
95 { "ER_DATA_TOO_LONG",1406 },
96- { "ER_SP_BAD_SQLSTATE",1407 },
97+ { "ER_UNUSED1407",1407 },
98 { "ER_STARTUP",1408 },
99 { "ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR",1409 },
100- { "ER_CANT_CREATE_USER_WITH_GRANT",1410 },
101+ { "ER_UNUSED1410",1410 },
102 { "ER_WRONG_VALUE_FOR_TYPE",1411 },
103 { "ER_TABLE_DEF_CHANGED",1412 },
104- { "ER_SP_DUP_HANDLER",1413 },
105- { "ER_SP_NOT_VAR_ARG",1414 },
106+ { "ER_UNUSED1413",1413 },
107+ { "ER_UNUSED1414",1414 },
108 { "ER_SP_NO_RETSET",1415 },
109 { "ER_CANT_CREATE_GEOMETRY_OBJECT",1416 },
110 { "ER_UNUSED1417",1417 },
111@@ -470,10 +470,10 @@
112 { "ER_UNUSED1434",1434 },
113 { "ER_TRG_IN_WRONG_SCHEMA",1435 },
114 { "ER_STACK_OVERRUN_NEED_MORE",1436 },
115- { "ER_TOO_LONG_BODY",1437 },
116+ { "ER_UNUSED1437",1437 },
117 { "ER_UNUSED1438",1438 },
118 { "ER_TOO_BIG_DISPLAYWIDTH",1439 },
119- { "ER_XAER_DUPID",1440 },
120+ { "ER_UNUSED1440",1440 },
121 { "ER_DATETIME_FUNCTION_OVERFLOW",1441 },
122 { "ER_UNUSED1442",1442 },
123 { "ER_UNUSED1443",1443 },
124@@ -486,15 +486,15 @@
125 { "ER_UNUSED1450",1450 },
126 { "ER_ROW_IS_REFERENCED_2",1451 },
127 { "ER_NO_REFERENCED_ROW_2",1452 },
128- { "ER_SP_BAD_VAR_SHADOW",1453 },
129- { "ER_TRG_NO_DEFINER",1454 },
130+ { "ER_UNUSED1453",1453 },
131+ { "ER_UNUSED1454",1454 },
132 { "ER_UNUSED1455",1455 },
133 { "ER_UNUSED1456",1456 },
134 { "ER_UNUSED1457",1457 },
135- { "ER_SP_WRONG_NAME",1458 },
136+ { "ER_UNUSED1458",1458 },
137 { "ER_TABLE_NEEDS_UPGRADE",1459 },
138- { "ER_SP_NO_AGGREGATE",1460 },
139- { "ER_MAX_PREPARED_STMT_COUNT_REACHED",1461 },
140+ { "ER_UNUSED1460",1460 },
141+ { "ER_UNUSED1461",1461 },
142 { "ER_UNUSED1462",1462 },
143 { "ER_NON_GROUPING_FIELD_USED",1463 },
144 { "ER_TABLE_CANT_HANDLE_SPKEYS",1464 },
145
146=== modified file 'drizzled/enum.h'
147--- drizzled/enum.h 2010-09-02 18:47:14 +0000
148+++ drizzled/enum.h 2010-09-09 01:38:40 +0000
149@@ -560,7 +560,7 @@
150 ER_CANNOT_ADD_FOREIGN,
151 ER_NO_REFERENCED_ROW,
152 ER_ROW_IS_REFERENCED,
153- ER_CONNECT_TO_MASTER,
154+ ER_UNUSED1218,
155 ER_UNUSED1219,
156 ER_UNUSED1220,
157 ER_WRONG_USAGE,
158@@ -568,7 +568,7 @@
159 ER_CANT_UPDATE_WITH_READLOCK,
160 ER_UNUSED1224,
161 ER_UNUSED1225,
162- ER_USER_LIMIT_REACHED,
163+ ER_UNUSED1226,
164 ER_UNUSED1227,
165 ER_LOCAL_VARIABLE,
166 ER_GLOBAL_VARIABLE,
167@@ -650,15 +650,15 @@
168 ER_SP_DOES_NOT_EXIST,
169 ER_UNUSED1306,
170 ER_UNUSED1307,
171- ER_SP_LILABEL_MISMATCH,
172- ER_SP_LABEL_REDEFINE,
173- ER_SP_LABEL_MISMATCH,
174+ ER_UNUSED1308,
175+ ER_UNUSED1309,
176+ ER_UNUSED1310,
177 ER_UNUSED1311,
178 ER_UNUSED1312,
179 ER_UNUSED1313,
180 ER_UNUSED1314,
181- ER_UPDATE_LOG_DEPRECATED_IGNORED,
182- ER_UPDATE_LOG_DEPRECATED_TRANSLATED,
183+ ER_UNUSED1315,
184+ ER_UNUSED1316,
185 ER_QUERY_INTERRUPTED,
186 ER_UNUSED1318,
187 ER_UNUSED1319,
188@@ -672,15 +672,15 @@
189 ER_UNUSED1327,
190 ER_UNUSED1328,
191 ER_SP_FETCH_NO_DATA,
192- ER_SP_DUP_PARAM,
193- ER_SP_DUP_VAR,
194- ER_SP_DUP_COND,
195- ER_SP_DUP_CURS,
196+ ER_UNUSED1330,
197+ ER_UNUSED1331,
198+ ER_UNUSED1332,
199+ ER_UNUSED1333,
200 ER_UNUSED1334,
201- ER_SP_SUBSELECT_NYI,
202- ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG,
203- ER_SP_VARCOND_AFTER_CURSHNDLR,
204- ER_SP_CURSOR_AFTER_HANDLER,
205+ ER_UNUSED1335,
206+ ER_UNUSED1336,
207+ ER_UNUSED1337,
208+ ER_UNUSED1338,
209 ER_UNUSED1339,
210 ER_UNUSED1340,
211 ER_UNUSED1341,
212@@ -712,7 +712,7 @@
213 ER_ILLEGAL_VALUE_FOR_TYPE,
214 ER_UNUSED1368,
215 ER_UNUSED1369,
216- ER_PROCACCESS_DENIED_ERROR,
217+ ER_UNUSED1370,
218 ER_UNUSED1371,
219 ER_UNUSED1372,
220 ER_UNUSED1373,
221@@ -739,24 +739,24 @@
222 ER_UNUSED1394,
223 ER_UNUSED1395,
224 ER_UNUSED1396,
225- ER_XAER_NOTA,
226- ER_XAER_INVAL,
227+ ER_UNUSED1397,
228+ ER_UNUSED1398,
229 ER_XAER_RMFAIL,
230- ER_XAER_OUTSIDE,
231- ER_XAER_RMERR,
232- ER_XA_RBROLLBACK,
233- ER_NONEXISTING_PROC_GRANT,
234+ ER_UNUSED1400,
235+ ER_UNUSED1401,
236+ ER_UNUSED1402,
237+ ER_UNUSED1403,
238 ER_UNUSED1404,
239 ER_UNUSED1405,
240 ER_DATA_TOO_LONG,
241- ER_SP_BAD_SQLSTATE,
242+ ER_UNUSED1407,
243 ER_STARTUP,
244 ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR,
245- ER_CANT_CREATE_USER_WITH_GRANT,
246+ ER_UNUSED1410,
247 ER_WRONG_VALUE_FOR_TYPE,
248 ER_TABLE_DEF_CHANGED,
249- ER_SP_DUP_HANDLER,
250- ER_SP_NOT_VAR_ARG,
251+ ER_UNUSED1413,
252+ ER_UNUSED1414,
253 ER_SP_NO_RETSET,
254 ER_CANT_CREATE_GEOMETRY_OBJECT,
255 ER_UNUSED1417,
256@@ -779,10 +779,10 @@
257 ER_UNUSED1434,
258 ER_TRG_IN_WRONG_SCHEMA,
259 ER_STACK_OVERRUN_NEED_MORE=1436, // TODO: Test case looks for this int
260- ER_TOO_LONG_BODY,
261+ ER_UNUSED1437,
262 ER_UNUSED1438,
263 ER_TOO_BIG_DISPLAYWIDTH,
264- ER_XAER_DUPID,
265+ ER_UNUSED1440,
266 ER_DATETIME_FUNCTION_OVERFLOW,
267 ER_UNUSED1442,
268 ER_UNUSED1443,
269@@ -795,15 +795,15 @@
270 ER_UNUSED1450,
271 ER_ROW_IS_REFERENCED_2,
272 ER_NO_REFERENCED_ROW_2,
273- ER_SP_BAD_VAR_SHADOW,
274- ER_TRG_NO_DEFINER,
275+ ER_UNUSED1453,
276+ ER_UNUSED1454,
277 ER_UNUSED1455,
278 ER_UNUSED1456,
279 ER_UNUSED1457,
280- ER_SP_WRONG_NAME,
281+ ER_UNUSED1458,
282 ER_TABLE_NEEDS_UPGRADE,
283- ER_SP_NO_AGGREGATE,
284- ER_MAX_PREPARED_STMT_COUNT_REACHED,
285+ ER_UNUSED1460,
286+ ER_UNUSED1461,
287 ER_UNUSED1462,
288 ER_NON_GROUPING_FIELD_USED,
289 ER_TABLE_CANT_HANDLE_SPKEYS,
290
291=== modified file 'drizzled/error.cc'
292--- drizzled/error.cc 2010-09-02 18:47:14 +0000
293+++ drizzled/error.cc 2010-09-09 01:38:40 +0000
294@@ -365,11 +365,9 @@
295 add(ER_CANNOT_ADD_FOREIGN, N_("Cannot add foreign key constraint"));
296 add(ER_NO_REFERENCED_ROW, N_("Cannot add or update a child row: a foreign key constraint fails"));
297 add(ER_ROW_IS_REFERENCED, N_("Cannot delete or update a parent row: a foreign key constraint fails"));
298- add(ER_CONNECT_TO_MASTER, N_("Error connecting to master: %-.128s"));
299 add(ER_WRONG_USAGE, N_("Incorrect usage of %s and %s"));
300 add(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, N_("The used SELECT statements have a different number of columns"));
301 add(ER_CANT_UPDATE_WITH_READLOCK, N_("Can't execute the query because you have a conflicting read lock"));
302- add(ER_USER_LIMIT_REACHED, N_("User '%-.64s' has exceeded the '%s' resource (current value: %ld)"));
303 add(ER_LOCAL_VARIABLE, N_("Variable '%-.64s' is a SESSION variable and can't be used with SET GLOBAL"));
304 add(ER_GLOBAL_VARIABLE, N_("Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL"));
305 add(ER_NO_DEFAULT, N_("Variable '%-.64s' doesn't have a default value"));
306@@ -423,43 +421,19 @@
307 add(ER_INVALID_CHARACTER_STRING, N_("Invalid %s character string: '%.64s'"));
308 add(ER_WARN_ALLOWED_PACKET_OVERFLOWED, N_("Result of %s() was larger than max_allowed_packet (%ld) - truncated"));
309 add(ER_SP_DOES_NOT_EXIST, N_("%s %s does not exist"));
310- add(ER_SP_LILABEL_MISMATCH, N_("%s with no matching label: %s"));
311- add(ER_SP_LABEL_REDEFINE, N_("Redefining label %s"));
312- add(ER_SP_LABEL_MISMATCH, N_("End-label %s without match"));
313- add(ER_UPDATE_LOG_DEPRECATED_IGNORED, N_("The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"));
314- add(ER_UPDATE_LOG_DEPRECATED_TRANSLATED, N_("The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"));
315 add(ER_QUERY_INTERRUPTED, N_("Query execution was interrupted"));
316- add(ER_SP_DUP_PARAM, N_("Duplicate parameter: %s"));
317- add(ER_SP_DUP_VAR, N_("Duplicate variable: %s"));
318- add(ER_SP_DUP_COND, N_("Duplicate condition: %s"));
319- add(ER_SP_DUP_CURS, N_("Duplicate cursor: %s"));
320- add(ER_SP_SUBSELECT_NYI, N_("Subquery value not supported"));
321- add(ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG, N_("%s is not allowed in stored function or trigger"));
322- add(ER_SP_VARCOND_AFTER_CURSHNDLR, N_("Variable or condition declaration after cursor or handler declaration"));
323- add(ER_SP_CURSOR_AFTER_HANDLER, N_("Cursor declaration after handler declaration"));
324 add(ER_VIEW_INVALID, N_("View '%-.192s.%-.192s' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them"));
325 add(ER_NO_DEFAULT_FOR_FIELD, N_("Field '%-.192s' doesn't have a default value"));
326 add(ER_DIVISION_BY_ZERO, N_("Division by 0"));
327 add(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, N_("Incorrect %-.32s value: '%-.128s' for column '%.192s' at row %u"));
328 add(ER_ILLEGAL_VALUE_FOR_TYPE, N_("Illegal %s '%-.192s' value found during parsing"));
329- add(ER_PROCACCESS_DENIED_ERROR, N_("%-.16s command denied to user '%-.48s'@'%-.64s' for routine '%-.192s'"));
330 add(ER_KEY_PART_0, N_("Key part '%-.192s' length cannot be 0"));
331- add(ER_XAER_NOTA, N_("XAER_NOTA: Unknown XID"));
332- add(ER_XAER_INVAL, N_("XAER_INVAL: Invalid arguments (or unsupported command)"));
333 add(ER_XAER_RMFAIL, N_("XAER_RMFAIL: The command cannot be executed when global transaction is in the %.64s state"));
334- add(ER_XAER_OUTSIDE, N_("XAER_OUTSIDE: Some work is done outside global transaction"));
335- add(ER_XAER_RMERR, N_("XAER_RMERR: Fatal error occurred in the transaction branch - check your data for consistency"));
336- add(ER_XA_RBROLLBACK, N_("XA_RBROLLBACK: Transaction branch was rolled back"));
337- add(ER_NONEXISTING_PROC_GRANT, N_("There is no such grant defined for user '%-.48s' on host '%-.64s' on routine '%-.192s'"));
338 add(ER_DATA_TOO_LONG, N_("Data too long for column '%s' at row %ld"));
339- add(ER_SP_BAD_SQLSTATE, N_("Bad SQLSTATE: '%s'"));
340 add(ER_STARTUP, N_("%s: ready for connections.\nVersion: '%s' %s\n"));
341 add(ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR, N_("Can't load value from file with fixed size rows to variable"));
342- add(ER_CANT_CREATE_USER_WITH_GRANT, N_("You are not allowed to create a user with GRANT"));
343 add(ER_WRONG_VALUE_FOR_TYPE, N_("Incorrect %-.32s value: '%-.128s' for function %-.32s"));
344 add(ER_TABLE_DEF_CHANGED, N_("Table definition has changed, please retry transaction"));
345- add(ER_SP_DUP_HANDLER, N_("Duplicate handler declared in the same block"));
346- add(ER_SP_NOT_VAR_ARG, N_("OUT or INOUT argument %d for routine %s is not a variable or NEW pseudo-variable in BEFORE trigger"));
347 add(ER_SP_NO_RETSET, N_("Not allowed to return a result set from a %s"));
348 add(ER_CANT_CREATE_GEOMETRY_OBJECT, N_("Cannot get geometry object from data you send to the GEOMETRY field"));
349 add(ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG, N_("Explicit or implicit commit is not allowed in stored function or trigger."));
350@@ -468,19 +442,12 @@
351 add(ER_M_BIGGER_THAN_D, N_("For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '%-.192s')."));
352 add(ER_TRG_IN_WRONG_SCHEMA, N_("Trigger in wrong schema"));
353 add(ER_STACK_OVERRUN_NEED_MORE, N_("Thread stack overrun: %ld bytes used of a %ld byte stack, and %ld bytes needed. Use 'drizzled -O thread_stack=#' to specify a bigger stack."));
354- add(ER_TOO_LONG_BODY, N_("Routine body for '%-.100s' is too long"));
355 add(ER_TOO_BIG_DISPLAYWIDTH, N_("Display width out of range for column '%-.192s' (max = %d)"));
356- add(ER_XAER_DUPID, N_("XAER_DUPID: The XID already exists"));
357 add(ER_DATETIME_FUNCTION_OVERFLOW, N_("Datetime function: %-.32s field overflow"));
358 add(ER_ROW_IS_REFERENCED_2, N_("Cannot delete or update a parent row: a foreign key constraint fails (%.192s)"));
359 add(ER_NO_REFERENCED_ROW_2, N_("Cannot add or update a child row: a foreign key constraint fails (%.192s)"));
360 add(ER_SP_FETCH_NO_DATA, N_("No data - zero rows fetched, selected, or processed"));
361- add(ER_SP_BAD_VAR_SHADOW, N_("Variable '%-.64s' must be quoted with `...`, or renamed"));
362- add(ER_TRG_NO_DEFINER, N_("No definer attribute for trigger '%-.192s'.'%-.192s'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger."));
363- add(ER_SP_WRONG_NAME, N_("Incorrect routine name '%-.192s'"));
364 add(ER_TABLE_NEEDS_UPGRADE, N_("Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"));
365- add(ER_SP_NO_AGGREGATE, N_("AGGREGATE is not supported for stored functions"));
366- add(ER_MAX_PREPARED_STMT_COUNT_REACHED, N_("Can't create more than max_prepared_stmt_count statements (current value: %lu)"));
367 add(ER_NON_GROUPING_FIELD_USED, N_("non-grouping field '%-.192s' is used in %-.64s clause"));
368 add(ER_TABLE_CANT_HANDLE_SPKEYS, N_("The used table type doesn't support SPATIAL indexes"));
369 add(ER_REMOVED_SPACES, N_("Leading spaces are removed from name '%s'"));
370
371=== modified file 'drizzled/sql_state.cc'
372--- drizzled/sql_state.cc 2010-09-02 18:47:14 +0000
373+++ drizzled/sql_state.cc 2010-09-09 01:38:40 +0000
374@@ -121,9 +121,7 @@
375 { ER_LOCK_DEADLOCK ,"40001", "" },
376 { ER_NO_REFERENCED_ROW ,"23000", "" },
377 { ER_ROW_IS_REFERENCED ,"23000", "" },
378- { ER_CONNECT_TO_MASTER ,"08S01", "" },
379 { ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT ,"21000", "" },
380- { ER_USER_LIMIT_REACHED ,"42000", "" },
381 { ER_NO_DEFAULT ,"42000", "" },
382 { ER_WRONG_VALUE_FOR_VAR ,"42000", "" },
383 { ER_WRONG_TYPE_FOR_VAR ,"42000", "" },
384@@ -148,50 +146,20 @@
385 { ER_UNKNOWN_STORAGE_ENGINE ,"42000", "" },
386 { ER_TRUNCATED_WRONG_VALUE ,"22007", "" },
387 { ER_SP_DOES_NOT_EXIST ,"42000", "" },
388- { ER_SP_LILABEL_MISMATCH ,"42000", "" },
389- { ER_SP_LABEL_REDEFINE ,"42000", "" },
390- { ER_SP_LABEL_MISMATCH ,"42000", "" },
391- { ER_UPDATE_LOG_DEPRECATED_IGNORED ,"42000", "" },
392- { ER_UPDATE_LOG_DEPRECATED_TRANSLATED ,"42000", "" },
393 { ER_QUERY_INTERRUPTED ,"70100", "" },
394- { ER_SP_DUP_PARAM ,"42000", "" },
395- { ER_SP_DUP_VAR ,"42000", "" },
396- { ER_SP_DUP_COND ,"42000", "" },
397- { ER_SP_DUP_CURS ,"42000", "" },
398- { ER_SP_SUBSELECT_NYI ,"0A000", "" },
399- { ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG ,"0A000", "" },
400- { ER_SP_VARCOND_AFTER_CURSHNDLR ,"42000", "" },
401- { ER_SP_CURSOR_AFTER_HANDLER ,"42000", "" },
402 { ER_DIVISION_BY_ZERO ,"22012", "" },
403 { ER_ILLEGAL_VALUE_FOR_TYPE ,"22007", "" },
404- { ER_PROCACCESS_DENIED_ERROR ,"42000", "" },
405- { ER_XAER_NOTA ,"XAE04", "" },
406- { ER_XAER_INVAL ,"XAE05", "" },
407 { ER_XAER_RMFAIL ,"XAE07", "" },
408- { ER_XAER_OUTSIDE ,"XAE09", "" },
409- { ER_XAER_RMERR ,"XAE03", "" },
410- { ER_XA_RBROLLBACK ,"XA100", "" },
411- { ER_NONEXISTING_PROC_GRANT ,"42000", "" },
412 { ER_DATA_TOO_LONG ,"22001", "" },
413- { ER_SP_BAD_SQLSTATE ,"42000", "" },
414- { ER_CANT_CREATE_USER_WITH_GRANT ,"42000", "" },
415- { ER_SP_DUP_HANDLER ,"42000", "" },
416- { ER_SP_NOT_VAR_ARG ,"42000", "" },
417 { ER_SP_NO_RETSET ,"0A000", "" },
418 { ER_CANT_CREATE_GEOMETRY_OBJECT ,"22003", "" },
419 { ER_TOO_BIG_SCALE ,"42000", "S1009" },
420 { ER_TOO_BIG_PRECISION ,"42000", "S1009" },
421 { ER_M_BIGGER_THAN_D ,"42000", "S1009" },
422- { ER_TOO_LONG_BODY ,"42000", "S1009" },
423 { ER_TOO_BIG_DISPLAYWIDTH ,"42000", "S1009" },
424- { ER_XAER_DUPID ,"XAE08", "" },
425 { ER_DATETIME_FUNCTION_OVERFLOW ,"22008", "" },
426 { ER_ROW_IS_REFERENCED_2 ,"23000", "" },
427 { ER_NO_REFERENCED_ROW_2 ,"23000", "" },
428- { ER_SP_BAD_VAR_SHADOW ,"42000", "" },
429- { ER_SP_WRONG_NAME ,"42000", "" },
430- { ER_SP_NO_AGGREGATE ,"42000", "" },
431- { ER_MAX_PREPARED_STMT_COUNT_REACHED ,"42000", "" },
432 { ER_NON_GROUPING_FIELD_USED ,"42000", "" },
433 { ER_FOREIGN_DUPLICATE_KEY ,"23000", "S1009" },
434 { ER_CANT_CHANGE_TX_ISOLATION ,"25001", "" },