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

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-27 18:26:21 +03:00
parent 19283c67c6 30914389fe
commit 742e1c727f
324 changed files with 19222 additions and 8205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_type.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2015, 2021, MariaDB
Copyright (c) 2015, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -1959,6 +1959,9 @@ Type_collection_std::aggregate_for_comparison(const Type_handler *ha,
return ha;
}
}
if ((a == INT_RESULT && b == STRING_RESULT) ||
(b == INT_RESULT && a == STRING_RESULT))
return &type_handler_newdecimal;
if ((a == INT_RESULT || a == DECIMAL_RESULT) &&
(b == INT_RESULT || b == DECIMAL_RESULT))
return &type_handler_newdecimal;