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 branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-07-27 11:02:57 +02:00
parent 9a897335eb bd935a4106
commit 3bb36e9495
267 changed files with 17524 additions and 7380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_type.cc
View File

@ -1711,6 +1711,11 @@ Type_handler_hybrid_field_type::aggregate_for_comparison(const Type_handler *h)
m_type_handler= &type_handler_datetime;
}
}
else if ((a == INT_RESULT && b == STRING_RESULT) ||
(b == INT_RESULT && a == STRING_RESULT))
{
m_type_handler= &type_handler_newdecimal;
}
else if ((a == INT_RESULT || a == DECIMAL_RESULT) &&
(b == INT_RESULT || b == DECIMAL_RESULT))
{