1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1 to working copy.

Browse Source
This commit is contained in:
Marko Mäkelä 2012-08-09 10:48:25 +03:00
commit 7e7ba738a2
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/lib_sql.cc
View File

@ -756,12 +756,6 @@ void THD::clear_data_list()
cur_data= 0; 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, static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
CHARSET_INFO *fromcs, CHARSET_INFO *tocs) CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
{ {

3
sql/sql_class.h
View File

@ -2089,7 +2089,6 @@ public:
void add_changed_table(const char *key, long key_length); void add_changed_table(const char *key, long key_length);
CHANGED_TABLE_LIST * changed_table_dup(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); int send_explain_fields(select_result *result);
#ifndef EMBEDDED_LIBRARY
/** /**
Clear the current error, if any. Clear the current error, if any.
We do not clear is_fatal_error or is_fatal_sub_stmt_error since we We do not clear is_fatal_error or is_fatal_sub_stmt_error since we
@ -2105,9 +2104,9 @@ public:
is_slave_error= 0; is_slave_error= 0;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#ifndef EMBEDDED_LIBRARY
inline bool vio_ok() const { return net.vio != 0; } inline bool vio_ok() const { return net.vio != 0; }
#else #else
void clear_error();
inline bool vio_ok() const { return true; } inline bool vio_ok() const { return true; }
#endif #endif
/** /**