← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.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_parse.cc
1221
1221
    Don't reset warnings when executing a stored routine.
1222
1222
  */
1223
1223
  if (all_tables || !lex->is_single_level_stmt())
1224
 
    mysql_reset_errors(thd, 0);
 
1224
    drizzle_reset_errors(thd, 0);
1225
1225
 
1226
1226
  if (unlikely(thd->slave_thread))
1227
1227
  {
1350
1350
  case SQLCOM_SHOW_WARNS:
1351
1351
  {
1352
1352
    res= mysqld_show_warnings(thd, (ulong)
1353
 
                              ((1L << (uint) MYSQL_ERROR::WARN_LEVEL_NOTE) |
1354
 
                               (1L << (uint) MYSQL_ERROR::WARN_LEVEL_WARN) |
1355
 
                               (1L << (uint) MYSQL_ERROR::WARN_LEVEL_ERROR)
 
1353
                              ((1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_NOTE) |
 
1354
                               (1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_WARN) |
 
1355
                               (1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_ERROR)
1356
1356
                               ));
1357
1357
    break;
1358
1358
  }
1359
1359
  case SQLCOM_SHOW_ERRORS:
1360
1360
  {
1361
1361
    res= mysqld_show_warnings(thd, (ulong)
1362
 
                              (1L << (uint) MYSQL_ERROR::WARN_LEVEL_ERROR));
 
1362
                              (1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_ERROR));
1363
1363
    break;
1364
1364
  }
1365
1365
  case SQLCOM_SHOW_SLAVE_HOSTS:
1395
1395
    }
1396
1396
    else
1397
1397
    {
1398
 
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
 
1398
      push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN, 0,
1399
1399
                   "the master info structure does not exist");
1400
1400
      my_ok(thd);
1401
1401
    }
1708
1708
 
1709
1709
      /* Don't yet allow changing of symlinks with ALTER TABLE */
1710
1710
      if (create_info.data_file_name)
1711
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
 
1711
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN, 0,
1712
1712
                     "DATA DIRECTORY option ignored");
1713
1713
      if (create_info.index_file_name)
1714
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
 
1714
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN, 0,
1715
1715
                     "INDEX DIRECTORY option ignored");
1716
1716
      create_info.data_file_name= create_info.index_file_name= NULL;
1717
1717
      /* ALTER TABLE ends previous transaction */
2498
2498
        if (((thd->options & OPTION_KEEP_LOG) || 
2499
2499
             thd->transaction.all.modified_non_trans_table) &&
2500
2500
            !thd->slave_thread)
2501
 
          push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
2501
          push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
2502
2502
                       ER_WARNING_NOT_COMPLETE_ROLLBACK,
2503
2503
                       ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
2504
2504
        my_ok(thd);
2637
2637
        str.length(0);
2638
2638
        thd->lex->unit.print(&str, QT_ORDINARY);
2639
2639
        str.append('\0');
2640
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
2640
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
2641
2641
                     ER_YES, str.ptr());
2642
2642
      }
2643
2643
      if (res)