157 Commits

Author	SHA1	Message	Date
Alexander Tokmakov	5e6d4b9449	Merge branch 'master' into database_atomic	2020-04-12 16:35:44 +03:00
Alexander Kazakov	497df3086f	Merge branch 'master' into timed_rwlock ... Change-Id: I620bfde2121ff013773b001d514b40b1e796a58b	2020-04-10 11:38:20 +03:00
Alexander Kazakov	26dd6140b2	Added new config settings to control timeouts ... * "lock_acquire_timeout" controls for how long a query will continue to acquire each lock on its argument tables * "lock_acquire_timeout_for_background_operations" is a per-table setting for storages of *MergeTree family	2020-04-09 21:10:27 +03:00
Alexander Tokmakov	dd1590830b	Merge branch 'master' into database_atomic	2020-04-08 22:00:46 +03:00
Alexander Tokmakov	08bae4668d	Merge branch 'master' into database_atomic	2020-04-06 16:18:07 +03:00
alesapin	1cb072d58a	Merge branch 'master' into alter_rename_column	2020-04-06 11:40:27 +03:00
Ivan Lezhankin	06446b4f08	dbms/ → src/	2020-04-03 18:14:31 +03:00