diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:32:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:38:34 +0200 |
| commit | cb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch) | |
| tree | 29d130592e3dfea50251771979fbaa6923d44ba9 /libmysqld | |
| parent | a4885dde4ccec68bbb0268796f62e68e08ba4837 (diff) | |
| parent | 48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff) | |
| download | mariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 | ||||
| -rw-r--r-- | libmysqld/libmysql.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 555eadc9425..d6f77e68183 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -140,8 +140,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, } /* Clear result variables */ - thd->clear_error(); - thd->get_stmt_da()->reset_diagnostics_area(); + thd->clear_error(1); mysql->affected_rows= ~(my_ulonglong) 0; mysql->field_count= 0; net_clear_error(net); diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index d1176a4168c..d06b32b0625 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2014, SkySQL Ab. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates + Copyright (c) 2009, 2017, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4919,4 +4919,3 @@ ulong STDCALL mysql_net_field_length(uchar **packet) { return net_field_length(packet); } - |