← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_state.cc

Further drizzleclient cleanup. Starting to move all NET related functions into Protocol, removed some dead code, removing drizzleclient dependencies spread throughout drizzled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_state.cc
31
31
 
32
32
typedef struct st_map_errno_to_sqlstate
33
33
{
34
 
  uint32_t drizzleclient_errno;
 
34
  uint32_t drizzle_errno;
35
35
  const char *odbc_state;
36
36
  const char *jdbc_state;
37
37
} errno_sqlstate_map;
249
249
bool compare_errno_map(errno_sqlstate_map a,
250
250
                       errno_sqlstate_map b)
251
251
{
252
 
  return (a.drizzleclient_errno < b.drizzleclient_errno);
 
252
  return (a.drizzle_errno < b.drizzle_errno);
253
253
}
254
254
 
255
 
const char *drizzleclient_errno_to_sqlstate(uint32_t drizzleclient_errno)
 
255
const char *drizzle_errno_to_sqlstate(uint32_t drizzle_errno)
256
256
{
257
257
 
258
 
  errno_sqlstate_map drizzle_err_state= {drizzleclient_errno, NULL, NULL};
 
258
  errno_sqlstate_map drizzle_err_state= {drizzle_errno, NULL, NULL};
259
259
  errno_sqlstate_map* result=
260
260
    lower_bound(&sqlstate_map[0],
261
261
                &sqlstate_map[sizeof(sqlstate_map)/sizeof(*sqlstate_map)],
262
262
                drizzle_err_state, compare_errno_map);
263
263
 
264
 
  if ((*result).drizzleclient_errno == drizzleclient_errno)
 
264
  if ((*result).drizzle_errno == drizzle_errno)
265
265
    return (*result).odbc_state;
266
266
  /* General error */
267
267
  return "HY000";