~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_state.cc

  • Committer: lbieber
  • Date: 2010-09-08 16:39:38 UTC
  • mfrom: (1749.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100908163938-gdg763wz3cvwpjpi
Merge Andrew - fix bug 619591 - needed to clean up embedded innodb test results
Merge Lee - fix bug 628336 - Remove unused error messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
95
95
  { ER_FIELD_SPECIFIED_TWICE                ,"42000", "" },
96
96
  { ER_UNSUPPORTED_EXTENSION                ,"42000", "" },
97
97
  { ER_TABLE_MUST_HAVE_COLUMNS              ,"42000", "" },
98
 
  { ER_UNKNOWN_CHARACTER_SET                ,"42000", "" },
99
98
  { ER_TOO_BIG_ROWSIZE                      ,"42000", "" },
100
99
  { ER_WRONG_OUTER_JOIN                     ,"42000", "" },
101
100
  { ER_NULL_COLUMN_IN_INDEX                 ,"42000", "" },
102
 
  { ER_PASSWORD_ANONYMOUS_USER              ,"42000", "" },
103
 
  { ER_PASSWORD_NOT_ALLOWED                 ,"42000", "" },
104
 
  { ER_PASSWORD_NO_MATCH                    ,"42000", "" },
105
101
  { ER_WRONG_VALUE_COUNT_ON_ROW             ,"21S01", "" },
106
 
  { ER_INVALID_USE_OF_NULL                  ,"22004", "" },
107
 
  { ER_REGEXP_ERROR                         ,"42000", "" },
108
102
  { ER_MIX_OF_GROUP_FUNC_AND_FIELDS         ,"42000", "" },
109
 
  { ER_NONEXISTING_GRANT                    ,"42000", "" },
110
 
  { ER_TABLEACCESS_DENIED_ERROR             ,"42000", "" },
111
 
  { ER_COLUMNACCESS_DENIED_ERROR            ,"42000", "" },
112
 
  { ER_ILLEGAL_GRANT_FOR_TABLE              ,"42000", "" },
113
 
  { ER_GRANT_WRONG_HOST_OR_USER             ,"42000", "" },
114
103
  { ER_NO_SUCH_TABLE                        ,"42S02", "" },
115
 
  { ER_NONEXISTING_TABLE_GRANT              ,"42000", "" },
116
 
  { ER_NOT_ALLOWED_COMMAND                  ,"42000", "" },
117
104
  { ER_SYNTAX_ERROR                         ,"42000", "" },
118
 
  { ER_ABORTING_CONNECTION                  ,"08S01", "" },
119
105
  { ER_NET_PACKET_TOO_LARGE                 ,"08S01", "" },
120
 
  { ER_NET_READ_ERROR_FROM_PIPE             ,"08S01", "" },
121
 
  { ER_NET_FCNTL_ERROR                      ,"08S01", "" },
122
106
  { ER_NET_PACKETS_OUT_OF_ORDER             ,"08S01", "" },
123
 
  { ER_NET_UNCOMPRESS_ERROR                 ,"08S01", "" },
124
 
  { ER_NET_READ_ERROR                       ,"08S01", "" },
125
 
  { ER_NET_READ_INTERRUPTED                 ,"08S01", "" },
126
 
  { ER_NET_ERROR_ON_WRITE                   ,"08S01", "" },
127
 
  { ER_NET_WRITE_INTERRUPTED                ,"08S01", "" },
128
 
  { ER_TOO_LONG_STRING                      ,"42000", "" },
129
107
  { ER_TABLE_CANT_HANDLE_BLOB               ,"42000", "" },
130
108
  { ER_TABLE_CANT_HANDLE_AUTO_INCREMENT     ,"42000", "" },
131
109
  { ER_WRONG_COLUMN_NAME                    ,"42000", "" },
138
116
  { ER_KEY_DOES_NOT_EXITS                   ,"42000", "S1009" },
139
117
  { ER_CHECK_NO_SUCH_TABLE                  ,"42000", "" },
140
118
  { ER_CHECK_NOT_IMPLEMENTED                ,"42000", "" },
141
 
  { ER_CANT_DO_THIS_DURING_AN_TRANSACTION   ,"25000", "" },
142
119
  { ER_NEW_ABORTING_CONNECTION              ,"08S01", "" },
143
 
  { ER_MASTER_NET_READ                      ,"08S01", "" },
144
 
  { ER_MASTER_NET_WRITE                     ,"08S01", "" },
145
 
  { ER_TOO_MANY_USER_CONNECTIONS            ,"42000", "" },
146
120
  { ER_READ_ONLY_TRANSACTION                ,"25000", "" },
147
 
  { ER_NO_PERMISSION_TO_CREATE_USER         ,"42000", "" },
148
121
  { ER_LOCK_DEADLOCK                        ,"40001", "" },
149
122
  { ER_NO_REFERENCED_ROW                    ,"23000", "" },
150
123
  { ER_ROW_IS_REFERENCED                    ,"23000", "" },
151
124
  { ER_CONNECT_TO_MASTER                    ,"08S01", "" },
152
125
  { ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT    ,"21000", "" },
153
126
  { ER_USER_LIMIT_REACHED                   ,"42000", "" },
154
 
  { ER_SPECIFIC_ACCESS_DENIED_ERROR         ,"42000", "" },
155
127
  { ER_NO_DEFAULT                           ,"42000", "" },
156
128
  { ER_WRONG_VALUE_FOR_VAR                  ,"42000", "" },
157
129
  { ER_WRONG_TYPE_FOR_VAR                   ,"42000", "" },
164
136
  { ER_DERIVED_MUST_HAVE_ALIAS              ,"42000", "" },
165
137
  { ER_SELECT_REDUCED                       ,"01000", "" },
166
138
  { ER_TABLENAME_NOT_ALLOWED_HERE           ,"42000", "" },
167
 
  { ER_NOT_SUPPORTED_AUTH_MODE              ,"08004", "" },
168
139
  { ER_SPATIAL_CANT_HAVE_NULL               ,"42000", "" },
169
140
  { ER_COLLATION_CHARSET_MISMATCH           ,"42000", "" },
170
141
  { ER_WARN_TOO_FEW_RECORDS                 ,"01000", "" },
176
147
  { ER_WRONG_NAME_FOR_CATALOG               ,"42000", "" },
177
148
  { ER_UNKNOWN_STORAGE_ENGINE               ,"42000", "" },
178
149
  { ER_TRUNCATED_WRONG_VALUE                ,"22007", "" },
179
 
  { ER_SP_NO_RECURSIVE_CREATE               ,"2F003", "" },
180
 
  { ER_SP_ALREADY_EXISTS                    ,"42000", "" },
181
150
  { ER_SP_DOES_NOT_EXIST                    ,"42000", "" },
182
151
  { ER_SP_LILABEL_MISMATCH                  ,"42000", "" },
183
152
  { ER_SP_LABEL_REDEFINE                    ,"42000", "" },
184
153
  { ER_SP_LABEL_MISMATCH                    ,"42000", "" },
185
 
  { ER_SP_UNINIT_VAR                        ,"01000", "" },
186
 
  { ER_SP_BADSELECT                         ,"0A000", "" },
187
 
  { ER_SP_BADRETURN                         ,"42000", "" },
188
 
  { ER_SP_BADSTATEMENT                      ,"0A000", "" },
189
154
  { ER_UPDATE_LOG_DEPRECATED_IGNORED        ,"42000", "" },
190
155
  { ER_UPDATE_LOG_DEPRECATED_TRANSLATED     ,"42000", "" },
191
156
  { ER_QUERY_INTERRUPTED                    ,"70100", "" },
192
 
  { ER_SP_WRONG_NO_OF_ARGS                  ,"42000", "" },
193
 
  { ER_SP_COND_MISMATCH                     ,"42000", "" },
194
 
  { ER_SP_NORETURN                          ,"42000", "" },
195
 
  { ER_SP_NORETURNEND                       ,"2F005", "" },
196
 
  { ER_SP_BAD_CURSOR_QUERY                  ,"42000", "" },
197
 
  { ER_SP_BAD_CURSOR_SELECT                 ,"42000", "" },
198
 
  { ER_SP_CURSOR_MISMATCH                   ,"42000", "" },
199
 
  { ER_SP_CURSOR_ALREADY_OPEN               ,"24000", "" },
200
 
  { ER_SP_CURSOR_NOT_OPEN                   ,"24000", "" },
201
 
  { ER_SP_UNDECLARED_VAR                    ,"42000", "" },
202
 
  { ER_SP_FETCH_NO_DATA                     ,"02000", "" },
203
157
  { ER_SP_DUP_PARAM                         ,"42000", "" },
204
158
  { ER_SP_DUP_VAR                           ,"42000", "" },
205
159
  { ER_SP_DUP_COND                          ,"42000", "" },
208
162
  { ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG        ,"0A000", "" },
209
163
  { ER_SP_VARCOND_AFTER_CURSHNDLR           ,"42000", "" },
210
164
  { ER_SP_CURSOR_AFTER_HANDLER              ,"42000", "" },
211
 
  { ER_SP_CASE_NOT_FOUND                    ,"20000", "" },
212
165
  { ER_DIVISION_BY_ZERO                     ,"22012", "" },
213
166
  { ER_ILLEGAL_VALUE_FOR_TYPE               ,"22007", "" },
214
167
  { ER_PROCACCESS_DENIED_ERROR              ,"42000", "" },
244
197
  { ER_CANT_CHANGE_TX_ISOLATION             ,"25001", "" },
245
198
  { ER_WRONG_PARAMCOUNT_TO_FUNCTION         ,"42000", "" },
246
199
  { ER_WRONG_PARAMETERS_TO_NATIVE_FCT       ,"42000", "" },
247
 
  { ER_WRONG_PARAMETERS_TO_STORED_FCT       ,"42000", "" },
248
200
  { ER_DUP_ENTRY_WITH_KEY_NAME              ,"23000", "S1009" },
249
201
};
250
202