mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-04 23:50:50 +00:00
Merge branch 'master' of github.com:ClickHouse/ClickHouse into add-mutation-for-storagememory
This commit is contained in:
commit
23fa408403
@ -31,6 +31,7 @@ if (COMPILER_CLANG)
|
|||||||
add_warning(pedantic)
|
add_warning(pedantic)
|
||||||
no_warning(vla-extension)
|
no_warning(vla-extension)
|
||||||
no_warning(zero-length-array)
|
no_warning(zero-length-array)
|
||||||
|
no_warning(c11-extensions)
|
||||||
|
|
||||||
add_warning(comma)
|
add_warning(comma)
|
||||||
add_warning(conditional-uninitialized)
|
add_warning(conditional-uninitialized)
|
||||||
|
2
contrib/mariadb-connector-c
vendored
2
contrib/mariadb-connector-c
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 3f512fedf0ba0f769a1b4852b4bac542d92c5b20
|
Subproject commit f5638e954a79f50bac7c7a5deaa5a241e0ce8b5f
|
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<yandex>
|
||||||
|
<logger>
|
||||||
|
<level>trace</level>
|
||||||
|
<log>/var/log/clickhouse-server/log.log</log>
|
||||||
|
<errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
|
||||||
|
<size>1000M</size>
|
||||||
|
<count>10</count>
|
||||||
|
<stderr>/var/log/clickhouse-server/stderr.log</stderr>
|
||||||
|
<stdout>/var/log/clickhouse-server/stdout.log</stdout>
|
||||||
|
</logger>
|
||||||
|
</yandex>
|
@ -42,6 +42,7 @@ def setup_module(module):
|
|||||||
dictionaries = []
|
dictionaries = []
|
||||||
main_configs = []
|
main_configs = []
|
||||||
main_configs.append(os.path.join('configs', 'disable_ssl_verification.xml'))
|
main_configs.append(os.path.join('configs', 'disable_ssl_verification.xml'))
|
||||||
|
main_configs.append(os.path.join('configs', 'log_conf.xml'))
|
||||||
|
|
||||||
for fname in os.listdir(DICT_CONFIG_PATH):
|
for fname in os.listdir(DICT_CONFIG_PATH):
|
||||||
dictionaries.append(os.path.join(DICT_CONFIG_PATH, fname))
|
dictionaries.append(os.path.join(DICT_CONFIG_PATH, fname))
|
||||||
|
11
tests/integration/test_grant_and_revoke/configs/log_conf.xml
Normal file
11
tests/integration/test_grant_and_revoke/configs/log_conf.xml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<yandex>
|
||||||
|
<logger>
|
||||||
|
<level>trace</level>
|
||||||
|
<log>/var/log/clickhouse-server/log.log</log>
|
||||||
|
<errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
|
||||||
|
<size>1000M</size>
|
||||||
|
<count>10</count>
|
||||||
|
<stderr>/var/log/clickhouse-server/stderr.log</stderr>
|
||||||
|
<stdout>/var/log/clickhouse-server/stdout.log</stdout>
|
||||||
|
</logger>
|
||||||
|
</yandex>
|
@ -3,7 +3,7 @@ from helpers.cluster import ClickHouseCluster
|
|||||||
from helpers.test_tools import TSV
|
from helpers.test_tools import TSV
|
||||||
|
|
||||||
cluster = ClickHouseCluster(__file__)
|
cluster = ClickHouseCluster(__file__)
|
||||||
instance = cluster.add_instance('instance')
|
instance = cluster.add_instance('instance', main_configs=['configs/log_conf.xml'])
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module", autouse=True)
|
@pytest.fixture(scope="module", autouse=True)
|
||||||
|
Loading…
Reference in New Issue
Block a user