Merge branch 'master' of github.com:yandex/ClickHouse

CMakeLists.txt

@@ -127,8 +127,8 @@ endif ()
 
 include (cmake/test_compiler.cmake)
 if (USE_STATIC_LIBRARIES AND HAVE_NO_PIE)
-	set (CMAKE_CXX_FLAGS                 "${CMAKE_CXX_FLAGS} --no-pie")
-	set (CMAKE_C_FLAGS                   "${CMAKE_C_FLAGS} --no-pie")
+	set (CMAKE_CXX_FLAGS                 "${CMAKE_CXX_FLAGS} ${FLAG_NO_PIE}")
+	set (CMAKE_C_FLAGS                   "${CMAKE_C_FLAGS} ${FLAG_NO_PIE}")
 endif ()
 
 set (SAN_FLAGS "-O3 -g -fno-omit-frame-pointer")

cmake/test_compiler.cmake

@@ -1,7 +1,8 @@
 include (CheckCXXSourceCompiles)
 
-set (TEST_FLAG "--no-pie")
+set (TEST_FLAG "-no-pie")
 set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG}")
+
 check_cxx_source_compiles("
 	int main() {
 		return 0;
@@ -9,3 +10,7 @@ check_cxx_source_compiles("
 " HAVE_NO_PIE)
 
 set (CMAKE_REQUIRED_FLAGS "")
+
+if (HAVE_NO_PIE)
+	set (FLAG_NO_PIE ${TEST_FLAG})
+endif ()

dbms/src/Interpreters/executeQuery.cpp

@@ -193,7 +193,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 		res = interpreter->execute();
 
 		/// Delayed initialization of query streams (required for KILL QUERY purposes)
-		if (!internal)
+		if (!internal && nullptr == typeid_cast<const ASTShowProcesslistQuery *>(&*ast))
 			(*process_list_entry)->setQueryStreams(res);
 
 		/// Hold element of process list till end of query execution.

dbms/tests/queries/0_stateless/00419_show_sql_queries.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+clickhouse-client -q "SHOW PROCESSLIST" &>/dev/null
+clickhouse-client -q "SHOW DATABASES" &>/dev/null
+clickhouse-client -q "SHOW TABLES" &>/dev/null