diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2012-06-26 16:30:15 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2012-06-26 16:30:15 +0200 |
| commit | 3de8d224cf324815b5acef2417896f116b516c39 (patch) | |
| tree | 22b339d29c5d38c1ee4be169cf6dd71306b56876 /libmysqld | |
| parent | c45bd024eb46116b89ceddf9818e143607e120ee (diff) | |
| download | mariadb-git-3de8d224cf324815b5acef2417896f116b516c39.tar.gz | |
Solve a linkage problem with "libmysqld" on several Solaris platforms:
a multiple definition of 'THD::clear_error()' in (at least)
libmysqld.a(lib_sql.o) and libmysqld.a(libfederated_a-ha_federated.o).
Patch provided by Ramil Kalimullin.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 6 |
1 files changed, 0 insertions, 6 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) { |