diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
| commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
| tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /sql/sql_show.cc | |
| parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
| parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
| download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz | |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a2a1c76411c..e8f8772ba2f 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2009, 2022, MariaDB + Copyright (c) 2009, 2023, 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 @@ -2452,7 +2452,7 @@ int show_create_table_ex(THD *thd, TABLE_LIST *table_list, add_table_options(thd, table, create_info_arg, table_list->schema_table != 0, 0, packet); - if (table->versioned()) + if (!DBUG_IF("sysvers_hide") && table->versioned()) packet->append(STRING_WITH_LEN(" WITH SYSTEM VERSIONING")); #ifdef WITH_PARTITION_STORAGE_ENGINE |