Commit Graph

46 Commits

Author SHA1 Message Date
Yuriy
dfb762d93c Revert "Revert "Updated MariaDB""
This reverts commit f8b7cc8693.
2019-09-25 01:28:59 +03:00
Yuriy Baranov
f8b7cc8693
Revert "Updated MariaDB" 2019-09-24 05:11:52 +03:00
Yuriy
fd0c76131f removed contrib/mariadb-connector-c-cmake 2019-09-15 23:44:34 +03:00
Yuriy
84cfbb8e69 simplified mariadb-connector-c compilation and fixed caching_sha2_password plugin 2019-09-15 23:09:09 +03:00
Alexey Milovidov
bba2641bd0 A few fixes for PVS-Studio 2019-07-08 02:25:15 +03:00
proller
c6d0e095e0
Prepare cmake for new contrib/poco (#5062) 2019-04-25 00:33:04 +03:00
proller
ba4687e110
Cmake: dont use LINK_MODE (but use BUILD_SHARED_LIBS) (#5091) 2019-04-24 12:06:28 +03:00
proller
d6d83d4a5c
Allow build without ssl (#4525) (#4750) 2019-03-22 14:18:24 +03:00
Alexey Milovidov
f6298b6428 Removed garbage 2019-02-09 23:57:17 +03:00
proller
1d40c2c871 Better link and deps (#3631)
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
2018-11-21 22:20:27 +03:00
proller
db13ef96d6 Fix ssl init (#3056)
* Try to fix ../libs/libglibc-compatibility/glibc-compatibility.c:151: multiple definition of `explicit_bzero'
contrib/ssl/crypto/libcrypto.a(explicit_bzero.c.o):../contrib/ssl/crypto/compat/explicit_bzero.c:16: first defined here

* Fix ssl init

* fix

* noncopyable

* clean
2018-09-06 21:05:33 +03:00
proller
3acce3bff9 Build fix (#2944)
* Build fix

* Better sample build scripts

* zlib apple fix

* fix

* fix

* better so version

* SPLIT_SHARED -> LINK_MODE

* clean
2018-08-27 17:39:20 +03:00
alexey-milovidov
25cc323d1d
Using mariadb-connector-c from submodule. (#2785)
* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]

* Using internal mariadb-client library [#CLICKHOUSE-2]
2018-08-02 03:49:31 +03:00
proller
f88f68db09 Macos: fix include for mysql, use mariadb-connector-c in docs (#2717)
* Macos: fix mysql link

* Macos: Fix mysql include

* doc
2018-07-25 18:27:31 +03:00
proller
7be750afe9 Apple build fixes 2018-07-20 20:21:03 +03:00
Alexey Milovidov
a107f113f1 CI scripts: added support for yum #2520 2018-06-18 05:32:49 +03:00
proller
347579ce46 Cmake: mark system includes as SYSTEM (#1449)
* contrib: cctz as submodule. update cctz.

* pbuilder: add ubuntu bionic, devel

* Cmake: mark system includes as SYSTEM

* Build fixes

* fix

* Fix package without compiler

* Better

* fix

* fix

* fix

* Build fix

* fix

* fix

* fix

* Cmake: Add SYSTEM to includes for external libs
2018-06-06 23:21:58 +03:00
proller
82d74f5ab3 Allow redefine server config via command line: clickhouse-server -- --logger.level=information (#1811)
* Aloow redefine server config via command line: clickhouse-server -- --logger.level=information

* style

* fix

* BaseDaemon: Simpler createDirectory

* Allow --key value

* Update BaseDaemon.cpp

* Update BaseDaemon.cpp
2018-02-08 22:12:37 +03:00
proller
b026eb7797 Use submodule contrib/capnproto, remove include_directories (#1746)
* Add submodule contrib/capnproto

* Use contrib/capnproto, remove include_directories

* Fix include

* Clean

* Fix werror

* Update doc

* Fix

* Final fix

* Fxi
2018-01-11 21:39:52 +03:00
Alexey Milovidov
b19b476cc6 Accept part of pull request [#CLICKHOUSE-2]. 2017-11-15 00:13:23 +03:00
proller
f68a0ea63b Fix mysql includes and remove libmariadb submodule (#1185)
* Use bundled libmariadbclient (CLICKHOUSE-3261)

* wip

* wip

* wip

* Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh

* Fix mysql includes

* Cmake: don't install mariadb targets

* Fix generated includes

* Disable mysql tests

* cmake: mariadb fixes

* Fix

* Update find_mysqlclient.cmake

* Fix zlib

* Remove bundled contrib/mariadb-connector-c

* fix

* Fix build

* Fix includes
2017-09-04 20:04:33 +03:00
proller
3269b1da57 libmariadb as submodule (CLICKHOUSE-3261) (#1181)
* Use bundled libmariadbclient (CLICKHOUSE-3261)

* wip

* wip

* wip

* Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh
2017-08-31 20:11:30 +03:00
proller
d6833a0d55 Cmake: remove global include_directories (#1055)
* Fix .h compile

* Cmake: remove global include_directories

* boost include hide

* fix cctz

* add \n
2017-08-03 15:44:39 +03:00
proller
4db8d09de9 Reorganize includes. part 1 (#921)
* Make libunwind optional. Allow use custom libcctz

* fix

* Fix

* fix

* Update BaseDaemon.cpp

* Update CMakeLists.txt

* Reorganize includes. part 1

* Update dbms_include.cmake

* Reorganize includes. part 2

* Reorganize includes. part 3

* dbms/src/Common/ThreadPool -> libs/libcommon

* Reorganize includes. part 4

* Fix print_include_directories

* Update thread_creation_latency.cpp

* Update StringRef.h
2017-06-23 23:22:35 +03:00
alexey-milovidov
c9c8c8ec50 Better option to disable mysqlclient (#710)
* Better support for disabling libmysqlclient [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].
2017-04-19 03:25:57 +03:00
proller
5db73c5d31 Allow build without libmysqlclient (#698)
* Allow build without libmysqlclient

* better condition

* cmake option ENABLE_MYSQL

* fix formatting

* Update find_mysqlclient.cmake

* Update find_mysqlclient.cmake

* Update Types.h

* Better throw's
2017-04-14 22:38:56 +03:00
proller
72ccc69212 Debian: simpler package (#662)
* Allow use external re2 with re2_st=re2

* fix

* remove dupe

* use re2_st in FunctionsStringSearch.h

* fix

* move files from tools/etc to debian

* dont generate control

* version

* ok.

* wip

* Cmake: dont touch CMAKE_INSTALL_PREFIX

* wip

* works!

* clean

* okay

* like old

* wip

* wip

* okay

* clickhouse-server-base-dbg

* clean

* clickhouse-server-dbg

* Debian: Remove daemons

* Update rules

* add source/format

* control clean

* add watch

* clean

* clean

* temp fix build

* clean

* docs

* fake make_control

* fix

* testme

* testme

* add metrika package

* fake metrika files
2017-04-10 20:43:30 +03:00
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
alexey-milovidov
cee5ab01fb Merge branch 'master' into merge_with_metrika 2017-02-11 00:27:15 +04:00
proller
9bbe8fe5c4 Dynamic library mode (#471)
* Cmake: UNBUNDLED option

* Dynamic library mode
2017-02-08 22:53:00 +04:00
proller
f87ae6808f cmake: USE_INTERNAL_ZLIB_LIBRARY (#463)
* Correct fix of building with external poco with disabled sending progress

    Revert "Removed wrong code [#CLICKHOUSE-2]."

    This reverts commit 33f9917f53.

* fix

* fix

* cmake: USE_INTERNAL_ZLIB_LIBRARY
2017-02-08 01:28:13 +04:00
Pavel Kartavyy
224ba16dcb use project source and binary dirs instead of global dirs 2017-02-06 18:15:19 +03:00
proller
29475c94c0 Reorganize includes, less depends in .h files 2017-01-16 22:47:11 +03:00
Alexey Milovidov
d26f045819 Addition to prev. revision [#CLICKHOUSE-2716]. 2017-01-14 00:18:07 +03:00
proller
4bfa697656 Add more search paths to find_mysqlclient.cmake, rename find_libmysqlclient.cmake -> find_mysqlclient.cmake 2017-01-12 15:20:43 +03:00
Alexey Zatelepin
1b61f2a9d3 use zlib-ng from contrib everywhere [#METR-23582] 2017-01-08 22:24:38 +03:00
proller
4bc003c4c1 Porting to freebsd: initial, compile ok, most tests ok. 2016-12-24 01:03:10 +00:00
Vladimir Chebotarev
ca5c1dc31b cmake: Improved build. [#METR-21516] 2016-12-06 19:51:34 +03:00
Vladimir Chebotarev
8e1a6aaf3e cmake: Boost, OpenSSL into find_package(). [#METR-23701] 2016-12-06 16:20:32 +03:00
Vladimir Chebotarev
bcc5500f91 cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
Vladimir Chebotarev
d4ba394100 libmysqlxx: Secure way to patch mysqlclient library. [#METR-21516] 2016-11-09 23:08:29 +03:00
Vladimir Chebotarev
cdaece7dfa : More specific usage of static libraries. [#METR-21516] 2016-11-09 21:49:01 +03:00
Vladimir Chebotarev
e2ceb63c54 libcommon, libre2, tools: Fixed build under OS X Sierra. [#METR-21516] 2016-11-03 15:41:13 +03:00
Alexey Milovidov
a8ca56ecc0 Better [#METR-2944]. 2016-05-28 03:22:09 +03:00
Vladimir Chebotarev
da45ac3d30 libmysqlxx: Proper target_link_libraries [#METR-20000] 2016-05-23 17:05:17 +03:00
Alexey Milovidov
df1d66e51a Removed sensitive data. 2016-02-08 00:58:58 +03:00