← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.h

Merged from Felipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.h
849
849
  */
850
850
  virtual bool handle_error(uint sql_errno,
851
851
                            const char *message,
852
 
                            MYSQL_ERROR::enum_warning_level level,
 
852
                            DRIZZLE_ERROR::enum_warning_level level,
853
853
                            THD *thd) = 0;
854
854
};
855
855
 
927
927
 
928
928
private:
929
929
  /** Message buffer. Can be used by OK or ERROR status. */
930
 
  char m_message[MYSQL_ERRMSG_SIZE];
 
930
  char m_message[DRIZZLE_ERRMSG_SIZE];
931
931
  /**
932
932
    SQL error number. One of ER_ codes from share/errmsg.txt.
933
933
    Set by set_error_status.
1394
1394
    class. With current implementation warnings produced in each prepared
1395
1395
    statement/cursor settle here.
1396
1396
  */
1397
 
  List       <MYSQL_ERROR> warn_list;
1398
 
  uint       warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_END];
 
1397
  List       <DRIZZLE_ERROR> warn_list;
 
1398
  uint       warn_count[(uint) DRIZZLE_ERROR::WARN_LEVEL_END];
1399
1399
  uint       total_warn_count;
1400
1400
  Diagnostics_area main_da;
1401
1401
 
1899
1899
    @return true if the error is handled
1900
1900
  */
1901
1901
  virtual bool handle_error(uint sql_errno, const char *message,
1902
 
                            MYSQL_ERROR::enum_warning_level level);
 
1902
                            DRIZZLE_ERROR::enum_warning_level level);
1903
1903
 
1904
1904
  /**
1905
1905
    Remove the error handler last pushed.