Random Query Generator

Merge lp:~kalebral-deactivatedaccount/randgen/drizzle into lp:randgen

  1. drizzle
  2. Merge into rqg2
Proposed by Lee Bieber
Status: Merged
Approved by: Bernt M Johnsen
Approved revision: 115
Merge reported by: Bernt M Johnsen
Merged at revision: not available
Proposed branch: lp:~kalebral-deactivatedaccount/randgen/drizzle
Merge into: lp:randgen
Diff against target: 302 lines
1 file modified
lib/GenTest/Executor/Drizzle.pm (+115/-125)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/randgen/drizzle
Reviewer Review Type Date Requested Status
Random Query Generator Team Pending
Review via email: mp+14371@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Update drizzle error messages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/GenTest/Executor/Drizzle.pm'
2--- lib/GenTest/Executor/Drizzle.pm 2009-10-12 18:30:39 +0000
3+++ lib/GenTest/Executor/Drizzle.pm 2009-11-03 18:12:16 +0000
4@@ -63,183 +63,173 @@
5 #
6 # Drizzle status codes
7 #
8-
9 # Syntax error
10-
11-use constant ER_PARSE_ERROR => 1064;
12-use constant ER_SYNTAX_ERROR => 1149;
13+use constant ER_PARSE_ERROR => 1064;
14+use constant ER_SYNTAX_ERROR => 1149;
15
16 # Semantic errors
17-
18-use constant ER_UPDATE_TABLE_USED => 1093;
19-use constant ER_BAD_FIELD_ERROR => 1054;
20-use constant ER_NO_SUCH_TABLE => 1146;
21-use constant ER_BAD_TABLE_ERROR => 1051;
22+use constant ER_CANT_LOCK => 1015;
23+use constant ER_NO_DB_ERROR => 1046;
24+use constant ER_BAD_NULL_ERROR => 1048;
25+use constant ER_BAD_DB_ERROR => 1049;
26+use constant ER_TABLE_EXISTS_ERROR => 1050;
27+use constant ER_BAD_TABLE_ERROR => 1051;
28+use constant ER_BAD_FIELD_ERROR => 1054;
29+use constant ER_WRONG_FIELD_WITH_GROUP => 1055;
30+use constant ER_DUP_FIELDNAME => 1060;
31+use constant ER_DUP_KEYNAME => 1061;
32+use constant ER_MULTIPLE_PRI_KEY => 1068;
33 use constant ER_CANT_DROP_FIELD_OR_KEY => 1091;
34+use constant ER_UPDATE_TABLE_USED => 1093;
35 use constant ER_FIELD_SPECIFIED_TWICE => 1110;
36-use constant ER_MULTIPLE_PRI_KEY => 1068;
37-use constant ER_DUP_FIELDNAME => 1060;
38-use constant ER_DUP_KEYNAME => 1061;
39-use constant ER_SAME_NAME_PARTITION => 1517;
40-use constant ER_PARTITION_WRONG_VALUES_ERROR => 1480;
41-use constant ER_CANT_LOCK => 1015;
42-use constant ER_TABLESPACE_EXIST => 1666;
43-use constant ER_NO_SUCH_TABLESPACE => 1667;
44-use constant ER_SP_DOES_NOT_EXIST => 1305;
45-use constant ER_TABLESPACE_NOT_EMPTY => 1671;
46-use constant ER_BAD_DB_ERROR => 1049;
47-use constant ER_PARTITION_MGMT_ON_NONPARTITIONED => 1505;
48+use constant ER_NO_SUCH_TABLE => 1146;
49+use constant ER_CHECK_NOT_IMPLEMENTED => 1178;
50 use constant ER_UNKNOWN_SYSTEM_VARIABLE => 1193;
51-use constant ER_VAR_CANT_BE_READ => 1233;
52-use constant ER_TRG_DOES_NOT_EXIST => 1360;
53-use constant ER_NO_DB_ERROR => 1046;
54-use constant ER_BAD_NULL_ERROR => 1048;
55-use constant ER_TABLE_EXISTS_ERROR => 1050;
56-use constant ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG => 1336;
57-use constant ER_NOT_SUPPORTED_YET => 1235;
58-use constant ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT => 1560;
59-use constant ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG => 1542;
60-use constant ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG => 1422;
61-use constant ER_CANNOT_USER => 1396;
62-use constant ER_CHECK_NOT_IMPLEMENTED=> 1178;
63+use constant ER_VAR_CANT_BE_READ => 1233;
64+use constant ER_NOT_SUPPORTED_YET => 1235;
65 use constant ER_CANT_AGGREGATE_2COLLATIONS => 1267;
66 use constant ER_CANT_AGGREGATE_3COLLATIONS => 1270;
67 use constant ER_CANT_AGGREGATE_NCOLLATIONS => 1271;
68+use constant ER_UNKNOWN_KEY_CACHE => 1284;
69+use constant ER_TRUNCATED_WRONG_VALUE => 1292;
70 use constant ER_INVALID_CHARACTER_STRING => 1300;
71 use constant ER_SP_ALREADY_EXISTS => 1304;
72-use constant ER_EVENT_ALREADY_EXISTS => 1537;
73+use constant ER_SP_DOES_NOT_EXIST => 1305;
74+use constant ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG => 1336;
75 use constant ER_TRG_ALREADY_EXISTS => 1359;
76-use constant ER_WRONG_FIELD_WITH_GROUP => 1055;
77+use constant ER_TRG_DOES_NOT_EXIST => 1360;
78+use constant ER_NO_DEFAULT_FOR_FIELD => 1364;
79+use constant ER_TRUNCATED_WRONG_VALUE_FOR_FIELD => 1366;
80+use constant ER_CANNOT_USER => 1396;
81+use constant ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG => 1422;
82 use constant ER_NON_GROUPING_FIELD_USED => 1463;
83-
84-use constant ER_DROP_PARTITION_NON_EXISTENT => 1507;
85-use constant ER_DROP_LAST_PARTITION => 1508;
86-use constant ER_COALESCE_ONLY_ON_HASH_PARTITION => 1509;
87-use constant ER_REORG_HASH_ONLY_ON_SAME_NO => 1510;
88-use constant ER_REORG_NO_PARAM_ERROR => 1511;
89-use constant ER_ONLY_ON_RANGE_LIST_PARTITION => 1512;
90-use constant ER_NO_PARTITION_FOR_GIVEN_VALUE => 1526;
91-use constant ER_PARTITION_MAXVALUE_ERROR => 1481;
92-use constant ER_WRONG_PARTITION_NAME => 1567;
93-
94-use constant ER_UNKNOWN_KEY_CACHE => 1284;
95-
96+use constant ER_PARTITION_WRONG_VALUES_ERROR => 1480;
97+use constant ER_PARTITION_MAXVALUE_ERROR => 1481;
98+use constant ER_PARTITION_MGMT_ON_NONPARTITIONED => 1505;
99+use constant ER_DROP_PARTITION_NON_EXISTENT => 1507;
100+use constant ER_DROP_LAST_PARTITION => 1508;
101+use constant ER_COALESCE_ONLY_ON_HASH_PARTITION => 1509;
102+use constant ER_REORG_HASH_ONLY_ON_SAME_NO => 1510;
103+use constant ER_REORG_NO_PARAM_ERROR => 1511;
104+use constant ER_ONLY_ON_RANGE_LIST_PARTITION => 1512;
105+use constant ER_SAME_NAME_PARTITION => 1517;
106+use constant ER_NO_PARTITION_FOR_GIVEN_VALUE => 1526;
107+use constant ER_EVENT_ALREADY_EXISTS => 1537;
108+use constant ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG => 1542;
109+use constant ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT => 1560;
110+use constant ER_WRONG_PARTITION_NAME => 1567;
111+use constant ER_TABLESPACE_EXIST => 1666;
112+use constant ER_NO_SUCH_TABLESPACE => 1667;
113+use constant ER_TABLESPACE_NOT_EMPTY => 1671;
114+use constant ER_INVALID_DATETIME_VALUE => 1686;
115+use constant ER_INVALID_ENUM_VALUE => 1691;
116
117 # Transaction errors
118-
119-use constant ER_LOCK_DEADLOCK => 1213;
120-use constant ER_LOCK_WAIT_TIMEOUT => 1205;
121 use constant ER_CHECKREAD => 1020;
122 use constant ER_DUP_KEY => 1022;
123 use constant ER_DUP_ENTRY => 1062;
124+use constant ER_LOCK_WAIT_TIMEOUT => 1205;
125+use constant ER_LOCK_DEADLOCK => 1213;
126
127 # Storage engine failures
128-
129 use constant ER_GET_ERRNO => 1030;
130
131 # Database corruption
132-
133-use constant ER_CRASHED_ON_USAGE => 1194;
134 use constant ER_NOT_KEYFILE => 1034;
135 use constant ER_UNEXPECTED_EOF => 1039;
136+use constant ER_CRASHED_ON_USAGE => 1194;
137 use constant ER_SP_PROC_TABLE_CORRUPT=> 1457;
138+
139 # Backup
140-
141 use constant ER_BACKUP_SEND_DATA => 1661;
142
143 # Out of disk space, quotas, etc.
144-
145 use constant ER_RECORD_FILE_FULL => 1114;
146 use constant ER_DISK_FULL => 1021;
147 use constant ER_OUTOFMEMORY => 1037;
148 use constant ER_CON_COUNT_ERROR => 1040;
149 use constant ER_OUT_OF_RESOURCES => 1041;
150+use constant ER_SERVER_SHUTDOWN => 1053;
151 use constant ER_CANT_CREATE_THREAD => 1135;
152 use constant ER_STACK_OVERRUN => 1119;
153
154-use constant ER_SERVER_SHUTDOWN => 1053;
155-
156 my %err2type = (
157- ER_GET_ERRNO() => STATUS_SEMANTIC_ERROR,
158-
159- ER_PARSE_ERROR() => STATUS_SYNTAX_ERROR,
160- ER_SYNTAX_ERROR() => STATUS_SYNTAX_ERROR,
161-
162- ER_UPDATE_TABLE_USED() => STATUS_SEMANTIC_ERROR,
163- ER_NO_SUCH_TABLE() => STATUS_SEMANTIC_ERROR,
164- ER_BAD_TABLE_ERROR() => STATUS_SEMANTIC_ERROR,
165+ ER_BACKUP_SEND_DATA() => STATUS_BACKUP_FAILURE,
166+ ER_BAD_DB_ERROR() => STATUS_SEMANTIC_ERROR,
167 ER_BAD_FIELD_ERROR() => STATUS_SEMANTIC_ERROR,
168- ER_CANT_DROP_FIELD_OR_KEY() => STATUS_SEMANTIC_ERROR,
169- ER_FIELD_SPECIFIED_TWICE() => STATUS_SEMANTIC_ERROR,
170- ER_MULTIPLE_PRI_KEY() => STATUS_SEMANTIC_ERROR,
171- ER_DUP_FIELDNAME() => STATUS_SEMANTIC_ERROR,
172- ER_DUP_KEYNAME() => STATUS_SEMANTIC_ERROR,
173- ER_SAME_NAME_PARTITION()=> STATUS_SEMANTIC_ERROR,
174- ER_PARTITION_WRONG_VALUES_ERROR() => STATUS_SEMANTIC_ERROR,
175- ER_CANT_LOCK() => STATUS_SEMANTIC_ERROR,
176- ER_TABLESPACE_EXIST() => STATUS_SEMANTIC_ERROR,
177- ER_NO_SUCH_TABLESPACE() => STATUS_SEMANTIC_ERROR,
178- ER_SP_DOES_NOT_EXIST() => STATUS_SEMANTIC_ERROR,
179- ER_TABLESPACE_NOT_EMPTY() => STATUS_SEMANTIC_ERROR,
180- ER_BAD_DB_ERROR() => STATUS_SEMANTIC_ERROR,
181- ER_PARTITION_MGMT_ON_NONPARTITIONED() => STATUS_SEMANTIC_ERROR,
182- ER_UNKNOWN_SYSTEM_VARIABLE() => STATUS_SEMANTIC_ERROR,
183- ER_VAR_CANT_BE_READ() => STATUS_SEMANTIC_ERROR,
184- ER_TRG_DOES_NOT_EXIST() => STATUS_SEMANTIC_ERROR,
185- ER_NO_DB_ERROR() => STATUS_SEMANTIC_ERROR,
186 ER_BAD_NULL_ERROR() => STATUS_SEMANTIC_ERROR,
187- ER_TABLE_EXISTS_ERROR() => STATUS_SEMANTIC_ERROR,
188- ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG() => STATUS_SEMANTIC_ERROR,
189- ER_NOT_SUPPORTED_YET() => STATUS_SEMANTIC_ERROR,
190- ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT() => STATUS_SEMANTIC_ERROR,
191- ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG() => STATUS_SEMANTIC_ERROR,
192- ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG() => STATUS_SEMANTIC_ERROR,
193- ER_CANNOT_USER() => STATUS_SEMANTIC_ERROR,
194- ER_CHECK_NOT_IMPLEMENTED() => STATUS_SEMANTIC_ERROR,
195+ ER_BAD_TABLE_ERROR() => STATUS_SEMANTIC_ERROR,
196+ ER_CANNOT_USER() => STATUS_SEMANTIC_ERROR,
197 ER_CANT_AGGREGATE_2COLLATIONS() => STATUS_SEMANTIC_ERROR,
198 ER_CANT_AGGREGATE_3COLLATIONS() => STATUS_SEMANTIC_ERROR,
199 ER_CANT_AGGREGATE_NCOLLATIONS() => STATUS_SEMANTIC_ERROR,
200- ER_INVALID_CHARACTER_STRING() => STATUS_SEMANTIC_ERROR,
201- ER_SP_ALREADY_EXISTS() => STATUS_SEMANTIC_ERROR,
202- ER_EVENT_ALREADY_EXISTS() => STATUS_SEMANTIC_ERROR,
203- ER_TRG_ALREADY_EXISTS() => STATUS_SEMANTIC_ERROR,
204- ER_WRONG_FIELD_WITH_GROUP() => STATUS_SEMANTIC_ERROR,
205- ER_NON_GROUPING_FIELD_USED() => STATUS_SEMANTIC_ERROR,
206-
207- ER_DROP_LAST_PARTITION() => STATUS_SEMANTIC_ERROR,
208+ ER_CANT_CREATE_THREAD() => STATUS_ENVIRONMENT_FAILURE,
209+ ER_CANT_DROP_FIELD_OR_KEY() => STATUS_SEMANTIC_ERROR,
210+ ER_CANT_LOCK() => STATUS_SEMANTIC_ERROR,
211+ ER_CHECK_NOT_IMPLEMENTED() => STATUS_SEMANTIC_ERROR,
212+ ER_CHECKREAD() => STATUS_TRANSACTION_ERROR,
213 ER_COALESCE_ONLY_ON_HASH_PARTITION() => STATUS_SEMANTIC_ERROR,
214- ER_REORG_HASH_ONLY_ON_SAME_NO() => STATUS_SEMANTIC_ERROR,
215- ER_REORG_NO_PARAM_ERROR() => STATUS_SEMANTIC_ERROR,
216- ER_ONLY_ON_RANGE_LIST_PARTITION() => STATUS_SEMANTIC_ERROR,
217- ER_NO_PARTITION_FOR_GIVEN_VALUE() => STATUS_SEMANTIC_ERROR,
218+ ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG() => STATUS_SEMANTIC_ERROR,
219+ ER_CON_COUNT_ERROR() => STATUS_ENVIRONMENT_FAILURE,
220+ ER_CRASHED_ON_USAGE() => STATUS_DATABASE_CORRUPTION,
221+ ER_DISK_FULL() => STATUS_ENVIRONMENT_FAILURE,
222+ ER_DROP_LAST_PARTITION() => STATUS_SEMANTIC_ERROR,
223 ER_DROP_PARTITION_NON_EXISTENT() => STATUS_SEMANTIC_ERROR,
224- ER_PARTITION_MAXVALUE_ERROR() => STATUS_SEMANTIC_ERROR,
225- ER_WRONG_PARTITION_NAME() => STATUS_SEMANTIC_ERROR,
226-
227- ER_UNKNOWN_KEY_CACHE() => STATUS_SEMANTIC_ERROR,
228-
229+ ER_DUP_ENTRY() => STATUS_TRANSACTION_ERROR,
230+ ER_DUP_FIELDNAME() => STATUS_SEMANTIC_ERROR,
231+ ER_DUP_KEYNAME() => STATUS_SEMANTIC_ERROR,
232+ ER_DUP_KEY() => STATUS_TRANSACTION_ERROR,
233+ ER_EVENT_ALREADY_EXISTS() => STATUS_SEMANTIC_ERROR,
234+ ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG() => STATUS_SEMANTIC_ERROR,
235+ ER_FIELD_SPECIFIED_TWICE() => STATUS_SEMANTIC_ERROR,
236+ ER_GET_ERRNO() => STATUS_SEMANTIC_ERROR,
237+ ER_INVALID_CHARACTER_STRING() => STATUS_SEMANTIC_ERROR,
238+ ER_INVALID_DATETIME_VALUE() => STATUS_SEMANTIC_ERROR,
239+ ER_INVALID_ENUM_VALUE() => STATUS_SEMANTIC_ERROR,
240 ER_LOCK_DEADLOCK() => STATUS_TRANSACTION_ERROR,
241 ER_LOCK_WAIT_TIMEOUT() => STATUS_TRANSACTION_ERROR,
242- ER_CHECKREAD() => STATUS_TRANSACTION_ERROR,
243- ER_DUP_KEY() => STATUS_TRANSACTION_ERROR,
244- ER_DUP_ENTRY() => STATUS_TRANSACTION_ERROR,
245-
246+ ER_MULTIPLE_PRI_KEY() => STATUS_SEMANTIC_ERROR,
247+ ER_NO_DB_ERROR() => STATUS_SEMANTIC_ERROR,
248+ ER_NO_DEFAULT_FOR_FIELD() => STATUS_SEMANTIC_ERROR,
249+ ER_NON_GROUPING_FIELD_USED() => STATUS_SEMANTIC_ERROR,
250+ ER_NO_PARTITION_FOR_GIVEN_VALUE() => STATUS_SEMANTIC_ERROR,
251+ ER_NO_SUCH_TABLESPACE() => STATUS_SEMANTIC_ERROR,
252+ ER_NO_SUCH_TABLE() => STATUS_SEMANTIC_ERROR,
253 ER_NOT_KEYFILE() => STATUS_DATABASE_CORRUPTION,
254- ER_CRASHED_ON_USAGE() => STATUS_DATABASE_CORRUPTION,
255- ER_UNEXPECTED_EOF() => STATUS_DATABASE_CORRUPTION,
256- ER_SP_PROC_TABLE_CORRUPT() => STATUS_DATABASE_CORRUPTION,
257-
258- ER_BACKUP_SEND_DATA() => STATUS_BACKUP_FAILURE,
259-
260- ER_CANT_CREATE_THREAD() => STATUS_ENVIRONMENT_FAILURE,
261+ ER_NOT_SUPPORTED_YET() => STATUS_SEMANTIC_ERROR,
262+ ER_ONLY_ON_RANGE_LIST_PARTITION() => STATUS_SEMANTIC_ERROR,
263+ ER_OUTOFMEMORY() => STATUS_ENVIRONMENT_FAILURE,
264 ER_OUT_OF_RESOURCES() => STATUS_ENVIRONMENT_FAILURE,
265- ER_CON_COUNT_ERROR() => STATUS_ENVIRONMENT_FAILURE,
266+ ER_PARSE_ERROR() => STATUS_SYNTAX_ERROR,
267+ ER_PARTITION_MAXVALUE_ERROR() => STATUS_SEMANTIC_ERROR,
268+ ER_PARTITION_MGMT_ON_NONPARTITIONED() => STATUS_SEMANTIC_ERROR,
269+ ER_PARTITION_WRONG_VALUES_ERROR() => STATUS_SEMANTIC_ERROR,
270 ER_RECORD_FILE_FULL() => STATUS_ENVIRONMENT_FAILURE,
271- ER_DISK_FULL() => STATUS_ENVIRONMENT_FAILURE,
272- ER_OUTOFMEMORY() => STATUS_ENVIRONMENT_FAILURE,
273+ ER_REORG_HASH_ONLY_ON_SAME_NO() => STATUS_SEMANTIC_ERROR,
274+ ER_REORG_NO_PARAM_ERROR() => STATUS_SEMANTIC_ERROR,
275+ ER_SAME_NAME_PARTITION()=> STATUS_SEMANTIC_ERROR,
276+ ER_SERVER_SHUTDOWN() => STATUS_SERVER_KILLED,
277+ ER_SP_ALREADY_EXISTS() => STATUS_SEMANTIC_ERROR,
278+ ER_SP_DOES_NOT_EXIST() => STATUS_SEMANTIC_ERROR,
279+ ER_SP_PROC_TABLE_CORRUPT() => STATUS_DATABASE_CORRUPTION,
280 ER_STACK_OVERRUN() => STATUS_ENVIRONMENT_FAILURE,
281-
282- ER_SERVER_SHUTDOWN() => STATUS_SERVER_KILLED
283+ ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG() => STATUS_SEMANTIC_ERROR,
284+ ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT() => STATUS_SEMANTIC_ERROR,
285+ ER_SYNTAX_ERROR() => STATUS_SYNTAX_ERROR,
286+ ER_TABLE_EXISTS_ERROR() => STATUS_SEMANTIC_ERROR,
287+ ER_TABLESPACE_EXIST() => STATUS_SEMANTIC_ERROR,
288+ ER_TABLESPACE_NOT_EMPTY() => STATUS_SEMANTIC_ERROR,
289+ ER_TRG_ALREADY_EXISTS() => STATUS_SEMANTIC_ERROR,
290+ ER_TRG_DOES_NOT_EXIST() => STATUS_SEMANTIC_ERROR,
291+ ER_TRUNCATED_WRONG_VALUE_FOR_FIELD() => STATUS_SEMANTIC_ERROR,
292+ ER_TRUNCATED_WRONG_VALUE() => STATUS_SEMANTIC_ERROR,
293+ ER_UNEXPECTED_EOF() => STATUS_DATABASE_CORRUPTION,
294+ ER_UNKNOWN_KEY_CACHE() => STATUS_SEMANTIC_ERROR,
295+ ER_UNKNOWN_SYSTEM_VARIABLE() => STATUS_SEMANTIC_ERROR,
296+ ER_UPDATE_TABLE_USED() => STATUS_SEMANTIC_ERROR,
297+ ER_VAR_CANT_BE_READ() => STATUS_SEMANTIC_ERROR,
298+ ER_WRONG_FIELD_WITH_GROUP() => STATUS_SEMANTIC_ERROR,
299+ ER_WRONG_PARTITION_NAME() => STATUS_SEMANTIC_ERROR
300 );
301
302 my %caches;