~vjsamuel/drizzle/fix-bug-585982

« back to all changes in this revision

Viewing changes to drizzled/sql_state.cc

  • Committer: lbieber
  • Date: 2010-09-10 01:15:48 UTC
  • mfrom: (1752.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100910011548-rirqm1mx03y38zfz
Merge Vijay - fix bug 632589 - change boolean type command line options of embedded_innodb to be the same as other client options

Show diffs side-by-side

added added

removed removed

Lines of Context:
121
121
  { ER_LOCK_DEADLOCK                        ,"40001", "" },
122
122
  { ER_NO_REFERENCED_ROW                    ,"23000", "" },
123
123
  { ER_ROW_IS_REFERENCED                    ,"23000", "" },
124
 
  { ER_CONNECT_TO_MASTER                    ,"08S01", "" },
125
124
  { ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT    ,"21000", "" },
126
 
  { ER_USER_LIMIT_REACHED                   ,"42000", "" },
127
125
  { ER_NO_DEFAULT                           ,"42000", "" },
128
126
  { ER_WRONG_VALUE_FOR_VAR                  ,"42000", "" },
129
127
  { ER_WRONG_TYPE_FOR_VAR                   ,"42000", "" },
148
146
  { ER_UNKNOWN_STORAGE_ENGINE               ,"42000", "" },
149
147
  { ER_TRUNCATED_WRONG_VALUE                ,"22007", "" },
150
148
  { ER_SP_DOES_NOT_EXIST                    ,"42000", "" },
151
 
  { ER_SP_LILABEL_MISMATCH                  ,"42000", "" },
152
 
  { ER_SP_LABEL_REDEFINE                    ,"42000", "" },
153
 
  { ER_SP_LABEL_MISMATCH                    ,"42000", "" },
154
 
  { ER_UPDATE_LOG_DEPRECATED_IGNORED        ,"42000", "" },
155
 
  { ER_UPDATE_LOG_DEPRECATED_TRANSLATED     ,"42000", "" },
156
149
  { ER_QUERY_INTERRUPTED                    ,"70100", "" },
157
 
  { ER_SP_DUP_PARAM                         ,"42000", "" },
158
 
  { ER_SP_DUP_VAR                           ,"42000", "" },
159
 
  { ER_SP_DUP_COND                          ,"42000", "" },
160
 
  { ER_SP_DUP_CURS                          ,"42000", "" },
161
 
  { ER_SP_SUBSELECT_NYI                     ,"0A000", "" },
162
 
  { ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG        ,"0A000", "" },
163
 
  { ER_SP_VARCOND_AFTER_CURSHNDLR           ,"42000", "" },
164
 
  { ER_SP_CURSOR_AFTER_HANDLER              ,"42000", "" },
165
150
  { ER_DIVISION_BY_ZERO                     ,"22012", "" },
166
151
  { ER_ILLEGAL_VALUE_FOR_TYPE               ,"22007", "" },
167
 
  { ER_PROCACCESS_DENIED_ERROR              ,"42000", "" },
168
 
  { ER_XAER_NOTA                            ,"XAE04", "" },
169
 
  { ER_XAER_INVAL                           ,"XAE05", "" },
170
152
  { ER_XAER_RMFAIL                          ,"XAE07", "" },
171
 
  { ER_XAER_OUTSIDE                         ,"XAE09", "" },
172
 
  { ER_XAER_RMERR                           ,"XAE03", "" },
173
 
  { ER_XA_RBROLLBACK                        ,"XA100", "" },
174
 
  { ER_NONEXISTING_PROC_GRANT               ,"42000", "" },
175
153
  { ER_DATA_TOO_LONG                        ,"22001", "" },
176
 
  { ER_SP_BAD_SQLSTATE                      ,"42000", "" },
177
 
  { ER_CANT_CREATE_USER_WITH_GRANT          ,"42000", "" },
178
 
  { ER_SP_DUP_HANDLER                       ,"42000", "" },
179
 
  { ER_SP_NOT_VAR_ARG                       ,"42000", "" },
180
154
  { ER_SP_NO_RETSET                         ,"0A000", "" },
181
155
  { ER_CANT_CREATE_GEOMETRY_OBJECT          ,"22003", "" },
182
156
  { ER_TOO_BIG_SCALE                        ,"42000", "S1009" },
183
157
  { ER_TOO_BIG_PRECISION                    ,"42000", "S1009" },
184
158
  { ER_M_BIGGER_THAN_D                      ,"42000", "S1009" },
185
 
  { ER_TOO_LONG_BODY                        ,"42000", "S1009" },
186
159
  { ER_TOO_BIG_DISPLAYWIDTH                 ,"42000", "S1009" },
187
 
  { ER_XAER_DUPID                           ,"XAE08", "" },
188
160
  { ER_DATETIME_FUNCTION_OVERFLOW           ,"22008", "" },
189
161
  { ER_ROW_IS_REFERENCED_2                  ,"23000", "" },
190
162
  { ER_NO_REFERENCED_ROW_2                  ,"23000", "" },
191
 
  { ER_SP_BAD_VAR_SHADOW                    ,"42000", "" },
192
 
  { ER_SP_WRONG_NAME                        ,"42000", "" },
193
 
  { ER_SP_NO_AGGREGATE                      ,"42000", "" },
194
 
  { ER_MAX_PREPARED_STMT_COUNT_REACHED      ,"42000", "" },
195
163
  { ER_NON_GROUPING_FIELD_USED              ,"42000", "" },
196
164
  { ER_FOREIGN_DUPLICATE_KEY                ,"23000", "S1009" },
197
165
  { ER_CANT_CHANGE_TX_ISOLATION             ,"25001", "" },