Marko Mäkelä d5e15424d8 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).		2023-10-14 13:36:11 +03:00
..
examples	MDEV-21303 Make executables MariaDB named	2020-03-21 20:20:29 +01:00
client_settings.h	Merge 10.1 into 10.2	2019-05-13 17:54:04 +03:00
CMakeLists.txt	Merge branch '10.8' into 10.9	2022-10-17 12:39:25 +02:00
emb_qcache.cc	MDEV-19275 Provide SQL service to plugins.	2020-08-14 21:04:25 +04:00
emb_qcache.h	MDEV-19275 Provide SQL service to plugins.	2020-08-14 21:04:25 +04:00
embedded_priv.h	fix query cache in embedded	2022-01-30 13:56:22 +01:00
lib_sql.cc	Merge 10.6 into 10.10	2023-10-14 13:36:11 +03:00
libmysql.c	Merge 10.5 into 10.6	2023-04-11 16:15:19 +03:00
libmysqld.c	Merge branch '10.5' into 10.6	2023-08-01 15:08:52 +02:00
libmysqld.def	merge with 5.3	2011-10-19 21:45:18 +02:00
libmysqld.rc
resource.h