diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-03-16 14:12:00 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-03-16 14:12:00 +0200 |
| commit | 98eb9518db1da854048b09d94244a982a1d32f9a (patch) | |
| tree | 9f00cc33b5cb43fd11da3c3d62903b4c009bffa0 /client | |
| parent | b0c43d0c381dba1ab859de8f643d8d91dd806009 (diff) | |
| parent | 0a534348c75cf435d2017959855de2efa798fd0b (diff) | |
| download | mariadb-git-98eb9518db1da854048b09d94244a982a1d32f9a.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 4c8d4750a23..4003e57226d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -2723,7 +2723,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end) init_dynamic_string(&ds_query, 0, (end - query) + 32, 256); do_eval(&ds_query, query, end, FALSE); - if (mysql_real_query(mysql, ds_query.str, ds_query.length)) + if (mysql_real_query(mysql, ds_query.str, ds_query.length) || !(res= mysql_store_result(mysql))) { handle_error(curr_command, mysql_errno(mysql), mysql_error(mysql), mysql_sqlstate(mysql), &ds_res); @@ -2733,13 +2733,6 @@ void var_query_set(VAR *var, const char *query, const char** query_end) DBUG_VOID_RETURN; } - if (!(res= mysql_store_result(mysql))) - { - report_or_die("Query '%s' didn't return a result set", ds_query.str); - dynstr_free(&ds_query); - eval_expr(var, "", 0); - DBUG_VOID_RETURN; - } dynstr_free(&ds_query); if ((row= mysql_fetch_row(res)) && row[0]) |