diff options
| author | unknown <guilhem@mysql.com> | 2003-12-16 11:12:40 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-12-16 11:12:40 +0100 |
| commit | b26fd7b9222705e0483e73b8c9e0faca449561ab (patch) | |
| tree | 9e3a84bc559ab75e424d51bc38089e2299d4faa0 /sql/sql_class.h | |
| parent | 385b14cdbb3f63a1bd0b2cceeea1f75a17c2cb94 (diff) | |
| parent | e97722e495495468ef8a3c5e12d7080738a99841 (diff) | |
| download | mariadb-git-b26fd7b9222705e0483e73b8c9e0faca449561ab.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index e4e118c0b29..632e7b49d9f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -590,6 +590,15 @@ public: void add_changed_table(TABLE *table); void add_changed_table(const char *key, long key_length); CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length); +#ifndef EMBEDDED_LIBRARY + inline void clear_error() + { + net.last_error[0]= 0; + net.last_errno= 0; + } +#else + void clear_error(); +#endif }; /* Flags for the THD::system_thread (bitmap) variable */ |