← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-08-26 03:17:31 UTC
  • mfrom: (1124 staging)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: osullivan.padraig@gmail.com-20090826031731-at2as3ledixngra3
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
197
197
  { C_STRING_WITH_LEN("?") }
198
198
};
199
199
 
200
 
bool mysqld_show_warnings(Session *session, uint32_t levels_to_show)
 
200
bool mysqld_show_warnings(Session *session,
 
201
                          bitset<DRIZZLE_ERROR::NUM_ERRORS> &levels_to_show)
201
202
{
202
203
  List<Item> field_list;
203
204
 
220
221
  while ((err= it++))
221
222
  {
222
223
    /* Skip levels that the user is not interested in */
223
 
    if (!(levels_to_show & ((ulong) 1 << err->level)))
 
224
    if (! levels_to_show.test(err->level))
224
225
      continue;
225
226
    if (++idx <= unit->offset_limit_cnt)
226
227
      continue;