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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-18 11:30:06 +03:00
parent 44d06cd39d e85e4814ee
commit 3c88ce4cd1
161 changed files with 3394 additions and 2875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_show.cc
View File

@ -6048,9 +6048,15 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
else if (field->flags & VERS_SYSTEM_FIELD)
{
if (field->flags & VERS_SYS_START_FLAG)
{
table->field[21]->store(STRING_WITH_LEN("ROW START"), cs);
buf.set(STRING_WITH_LEN("STORED GENERATED"), cs);
}
else
{
table->field[21]->store(STRING_WITH_LEN("ROW END"), cs);
buf.set(STRING_WITH_LEN("STORED GENERATED"), cs);
}
table->field[21]->set_notnull();
table->field[20]->store(STRING_WITH_LEN("ALWAYS"), cs);
}