← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.cc
601
601
 
602
602
 
603
603
bool THD::handle_error(uint sql_errno, const char *message,
604
 
                       MYSQL_ERROR::enum_warning_level level)
 
604
                       DRIZZLE_ERROR::enum_warning_level level)
605
605
{
606
606
  if (m_internal_handler)
607
607
  {
699
699
                        TL_WRITE);
700
700
  session_tx_isolation= (enum_tx_isolation) variables.tx_isolation;
701
701
  warn_list.empty();
702
 
  memset((char*) warn_count, 0, sizeof(warn_count));
 
702
  memset(warn_count, 0, sizeof(warn_count));
703
703
  total_warn_count= 0;
704
704
  update_charset();
705
705
  reset_current_stmt_binlog_row_based();
706
 
  memset((char *) &status_var, 0, sizeof(status_var));
 
706
  memset(&status_var, 0, sizeof(status_var));
707
707
}
708
708
 
709
709
 
1648
1648
      (exchange->opt_enclosed && non_string_results &&
1649
1649
       field_term_length && strchr(NUMERIC_CHARS, field_term_char)))
1650
1650
  {
1651
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1651
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1652
1652
                 ER_AMBIGUOUS_FIELD_TERM, ER(ER_AMBIGUOUS_FIELD_TERM));
1653
1653
    is_ambiguous_field_term= true;
1654
1654
  }
2243
2243
bool select_dumpvar::send_eof()
2244
2244
{
2245
2245
  if (! row_count)
2246
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
2246
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
2247
2247
                 ER_SP_FETCH_NO_DATA, ER(ER_SP_FETCH_NO_DATA));
2248
2248
  /*
2249
2249
    In order to remember the value of affected rows for ROW_COUNT()
2300
2300
 
2301
2301
void THD::set_status_var_init()
2302
2302
{
2303
 
  memset((char*) &status_var, 0, sizeof(status_var));
 
2303
  memset(&status_var, 0, sizeof(status_var));
2304
2304
}
2305
2305
 
2306
2306
 
2910
2910
      variables.binlog_format == BINLOG_FORMAT_STMT)
2911
2911
  {
2912
2912
    assert(this->query != NULL);
2913
 
    push_warning(this, MYSQL_ERROR::WARN_LEVEL_WARN,
 
2913
    push_warning(this, DRIZZLE_ERROR::WARN_LEVEL_WARN,
2914
2914
                 ER_BINLOG_UNSAFE_STATEMENT,
2915
2915
                 ER(ER_BINLOG_UNSAFE_STATEMENT));
2916
2916
    if (!(binlog_flags & BINLOG_FLAG_UNSAFE_STMT_PRINTED))
2917
2917
    {
2918
 
      char warn_buf[MYSQL_ERRMSG_SIZE];
2919
 
      snprintf(warn_buf, MYSQL_ERRMSG_SIZE, "%s Statement: %s",
 
2918
      char warn_buf[DRIZZLE_ERRMSG_SIZE];
 
2919
      snprintf(warn_buf, DRIZZLE_ERRMSG_SIZE, "%s Statement: %s",
2920
2920
               ER(ER_BINLOG_UNSAFE_STATEMENT), this->query);
2921
2921
      sql_print_warning(warn_buf);
2922
2922
      binlog_flags|= BINLOG_FLAG_UNSAFE_STMT_PRINTED;