Alexey Milovidov
4f44445ff0
Removed all trailing whitespaces [#CLICKHOUSE-2]. find . -name '*.h' -or -name '*.cpp' -or -name '*.cmake' -or -name 'CMakeLists.txt' -or -name '*.html' -or -name '*.xml' | grep -v contrib | xargs sed -i -r -e 's/\s+$//'
2017-03-31 19:00:30 +03:00
Alexey Milovidov
1c6c751108
Better overloads [#CLICKHOUSE-2].
2017-03-13 22:23:56 +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
1d7c5f63df
Cmake: fix includes with PATH_SUFFIXES ( #389 )
2017-01-25 01:07:08 +04:00
alexey-milovidov
5ee4c205c8
Revert "Cmake: fix includes with PATH_SUFFIXES" ( #388 )
2017-01-25 00:52:00 +04:00
proller
b068ffb100
Cmake: fix includes with PATH_SUFFIXES ( #387 )
2017-01-24 23:54:35 +04:00
proller
38040f5323
Сmake: more info in message about libreadline ( #376 )
...
* Cmake: more info in message about libreadline
* icu cmake
* cmake: glib message
2017-01-20 23:57:30 +04:00
proller
29475c94c0
Reorganize includes, less depends in .h files
2017-01-16 22:47:11 +03:00
Alexey Milovidov
68cf046e6c
Addition to prev. revision [#CLICKHOUSE-2716].
2017-01-14 00:29:44 +03:00
Alexey Milovidov
d8f0170bb7
Addition to prev. revision [#CLICKHOUSE-2716].
2017-01-14 00:24:59 +03:00
Alexey Milovidov
01b7c75d58
Addition to prev. revision [#CLICKHOUSE-2716].
2017-01-14 00:24:29 +03:00
Alexey Milovidov
d26f045819
Addition to prev. revision [#CLICKHOUSE-2716].
2017-01-14 00:18:07 +03:00
Alexey Milovidov
a86a86aa68
Addition to prev. revision [#CLICKHOUSE-2716].
2017-01-14 00:07:25 +03:00
Alexey Milovidov
fdc2464c78
Do not expose MySQL headers in headers of mysqlxx library [#CLICKHOUSE-2716].
2017-01-13 23:37:37 +03:00
proller
ee3882f251
Allow link with external libs: poco, tcmalloc
2017-01-13 14:25:44 +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
ceb4d4a3a5
fix build (do not remove my_compress.c.o from libmysqlclient.a) [#METR-23582]
2017-01-09 22:54:40 +03:00
Alexey Zatelepin
1c5db52d7d
remove zlib code compiled into libmysqlclient.a (fix precise build) [#METR-23582]
2017-01-09 22:12:36 +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
proller
d270053c3c
Replace all !/bin/bash by !/usr/bin/env bash : allow running scripts with bash in non standard path. also on freebsd.
2016-12-21 23:04:27 +03:00
Alexey Milovidov
050fc12824
mysqlxx: updated for compatibility with CentOS [#METR-20000].
2016-12-12 09:45:46 +03:00
Vladimir Chebotarev
a86e56cd1f
cmake: Special treating of rt in some cases. [#METR-21516]
2016-12-07 00:01:19 +03:00
Vladimir Chebotarev
eb552f2943
cmake: Improved copy_headers.sh script, minor fixes. [#METR-21516]
2016-12-06 21:04:10 +03: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
Vladimir Smirnov
d36f52502e
Make it compilable on OS X
...
It's still hackish and dirty, but server and client compies.
Server starts, but throwes meaningless exception on any query.
Client seems to be working fine.
Linux compilation might (but shouldn't) be broken (not tested).
2016-11-01 17:59:21 +01:00
Yuri Dyachenko
065b02494a
add -Wold-style-cast
2016-08-26 22:55:11 +03:00
Alexey Milovidov
c518abe882
Get rid of Poco::SharedPtr [#METR-21503].
2016-05-28 20:31:50 +03:00
Alexey Milovidov
4c7eb03b63
Using std::shared_ptr for data types [#METR-21503].
2016-05-28 13:35:44 +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
Alexey Milovidov
3519c3cea2
dbms: separated mysqlxx::Date and mysqlxx::DateTime [#METR-17973].
2016-02-03 04:17:58 +03:00
Roman Peshkurov
a7c25eb4be
███████████. improved join logic. [#MOBMET-2863]
2016-01-19 00:04:34 +03:00
Andrey Urusov
681c12d9fa
Merge
2015-10-07 17:48:34 +03:00
Alexey Milovidov
9facd5bc56
Removed link-time dependency [#METR-17973].
2015-10-05 10:04:42 +03:00
Andrey Urusov
bf16b1be56
libmysqlxx: Create connection fixed
2015-10-01 20:52:36 +03:00
Alexey Milovidov
1f6def094f
dbms: fixed build [#METR-18202].
2015-09-29 22:19:54 +03:00
Alexey Milovidov
18ed0b2829
dbms: external dictionaries: fixed errors [#METR-17508].
2015-08-12 07:21:10 +03:00
Alexey Arno
992e7dc7a5
Merge
2015-07-08 02:11:30 +03:00
Alexey Arno
37f008afd0
dbms: Server: Added support for multiple time zones: part 1 (does not add any new functionality, does not change current functionality) [#METR-15618]
2015-06-26 18:11:31 +03:00
Sergey Magidovich
3d95d19283
███████████-mobile: More accurate clicks handling. [#MOBMET-1212]
2015-03-25 13:08:04 +03:00
Sergey Magidovich
9856258325
Merge
2015-03-18 18:26:44 +03:00
Sergey Magidovich
0d53cccb78
███████████-mobile: Refactoring; 3 out of 5 WriteDestinations work; [#MOBMET-1225]
2015-03-16 15:26:19 +03:00
Andrey Mironov
7c9b2a1789
dbms: temporarily allow <table> element in mysqlxx::PoolWithFailover config [#METR-13298]
2015-03-06 16:38:07 +03:00
Andrey Mironov
b3c32ace59
mysqlxx: copy constructor for pools [#METR-13298]
2015-02-05 21:51:19 +03:00
Alexey Milovidov
8f076b8ac4
Removed deprecated date and time functions [#METR-13554].
2014-11-14 23:55:23 +03:00
Alexey Milovidov
3d359e2b82
Partially get rid of time2str.h [#METR-13554].
2014-11-06 09:32:23 +03:00
Alexey Milovidov
2727fef911
dbms: removed few functions [#METR-13554].
2014-11-06 04:31:50 +03:00
Pavel Kartavyy
8f687c6042
RecountRequest: fixed wrong formatting, when chunk is empty [#METR-13437]
2014-10-28 20:55:07 +03:00
Michael Kolupaev
5bbb6dc090
some grammar fixes. [#METR-2807]
2014-08-12 13:35:15 +04:00
Alexey Milovidov
94ed780065
███████████: intrusive: development [#METR-12050].
2014-07-26 08:12:43 +04:00
Alexey Milovidov
0041db77ab
Tiny improvement [#METR-2807].
2014-07-09 03:52:53 +04:00
Pavel Kartavyy
146378633a
GlobalCorrector: added program to overwrite metrics in metrage [#METR-11762]
2014-07-08 15:08:58 +04:00
Michael Kolupaev
38c5500a71
Refactored DB::ConnectionPool, DB::ConnectionPoolWithFailover and sqxxl::Pool. [#METR-10202]
2014-06-03 18:32:08 +04:00
Alexey Milovidov
34eeed7ed3
Renamed mysqlxx::String and sqxxl::String to mysqlxx::Value and sqxxl::Value [#METR-2807].
2014-05-20 02:05:33 +04:00
Pavel Kartavyy
886548859c
███████████: added progress file [#METR-9888]
2014-04-10 19:21:01 +04:00
Alexey Milovidov
63cff6a5a4
Improvement [#METR-2807].
2014-04-08 11:58:53 +04:00
Alexey Milovidov
5ca21127c7
Improvement [#METR-2807].
2014-04-08 11:31:51 +04:00
Alexey Milovidov
34bf7dd0ae
Removed useless code [#METR-2807].
2014-04-08 10:51:53 +04:00
Pavel Kartavyy
101a056fb8
Removed suddenly reverted commit "Fixed error in prev. revision [#METR-10142]."
...
This reverts commit a1d4e27454689270855256fa00e6f73e954a316c.
2014-02-21 19:56:42 +04:00
Pavel Kartavyy
0a150faca5
Revert "Fixed error in prev. revision [#METR-10142]."
...
This reverts commit c139fa2b260ea9e0a77bc721767797b3cfaba0a8.
2014-02-21 19:14:10 +04:00
Alexey Milovidov
4ea2512504
Fixed error in prev. revision [#METR-10142].
2014-02-21 06:46:51 +04:00
Alexey Milovidov
a7f5465b91
Fixed error in prev. revision [#METR-10142].
2014-02-21 06:15:18 +04:00
Alexey Milovidov
b1e9204dcc
Fixed performance issue [#METR-10142].
2014-02-21 05:57:01 +04:00
Alexey Milovidov
22fda035cc
Allowed to use std::vector instead of DB::Array for Arrays in ssqls [#METR-8766].
2014-01-05 13:40:11 +00:00
Alexey Milovidov
6dc9ce070c
Preparing to linking libmysqlclient statically [#METR-9505].
2013-12-16 20:15:28 +00:00
Pavel Kartavyy
ce5ff538ec
mysqlxx: fix [METR-9429]
2013-12-09 19:16:48 +00:00
Alexey Milovidov
340404eaf3
Fixed indents [#METR-2807].
2013-12-06 17:29:01 +00:00
Pavel Kartavyy
2fab08ae10
libmysqlxx: enabled empty password. refactoring [#METR-8598]
2013-10-29 09:27:10 +00:00
Alexey Milovidov
fa7a666a96
mysqlxx: added server address to exception messages [#METR-9068].
2013-10-26 02:50:23 +00:00
Alexey Milovidov
c46b9253f3
PoolWithFailover: changed error to warning [#METR-9062].
2013-10-24 17:49:14 +00:00
Pavel Kartavyy
a933ed4e43
libmysqlxx: optimized build time and project view in qtcreator [#CONV-8598]
2013-09-05 11:44:10 +00:00
Pavel Kartavyy
afa70827c7
libmysqlxx: changed settings to mysql [#CONV-8598]
2013-09-04 15:29:02 +00:00
Alexey Milovidov
bd69b6d606
PoolWithFailover: Better error reporting [#CONV-8589].
2013-08-28 01:21:53 +00:00
Alexey Milovidov
d04ce851ae
PoolWithFailover: reverted priority [#RTADMIN-5725].
2013-08-27 16:53:20 +00:00
Alexey Milovidov
be67c3e3d6
Removed useless namespace [#CONV-2807].
2013-08-11 03:40:14 +00:00
Evgeniy Gatov
180065b7b4
libmysqlxx/DateTime: fixed bug [#CONV-8035].
2013-07-01 16:38:13 +00:00
Alexey Milovidov
a14c5a4aa9
Improved notifications [#CONV-7461].
2013-04-28 02:56:13 +00:00
Alexey Milovidov
8ad2255fa9
mysqlxx: set default rw_timeout to half-hour [#CONV-7420].
2013-04-24 21:50:19 +00:00
Michael Kolupaev
d211d5b185
libmysqlxx: improved test [#CONV-7043].
2013-04-18 10:36:49 +00:00
Michael Kolupaev
4ffb9e936f
libmysqlxx: fixed PoolWithFailover [#CONV-7043].
2013-04-18 10:33:58 +00:00
Michael Kolupaev
3e12bc0c14
libmysqlxx: added test [#CONV-7043].
2013-04-18 10:23:40 +00:00
Alexey Milovidov
af71008e23
Added support for rw_timeout in mysqlxx::Pool; removed useless code [#CONV-7093].
2013-04-11 17:51:14 +00:00
Michael Kolupaev
36798abd60
libmysqlxx: added PoolWithFailover [#CONV-7043].
2013-04-04 14:39:59 +00:00
Alexey Milovidov
1f375250d6
mysqlxx: added read/write timeouts [#CONV-7093].
2013-03-31 01:16:35 +00:00
Alexey Milovidov
6a4b0139e8
Fixed build with clang [#CONV-2807].
2013-01-06 19:06:21 +00:00
Alexey Milovidov
037941ff83
Compatibility with clang [#CONV-2807].
2013-01-06 16:13:07 +00:00
Alexey Milovidov
c3e3b66dc4
Compatibility with clang [#CONV-2807].
2013-01-06 16:07:01 +00:00
Alexey Milovidov
aad8bab2d0
Tiny fixes [#CONV-2807].
2012-10-24 20:05:10 +00:00
Alexey Milovidov
9002b37164
Tiny modification [#CONV-5417].
2012-09-05 19:51:52 +00:00
Alexey Milovidov
0652f9da96
dbms: development [#CONV-2944].
2012-08-31 20:38:05 +00:00
Alexey Milovidov
ec0a48e99e
███████████: fixed incompatibility [#CONV-5283].
2012-07-20 19:54:25 +00:00
Alexey Milovidov
3ad90a2494
sqxxl: development [#CONV-2944].
2012-06-07 20:22:15 +00:00
Alexey Milovidov
b631690c8c
sqxxl: fixed errors [#CONV-2944].
2012-06-07 20:02:41 +00:00
Alexey Milovidov
e3174f6884
███████████: committing data in group [#CONV-4768].
2012-05-02 19:16:50 +00:00
Alexey Milovidov
fd8556bf0a
mysqlxx: removed initialization by current time [#CONV-2807].
2012-02-26 02:44:29 +00:00
Alexey Milovidov
32102bab7b
███████████: fixed error [#CONV-3680].
2011-12-06 19:52:38 +00:00
Alexey Milovidov
9763d1f8c8
SSQLS: removed useless code; improvement [#CONV-3722].
2011-12-05 14:13:18 +00:00
Alexey Milovidov
4157959cb7
mysqlxx: fixed error with libmysqlclient [#CONV-3336].
2011-11-30 19:14:06 +00:00
Alexey Milovidov
1cde7d6ab5
blobs: fixed error [#CONV-3681].
2011-11-29 18:53:44 +00:00
Alexey Milovidov
eff4e7a65f
Cleanup [#CONV-2807].
2011-11-21 07:40:03 +00:00
Alexey Milovidov
40255abe04
table-statd: fixed error ('db' required) [#CONV-3616].
2011-11-17 19:28:50 +00:00
Alexey Milovidov
98164a95ec
mysqlxx::Date: removed useless changes, left useful changes; mysqlxx::DateTime: added useful changes [#CONV-3381].
2011-10-14 18:03:25 +00:00
Evgeniy Gatov
538df807c4
libmysqlxx::Date bugfix [#CONV-3381].
2011-10-14 11:32:08 +00:00
Alexey Milovidov
cb5be1a84f
mysqlxx: fixed error [#CONV-3336].
2011-10-13 23:43:14 +00:00
Alexey Milovidov
ac9b26cc29
mysqlxx: fixed error with libmysqlclient_r [#CONV-3336].
2011-10-10 20:32:42 +00:00
Alexey Milovidov
b27f904bd3
Better sleep [#CONV-2807].
2011-10-06 18:23:00 +00:00
Alexey Milovidov
7cceb00dd9
mysqlxx::Pool: style fixes [#CONV-2807].
2011-10-06 15:58:20 +00:00
Alexey Milovidov
809ee23e73
mysqlxx::Pool: minor style fixes [#CONV-2807].
2011-10-06 15:26:48 +00:00
Alexey Milovidov
bbb966b677
mysqlxx: compatibility with new libmysqlclient; allowed to specify connect timeout in config file [#CONV-3336].
2011-10-05 20:21:18 +00:00
Alexey Milovidov
ed8905bcf6
Pool: fixed error [#CONV-3288].
2011-10-02 03:37:24 +00:00
Alexey Milovidov
8eb988a480
statdaemons: added InFileDataLoaderWithBackup [#CONV-3288].
2011-09-28 19:11:13 +00:00
Alexey Milovidov
f5f4599922
mysqlxx::Pool: trying to reconnect only if connection was successful at least once [#CONV-2807].
2011-09-01 18:15:15 +00:00
Alexey Milovidov
f306242847
mysqlxx: fixed ambiguity in methods take char * and int and default args [#CONV-2807].
2011-09-01 18:14:01 +00:00
Alexey Milovidov
2b5d719414
mysqlxx: added option MYSQL_OPT_LOCAL_INFILE [#CONV-3016].
2011-08-23 17:46:58 +00:00
Evgeniy Gatov
cf7fcfc91c
Date format YYYYMMDD now supported by mysqlxx::Date constructor [#CONV-1968].
2011-08-03 14:24:28 +00:00
Alexey Milovidov
7e0d8039ee
mysqlxx:: Exception: tiny improvement [#CONV-2807].
2011-07-20 17:55:33 +00:00
Alexey Milovidov
5779760e0c
mysqlxx: added const [#CONV-2546].
2011-07-20 17:30:31 +00:00
Alexey Milovidov
d4ac9fe904
mysqlxx: removed MYSQL_OPT_READ_TIMEOUT [#CONV-2647].
2011-06-29 19:59:20 +00:00
Alexey Milovidov
b33de091f0
Removed useless code [#CONV-2593].
2011-06-14 17:17:41 +00:00
Alexey Milovidov
a11485e186
███████████-converter: added.
2011-06-03 21:02:20 +00:00
Alexey Milovidov
9d4a5cf65f
mysqlxx: fixed error.
2011-06-03 17:55:26 +00:00
Alexey Milovidov
b219f5fbae
Added ███████████-server.
2011-05-25 18:15:00 +00:00
Evgeniy Gatov
fe6f7e0c6b
libmysqlxx/ updates for null type values support
2011-05-19 06:14:54 +00:00
Alexey Milovidov
f635f7f230
mysqlxx: fixed error in prev. revision.
2011-05-13 17:58:53 +00:00
Alexey Milovidov
5c023f20e3
mysqlxx: fixed error in prev. revision.
2011-05-13 17:48:30 +00:00
Alexey Milovidov
b45adb47fc
mysqlxx: added timeouts.
2011-05-13 16:58:53 +00:00
Alexey Milovidov
e77285160d
mysqlxx: added more comments.
2011-04-28 20:23:56 +00:00
Alexey Milovidov
acdb53f933
Merge
2011-04-28 20:20:27 +00:00
Alexey Milovidov
9829b84ef5
mysqlxx: fixed error when reusing *Result objects for different results.
2011-04-28 17:12:28 +00:00
Alexey Milovidov
1a5b3c0473
mysqlxx: fixed error.
2011-04-25 20:31:34 +00:00
Alexey Milovidov
bbef23a3db
mysqlxx: added comment.
2011-03-31 15:38:32 +00:00
Alexey Milovidov
c9245b4036
Unification: removed strconvert manips, using mysqlxx manips.
2011-03-29 17:56:51 +00:00
Alexey Milovidov
9c3613fb21
mysqlxx: fixed error in StoreQueryResult.
2011-03-22 18:29:51 +00:00
Alexey Milovidov
1bbaeeff1f
mysqlxx: increased preview length of query in exception.
2011-03-22 18:29:37 +00:00
Alexey Milovidov
fd3cbb2b5c
mysqlxx: added missing code.
2011-03-21 19:46:50 +00:00
Alexey Milovidov
5533bf9ba9
mysqlxx: added missing file.
2011-03-18 20:30:13 +00:00
Alexey Milovidov
eb9f0512ed
mysqlxx: added comments, tiny fixes.
2011-03-18 20:26:54 +00:00
Alexey Milovidov
ede555a1ba
mysqlxx: fixed error.
2011-03-17 20:00:04 +00:00
Alexey Milovidov
740df01db3
Using mysqlxx library.
2011-03-17 19:45:21 +00:00
Alexey Milovidov
8afc9ac8bb
mysqlxx: fixed error.
2011-03-16 20:33:39 +00:00