← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Felipe
  • Date: 2008-08-04 23:58:04 UTC
  • mto: (261.2.6 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: felipe@pena-20080804235804-x55q2xqxcar6u66f
- Renamed MYSQL_ERROR to DRIZZLE_ERROR.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
316
316
      issue a warning with 'warning' level status in 
317
317
      case of invalid view and last error is ER_VIEW_INVALID
318
318
    */
319
 
    mysql_reset_errors(thd, true);
 
319
    drizzle_reset_errors(thd, true);
320
320
    thd->clear_error();
321
321
  }
322
322
 
3095
3095
        rather than in SHOW COLUMNS
3096
3096
      */ 
3097
3097
      if (thd->is_error())
3098
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
3098
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
3099
3099
                     thd->main_da.sql_errno(), thd->main_da.message());
3100
3100
      thd->clear_error();
3101
3101
      res= 0;
3323
3323
        rather than in SHOW KEYS
3324
3324
      */
3325
3325
      if (thd->is_error())
3326
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
3326
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
3327
3327
                     thd->main_da.sql_errno(), thd->main_da.message());
3328
3328
      thd->clear_error();
3329
3329
      res= 0;
3428
3428
  if (res)
3429
3429
  {
3430
3430
    if (thd->is_error())
3431
 
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
3431
      push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
3432
3432
                   thd->main_da.sql_errno(), thd->main_da.message());
3433
3433
    thd->clear_error();
3434
3434
    return(0);
3503
3503
  if (res)
3504
3504
  {
3505
3505
    if (thd->is_error())
3506
 
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
3506
      push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
3507
3507
                   thd->main_da.sql_errno(), thd->main_da.message());
3508
3508
    thd->clear_error();
3509
3509
    return(0);
3700
3700
  if (res)
3701
3701
  {
3702
3702
    if (thd->is_error())
3703
 
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
3703
      push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
3704
3704
                   thd->main_da.sql_errno(), thd->main_da.message());
3705
3705
    thd->clear_error();
3706
3706
    return(0);