diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
commit | a736a3174a4e7c0d92a38901ae61f563d4afede7 (patch) | |
tree | 348d15f7c9cc883e86d852fbddc780f506669ee4 /sql/sql_lex.cc | |
parent | b44e12fef176bfc0884fb2c5f4ba7f42bf054f44 (diff) | |
parent | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (diff) | |
download | mariadb-git-a736a3174a4e7c0d92a38901ae61f563d4afede7.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index c6db441220e..93002677fbd 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -8924,7 +8924,7 @@ bool LEX::last_field_generated_always_as_row_start() Vers_parse_info &info= vers_get_info(); Lex_ident *p= &info.as_row.start; return last_field_generated_always_as_row_start_or_end(p, "START", - VERS_SYS_START_FLAG); + VERS_ROW_START); } @@ -8933,7 +8933,7 @@ bool LEX::last_field_generated_always_as_row_end() Vers_parse_info &info= vers_get_info(); Lex_ident *p= &info.as_row.end; return last_field_generated_always_as_row_start_or_end(p, "END", - VERS_SYS_END_FLAG); + VERS_ROW_END); } void st_select_lex_unit::reset_distinct() |