From 8bda876d428b948b107a915dfeea8bbc5ae852d3 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sat, 20 Oct 2012 07:23:13 +0000 Subject: [PATCH] dbms: development [#CONV-2944]. --- dbms/include/DB/DataStreams/RemoteBlockInputStream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h index 327e41f2310..77640c73439 100644 --- a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h +++ b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h @@ -36,7 +36,7 @@ public: void cancel() { - if (!was_cancelled && !finished) + if (sent_query && !was_cancelled && !finished && !got_exception_from_server) { LOG_TRACE(log, "Cancelling query");