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

System Versioning pre0.12

Browse Source 
Merge remote-tracking branch 'origin/archive/2017-10-17' into 10.3
This commit is contained in:
Aleksey Midenkov
2017-11-07 00:37:49 +03:00
parent 835cbbcc7b ce66d5b2a5
commit d8d7251019
354 changed files with 20615 additions and 1638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_type.cc
View File

@ -658,7 +658,9 @@ Type_handler_hybrid_field_type::aggregate_for_comparison(const Type_handler *h)
Item_result a= cmp_type();
Item_result b= h->cmp_type();
if (a == STRING_RESULT && b == STRING_RESULT)
if (m_vers_trx_id && (a == STRING_RESULT || b == STRING_RESULT))
m_type_handler= &type_handler_datetime;
else if (a == STRING_RESULT && b == STRING_RESULT)
m_type_handler= &type_handler_long_blob;
else if (a == INT_RESULT && b == INT_RESULT)
m_type_handler= &type_handler_longlong;