diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2012-07-12 10:00:14 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2012-07-12 10:00:14 +0200 |
| commit | 8dd0ce9ed19b54b65ab35622d7f531b956335735 (patch) | |
| tree | f34ea9114b60b5f5c5d1b1d3d5b87f4308bb1aff | |
| parent | ed568c2782cdb2ce8ca5246dbf9c36b4296aa83d (diff) | |
| parent | 652b9862f3c9f4d65e10d5d688515d0a72ef05a7 (diff) | |
| download | mariadb-git-mysql-5.1.65.tar.gz | |
Merge unpushed changes from 5.1.64-releasemysql-5.1.65
| -rw-r--r-- | libmysqld/lib_sql.cc | 6 | ||||
| -rw-r--r-- | sql/sql_class.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 4afe02efbdb..18b8383406a 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -756,12 +756,6 @@ void THD::clear_data_list() cur_data= 0; } -void THD::clear_error() -{ - if (main_da.is_error()) - main_da.reset_diagnostics_area(); -} - static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length, CHARSET_INFO *fromcs, CHARSET_INFO *tocs) { diff --git a/sql/sql_class.h b/sql/sql_class.h index 3ecf032db71..5cdb005b517 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2089,7 +2089,6 @@ public: void add_changed_table(const char *key, long key_length); CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length); int send_explain_fields(select_result *result); -#ifndef EMBEDDED_LIBRARY /** Clear the current error, if any. We do not clear is_fatal_error or is_fatal_sub_stmt_error since we @@ -2105,9 +2104,9 @@ public: is_slave_error= 0; DBUG_VOID_RETURN; } +#ifndef EMBEDDED_LIBRARY inline bool vio_ok() const { return net.vio != 0; } #else - void clear_error(); inline bool vio_ok() const { return true; } #endif /** |