← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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_base.cc
365
365
    return(0);
366
366
  }
367
367
  /* Table existed in engine. Let's open it */
368
 
  mysql_reset_errors(thd, 1);                   // Clear warnings
 
368
  drizzle_reset_errors(thd, 1);                   // Clear warnings
369
369
  thd->clear_error();                           // Clear error message
370
370
  return(get_table_share(thd, table_list, key, key_length,
371
371
                              db_flags, error));
3163
3163
      release_table_share(share, RELEASE_WAIT_FOR_DROP);
3164
3164
      if (!thd->killed)
3165
3165
      {
3166
 
        mysql_reset_errors(thd, 1);         // Clear warnings
 
3166
        drizzle_reset_errors(thd, 1);         // Clear warnings
3167
3167
        thd->clear_error();                 // Clear error message
3168
3168
        goto retry;
3169
3169
      }