thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-12 11:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Blinkov 2018-07-31 11:17:08 +03:00
commit 06b1e933ab
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/CMakeLists.txt vendored
View File

@ -1,5 +1,11 @@
if (NOT MSVC)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast -Wno-unused-function -Wno-deprecated-declarations -Wno-non-virtual-dtor -std=c++1z")
# Third-party libraries may have substandard code.
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-result -Wno-deprecated-declarations -Wno-maybe-uninitialized -Wno-format")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-result -Wno-deprecated-declarations -Wno-non-virtual-dtor -Wno-maybe-uninitialized -Wno-format -std=c++1z")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wno-deprecated-declarations -Wno-format")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wno-deprecated-declarations -Wno-non-virtual-dtor -Wno-format -std=c++1z")
endif ()
if (USE_INTERNAL_BOOST_LIBRARY)

12
dbms/cmake/version.cmake
View File

@ -1,11 +1,11 @@
# This strings autochanged from release_lib.sh:
set(VERSION_REVISION 54399 CACHE STRING "")
set(VERSION_REVISION 54400 CACHE STRING "")
set(VERSION_MAJOR 18 CACHE STRING "")
set(VERSION_MINOR 4 CACHE STRING "")
set(VERSION_PATCH 0 CACHE STRING "")
set(VERSION_GITHASH 8bc95412b66b360fdbef5bb0cec5217378f066a6 CACHE STRING "")
set(VERSION_DESCRIBE v18.4.0-testing CACHE STRING "")
set(VERSION_STRING 18.4.0 CACHE STRING "")
set(VERSION_MINOR 5 CACHE STRING "")
set(VERSION_PATCH 1 CACHE STRING "")
set(VERSION_GITHASH 3caadfadc6919484e6246cb2feaf3bfdb41585b7 CACHE STRING "")
set(VERSION_DESCRIBE v18.5.1-testing CACHE STRING "")
set(VERSION_STRING 18.5.1 CACHE STRING "")
# end of autochange
set(VERSION_EXTRA "" CACHE STRING "")

6
dbms/tests/queries/0_stateless/00678_shard_funnel_window.reference
View File

@ -1,3 +1,3 @@
1 10000
1 10000
1 10000
1 10000
1 10000
1 10000

4
debian/changelog vendored
View File

@ -1,5 +1,5 @@
clickhouse (18.4.0) unstable; urgency=low
clickhouse (18.5.1) unstable; urgency=low
* Modified source code
-- <robot-metrika-test@yandex-team.ru> Sat, 28 Jul 2018 00:35:05 +0300
-- <robot-metrika-test@yandex-team.ru> Tue, 31 Jul 2018 04:28:23 +0300

8
debian/control vendored
View File

@ -21,7 +21,7 @@ Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-common-static (= ${binary:Version}) | clickhouse-server-base (= ${binary:Version})
Replaces: clickhouse-compressor
Conflicts: clickhouse-compressor
Description: Client binary for clickhouse
Description: Client binary for ClickHouse
Yandex ClickHouse is a column-oriented database management system
that allows generating analytical data reports in real time.
.
@ -32,7 +32,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tzdata
Replaces: clickhouse-server-base
Provides: clickhouse-server-base
Description: Common files for clickhouse
Description: Common files for ClickHouse
Yandex ClickHouse is a column-oriented database management system
that allows generating analytical data reports in real time.
.
@ -43,7 +43,7 @@ Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-common-static (= ${binary:Version}), adduser
Replaces: clickhouse-server-common, clickhouse-server-base
Provides: clickhouse-server-common
Description: Server binary for clickhouse
Description: Server binary for ClickHouse
Yandex ClickHouse is a column-oriented database management system
that allows generating analytical data reports in real time.
.
@ -63,7 +63,7 @@ Package: clickhouse-test
Priority: optional
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-client, bash, expect, python, python-lxml, python-termcolor, python-requests, curl, perl, sudo, openssl, netcat-openbsd, telnet
Description: Clickhouse tests
Description: ClickHouse tests