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.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-13 12:03:32 +03:00
parent b44e12fef1 4a7dfda373
commit a736a3174a
54 changed files with 754 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_type.cc
View File

@ -7776,7 +7776,7 @@ Field *Type_handler_longlong::
const Column_definition_attributes *attr,
uint32 flags) const
{
if (flags & (VERS_SYS_START_FLAG|VERS_SYS_END_FLAG))
if (flags & (VERS_ROW_START|VERS_ROW_END))
return new (mem_root)
Field_vers_trx_id(rec.ptr(), (uint32) attr->length,
rec.null_ptr(), rec.null_bit(),