database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.6 into 10.10

Browse Source 
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:
Marko Mäkelä
2023-10-13 15:14:37 +03:00
committed by Monty
parent 3b38c2f358 8bf17c579b
commit d5e15424d8
436 changed files with 13299 additions and 28179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/sql_type.h
View File

@ -124,6 +124,40 @@ enum scalar_comparison_op
};
/*
This enum is intentionally defined as "class" to disallow its implicit
cast as "bool". This is needed to avoid pre-MDEV-32203 constructs like:
if (field->can_optimize_range(...))
do_optimization();
to merge automatically as such - that would change the meaning
to the opposite. The pre-MDEV-32203 code must to be changed to:
if (field->can_optimize_range(...) == Data_type_compatibility::OK)
do_optimization();
*/
enum class Data_type_compatibility
{
OK,
INCOMPATIBLE_DATA_TYPE,
INCOMPATIBLE_COLLATION
};
static inline const LEX_CSTRING
scalar_comparison_op_to_lex_cstring(scalar_comparison_op op)
{
switch (op) {
case SCALAR_CMP_EQ: return LEX_CSTRING{STRING_WITH_LEN("=")};
case SCALAR_CMP_EQUAL: return LEX_CSTRING{STRING_WITH_LEN("<=>")};
case SCALAR_CMP_LT: return LEX_CSTRING{STRING_WITH_LEN("<")};
case SCALAR_CMP_LE: return LEX_CSTRING{STRING_WITH_LEN("<=")};
case SCALAR_CMP_GE: return LEX_CSTRING{STRING_WITH_LEN(">")};
case SCALAR_CMP_GT: return LEX_CSTRING{STRING_WITH_LEN(">=")};
}
DBUG_ASSERT(0);
return LEX_CSTRING{STRING_WITH_LEN("<?>")};
}
class Hasher
{
ulong m_nr1;