diff options
| author | Philip Stoev <philip.stoev@galeracluster.com> | 2016-06-14 08:14:37 -0700 |
|---|---|---|
| committer | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2018-03-12 11:44:49 +0100 |
| commit | 05261f97c8c85e8c2cf5102e70c17dcaed4bfde2 (patch) | |
| tree | e4b66a4089a4cefb53ca00b91f25755720673085 /client | |
| parent | 8ef727b3d072c13788553f2174fd8bd70481f658 (diff) | |
| download | mariadb-git-05261f97c8c85e8c2cf5102e70c17dcaed4bfde2.tar.gz | |
Galera MTR Tests: Modify mysqltest so that if a --let = `SELECT ...` query is interrupted, the test does not fail but the error is communicated to caller
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 844a2d7bbf8..2897555da3f 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -2678,7 +2678,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); @@ -2688,13 +2688,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]) |