Commit Graph

228 Commits

Author SHA1 Message Date
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
49bb0652a8 enable_local_infile 2018-10-01 19:01:09 +03:00
proller
ca03cd6606 Sync with arcadia 2018-10-01 18:43:48 +03:00
Alexey Milovidov
5e3b507bd6 Added functions "toISOWeek", "toISOYear", "toStartOfISOYear" [#CLICKHOUSE-3988] 2018-09-17 06:09:56 +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
proller
fc2925b567 Squashed commit of the following:
commit 2722e540abfee4a527d716474c4ca582eceeee08
Merge: b4f3af824 aebddd550
Author: proller <proller@github.com>
Date:   Tue Aug 21 18:34:18 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit b4f3af824b88a8b6826583bb483730827574e8ad
Author: proller <proller@github.com>
Date:   Tue Aug 21 17:00:20 2018 +0300

    fix

commit 3a18fa7ded2a7d6b7a0883a1b9c2d6b99360837d
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:57:17 2018 +0300

    fix

commit 5d42220c2cf47e1a86bdc73dbfc24b68f8626891
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:50:21 2018 +0300

    freebsd fixes

commit 7baf4fb5ba4575f79b0d12a9ffaaabd34e1006da
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:17:19 2018 +0300

    fix

commit e1fe707fd765b841a8d0952d91a980128cbf91d0
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:35:21 2018 +0300

    fix

commit 027887c71b3ffa98d9473d50d8c3b79cbf3304ac
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:25:57 2018 +0300

    fix

commit 81af41bfcfff7c02fe4060196cf03c2d2aab416e
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:20:41 2018 +0300

    fix

commit 93d572c85d9c7e331254999a614c3b22b5573b02
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:58:07 2018 +0300

    SPLIT_SHARED

commit dd5b8990d8527d59b1e890943d80c2bf27c613ce
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:52:39 2018 +0300

    fix

commit 4840ca12ab752a38c1ef482e8ec59c5859bb48d7
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:46:31 2018 +0300

    fix

commit abde633beb86f2a0d025d6fcf079965dbd827b92
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:32 2018 +0300

    fix

commit 0d94a5476a5ba8ba5e88638d58f2cfbf2b4b662d
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:45:18 2018 +0300

    Travis: try fail on ninja fail

commit c2686f90b68255c2beb0a708804aef404e80a6d2
Merge: 2c3427bbd 2aa7eb463
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:15 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 2c3427bbdb861edbb188ed4621e8a05cafaedafb
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:24 2018 +0300

    fix

commit 530170c6a81d31dcfa81230e48520383234df4bc
Merge: 9abec162c f6e4ec970
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:03 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 9abec162cb2e09bbc2f33cbe80fe76791f6e5a77
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:49:58 2018 +0300

    Apple fixes

commit 36d05e8217440fbc8ae21571b06d4eb6d679d538
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:25:05 2018 +0300

    apple fix

commit aeec3e845e4456e89fbb1b1af6f9f36820a46e33
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:20:06 2018 +0300

    fixes

commit 427961d916a5954981e47d94733996deb2a616ce
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:11:11 2018 +0300

    fix

commit a7dd55ff8f653624c0f3dbcbc54defd3b3ae97af
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:41:53 2018 +0300

    fix

commit 6200e0d315c7a62bae63a8de0fc32f7937770ad2
Merge: 8a541d7e6 21cedbe46
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:35:49 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8a541d7e64c89e2c16af6c909e0353361153aaa3
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:34:32 2018 +0300

    Do not use poco types

commit fd560f43d048b7e3307c6c6b9c9d9918230014d8
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:20:42 2018 +0300

    Try fix apple build

commit cfb2eba07ac06f19e822d3474341d800b1f98cf1
Merge: 8d2e31c90 5b81fdfc0
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:03:24 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8d2e31c908be2e99d09e2a9dde2414ab82a5e93c
Author: proller <proller@github.com>
Date:   Mon Aug 20 21:56:06 2018 +0300

    travis: TEST_SERVER_STARTUP_WAIT=10
2018-08-21 18:56:50 +03:00
Alexey Milovidov
328c1387c0 Removed Poco::NumberFormatter [#CLICKHOUSE-2] 2018-08-20 22:35:04 +03:00
Alexey Milovidov
81dd290a42 Removed bad code #2864 2018-08-19 06:26:28 +03:00
proller
a2343890dd Build fixes (#2864)
* Try fix internal compiler headers path

* Build fixes

* fix

* wip

* clean

* Update arch.cmake
2018-08-14 16:31:26 +03:00
Alexey Milovidov
45cb92506b mysqlxx: fixed memory leak [#CLICKHOUSE-2] 2018-08-13 09:16:58 +03:00
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
Alexey Milovidov
e523f9a2c8 Fixed names [#CLICKHOUSE-2] 2018-08-05 11:54:57 +03:00
Alexey Milovidov
1b1754e598 Fixed build #2794 2018-08-04 00:13:54 +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
61059c3d9a Macos: allow build with mariadb-connector-c (#2715)
* Try fix version generate

* Macos: allow build with mariadb-connector-c
2018-07-25 14:29:26 +03:00
proller
7be750afe9 Apple build fixes 2018-07-20 20:21:03 +03:00
Alexey Milovidov
33205bba92 Disabled "LOAD DATA LOCAL INFILE" in mysql client because it has security issues [#CLOUDSECURITY-58] 2018-06-29 21:06:07 +03:00
Alexey Milovidov
a107f113f1 CI scripts: added support for yum #2520 2018-06-18 05:32:49 +03:00
Георгий Кондратьев
e9a0272f56 Search for mysqlclient in mysql subdirectories of default locations 2018-06-11 09:02:12 +00: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
Alexey Milovidov
d811647668 Suppressions for PVS-Studio [#CLICKHOUSE-3] 2018-06-04 18:28:25 +03:00
Alexey Milovidov
f4a3daaed0 Fixed linking with newer libmysqlclient when using lld. TODO: add mysqlclient to contrib [#CLICKHOUSE-2] 2018-05-11 17:13:44 +03:00
Alexey Milovidov
180fbead43 Removed questionable code from CMakeLists (and obsolete test) [#CLICKHOUSE-2] 2018-05-09 07:24:36 +03:00
proller
c12d93a873 Allow build without rt library (#1963)
* Allow build without rt library

* fix
2018-02-26 03:19:42 +03:00
Alexey Zatelepin
87b72b8e39 rename musl_exp10 -> preciseExp10 for coding style compatibility 2018-02-16 17:51:14 +03:00
Alexey Zatelepin
8fdb68ef79 add musl_ prefix to exp10 functions to avoid confusion with symbols from the system libm 2018-02-16 17:01:50 +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
104b09604a Merging [#CLICKHOUSE-3114] 2017-12-28 00:45:05 +03:00
proller
da1233fe3f Fix missing includes 2017-12-26 22:02:00 +03:00
Alexey Milovidov
a6fef4f398 Miscellaneous [#CLICKHOUSE-2]. 2017-12-13 23:22:23 +03:00
Alexey Milovidov
ca38cf198c Whitespaces [#CLICKHOUSE-2]. 2017-12-13 22:55:45 +03:00
proller
741117a390
Fix freebsd build. Little cmake fixes. (#1634) 2017-12-13 22:07:12 +03:00
Alexey Milovidov
431da20d99 Better [#CLICKHOUSE-2]. 2017-12-01 23:21:35 +03:00
Alexey Milovidov
b19b476cc6 Accept part of pull request [#CLICKHOUSE-2]. 2017-11-15 00:13:23 +03:00
Alexey Vasiliev
7ec4530354 Added explicit copy constructor for mysqlxx::Null 2017-10-17 20:01:01 +03:00
Alexey Vasiliev
59309432f9 Updated copy/move operations for some types, https://nda.ya.ru/3TWvPE 2017-10-17 14:58:08 +03:00
Alexey Milovidov
10392d5452 Fixed build on Mac OS X [#CLICKHOUSE-2]. 2017-10-14 02:12:06 +03:00
proller
7d0e5e786e Compile fixes 2017-09-24 15:41:29 +03:00
Bulat Gaifullin
7405dd5742 Add ssl options for MySQL connection #1217 2017-09-10 08:04:56 +03:00
Alexey Milovidov
e9ae193870 Implemented some suggestions from clang-tidy (part 1) [#CLICKHOUSE-3301]. 2017-09-08 05:29:47 +03:00
Alexey Milovidov
8b313ab99e Fixed warnings found by cppcheck [#CLICKHOUSE-3300]. 2017-09-08 00:04:48 +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
221110454e Prefer mariadbclient 2017-08-29 20:32:15 +03:00
blazerer
a11759c75b mysqlxx transaction exception safety
Fix terminate on exception and rollback query fail.
2017-08-16 18:30:05 +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
Alexey Milovidov
18e5c3bdc7 Miscellaneous [#CLICKHOUSE-2]. 2017-07-28 18:28:57 +03:00