database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source 
In main.index_merge_myisam we remove the test that was added in
commit a2d24def8c because
it duplicates the test case that was added in
commit 5af12e4635.
This commit is contained in:
Marko Mäkelä
2020-04-16 12:12:26 +03:00
parent 5679a2b6b3 6577a7a8f2
commit af91266498
140 changed files with 2531 additions and 1372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/main/mysqld--help.result
View File

@@ -1314,10 +1314,10 @@ The following specify which files/extra groups are read (specified before remain
application layer.If set to 0, system dependent default
is used. (Automatically configured unless set explicitly)
--tcp-keepalive-time=#
Timeout, in milliseconds, with no activity until the
first TCP keep-alive packet is sent.If set to 0, system
dependent default is used. (Automatically configured
unless set explicitly)
Timeout, in seconds, with no activity until the first TCP
keep-alive packet is sent.If set to 0, system dependent
default is used. (Automatically configured unless set
explicitly)
--tcp-nodelay Set option TCP_NODELAY (disable Nagle's algorithm) on
socket
(Defaults to on; use --skip-tcp-nodelay to disable.)