Commit Graph

12587 Commits

Author SHA1 Message Date
Alexey Milovidov
40a0551d85 Client --testmode cannot be used to catch exceptions thrown from query parser #2840 2018-08-19 23:41:45 +03:00
Alexey Milovidov
41ec796a67 Little better [#CLICKHOUSE-2] 2018-08-19 23:26:11 +03:00
Alexey Milovidov
ce10e5bd6f Modified example config for running clickhouse-server from the source tree to run tests smoothly [#CLICKHOUSE-2] 2018-08-19 23:21:36 +03:00
Alexey Milovidov
6fb8b4e5cd Opinionated changes #2893 2018-08-19 23:18:31 +03:00
alexey-milovidov
5a30b4790e
Update ColumnInfoHandler.h 2018-08-19 23:13:22 +03:00
alesapin
f6c9587d0a CLICKHOUSE-3878: Move last interaction with ODBC from main code to bridge, split Handlers file on three different, slightly remove copy-paste code 2018-08-19 20:09:54 +03:00
Alexey Milovidov
a6945ba00b Fix according to @ludv1x advise #2482 2018-08-19 08:33:50 +03:00
Alexey Milovidov
06a7d0194d Fixed test #2482 2018-08-19 07:56:20 +03:00
Alexey Milovidov
6741582950 Better diagnostic in test #2482 2018-08-19 07:54:14 +03:00
Alexey Milovidov
99b19c3a66 Miscellaneous #2482 2018-08-19 07:45:39 +03:00
Alexey Milovidov
bf68280bf3 Miscellaneous #2482 2018-08-19 07:43:58 +03:00
Alexey Milovidov
c81eaf66da Corrected comment #2482 2018-08-19 07:31:51 +03:00
Alexey Milovidov
1802b00c0b Fixed bad arithmetic; miscellaneous #2482 2018-08-19 07:25:53 +03:00
Alexey Milovidov
2dae8f9396 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-18 04:45:00 +03:00
Alexey Milovidov
1c4f5d3359 Miscellaneous #2482 2018-08-17 21:57:07 +03:00
proller
62b6b6d73e Rare segfault fix 2018-08-17 21:23:10 +03:00
Amos Bird
57970a8bef
Using correct config ref to initialize odbc bridge 2018-08-17 19:00:42 +08:00
Alexey Milovidov
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
2018-08-17 00:47:15 +03:00
chertus
23c0e8efb5 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-16 14:05:20 +03:00
chertus
70d2c4ecf6 minor changes [CLICKHOUSE-3765] 2018-08-16 14:05:14 +03:00
Alexey Milovidov
b088154b14 Merge branch 'CLICKHOUSE-2910' of github.com:yandex/ClickHouse into CLICKHOUSE-2910 2018-08-16 01:43:59 +03:00
Alexey Milovidov
e2eb0650b8 Auto version update to [18.11.0] [54406] 2018-08-16 01:43:16 +03:00
Alexey Milovidov
56af576fe5 Removed duplicate query_id logging #2482 2018-08-16 01:39:19 +03:00
alesapin
2583abfccf CLICKHOUSE-3878: Conflict fixes 2018-08-16 01:02:36 +03:00
alesapin
62c166db79 CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:45 +03:00
alesapin
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
9a78ee3e44 Removed static std::string variable #2482 2018-08-16 00:57:40 +03:00
Alexey Milovidov
76af46ed5d Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
Conflicts:
	dbms/src/Interpreters/Settings.h
	dbms/tests/queries/0_stateless/00687_top_and_offset.sql
2018-08-16 00:44:24 +03:00
chertus
0415c9e34a fix int128 to float comparison [CLICKHOUSE-3765] 2018-08-15 19:43:40 +03:00
chertus
c8e945d73d one another build fix 2018-08-15 18:29:57 +03:00
chertus
3805794e66 some more build fixes 2018-08-15 16:27:22 +03:00
alexey-milovidov
4524dcaf9a
Merge pull request #2871 from zhang2014/fix/build_failure
ISSUES-2846 fix build failure with gcc 8.1
2018-08-15 13:35:23 +03:00
zhang2014
1549baa4e9 ISSUES-863 fix test failure #2015 #2840 2018-08-15 13:43:44 +08:00
zhang2014
3b0f0ac01e ISSUES-2846 fix build failure with gcc 8.1 2018-08-15 11:51:03 +08:00
Alexey Milovidov
ab2213442d Miscellaneous #2482 2018-08-15 01:01:41 +03:00
Alexey Milovidov
dfd9be86d8 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:50:00 +03:00
Alexey Milovidov
5410f73ba7 Fixed warnings #2015 2018-08-15 00:49:51 +03:00
Alexey Milovidov
31867c0612 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:48:51 +03:00
Alexey Milovidov
03af27a218 Fixed warnings #2015 2018-08-15 00:48:39 +03:00
Alexey Milovidov
9916a75f2e Merging #2482 2018-08-15 00:35:26 +03:00
alexey-milovidov
ce9c6a5ab3
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:34:23 +03:00
Alexey Milovidov
c80db48a6e Merging #2482 2018-08-15 00:32:49 +03:00
alexey-milovidov
8586e6bb2e
Merge pull request #2787 from zhang2014/fix/replace_asterisk
ISSUES-2786 fix replace asterisk with join query
2018-08-15 00:28:35 +03:00
Alexey Milovidov
c72482528c Merging #2482 2018-08-15 00:18:14 +03:00
Alexey Milovidov
93c9eab088 Merging #2482 2018-08-15 00:15:17 +03:00
chertus
7ca6a0737d some more build fixes 2018-08-15 00:12:23 +03:00
alexey-milovidov
e7b671ec98
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:10:21 +03:00
Alexey Milovidov
21579a3cc8 Removed static std::string variable #2482 2018-08-14 23:56:23 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
alexey-milovidov
c376b2d476
Merge pull request #2869 from yandex/low-cardinality-fixes
LowCardinality fixes
2018-08-14 22:36:19 +03:00