mirror of
https://github.com/MariaDB/server.git
synced 2026-04-18 06:15:32 +02:00
Merge 10.6 into 10.10
The MDEV-29693 conflict resolution is from Monty, as well as is
a bug fix where ANALYZE TABLE wrongly built histograms for
single-column PRIMARY KEY.
Also includes a fix for safe_malloc error reporting.
Other things:
- Copied main.log_slow from 10.4 to avoid mtr issue
Disabled test:
- spider/bugfix.mdev_27239 because we started to get
+Error 1429 Unable to connect to foreign data source: localhost
-Error 1158 Got an error reading communication packets
- main.delayed
- Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
This part is disabled for now as it fails randomly with different
warnings/errors (no corruption).
This commit is contained in:
commit
d5e15424d8
436 changed files with 13197 additions and 28077 deletions
|
|
@ -126,8 +126,10 @@ get_make_parallel_flag
|
|||
# SSL library to use.--with-ssl will select our bundled yaSSL
|
||||
# implementation of SSL. --with-ssl=yes will first try system library
|
||||
# then the bundled one --with-ssl=system will use the system library.
|
||||
# We use bundled by default as this is guaranteed to work with Galera
|
||||
SSL_LIBRARY=--with-ssl
|
||||
# We normally use bundled by default as this is guaranteed to work with Galera
|
||||
# However as bundled gives problem on SuSE with tls_version1.test, system
|
||||
# is used
|
||||
SSL_LIBRARY=--with-ssl=system
|
||||
|
||||
if [ "x$warning_mode" = "xpedantic" ]; then
|
||||
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue