diff options
| author | Monty <monty@mariadb.org> | 2022-11-25 15:25:44 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2022-12-20 23:11:29 +0200 |
| commit | d428b1ca77f6ee4af8294d16243d360e51f8b1ff (patch) | |
| tree | 67c4ebe61bd6834ccdc44405067915d420adf44f | |
| parent | ed84b4553113a64cfe1495bcf5541d77dfb52582 (diff) | |
| download | mariadb-git-d428b1ca77f6ee4af8294d16243d360e51f8b1ff.tar.gz | |
Do not give warnings about #rocksdb directory information_schema
"select * from information_schema.tables limit 1" was giving the following
warning in the log:
[ERROR] Invalid (old?) table or database name '#rocksdb'
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/table.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index baee5681052..5ca2c148e46 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6562,7 +6562,7 @@ bool Discovered_table_list::add_file(const char *fname) { bool is_temp= strncmp(fname, STRING_WITH_LEN(tmp_file_prefix)) == 0; - if (is_temp && !with_temps) + if ((is_temp && !with_temps) || !strncmp(fname,STRING_WITH_LEN(ROCKSDB_DIRECTORY_NAME))) return 0; char tname[SAFE_NAME_LEN + 1]; diff --git a/sql/table.h b/sql/table.h index f2bf74b8ed8..cb112846a43 100644 --- a/sql/table.h +++ b/sql/table.h @@ -92,6 +92,7 @@ typedef ulonglong nested_join_map; #define tmp_file_prefix "#sql" /**< Prefix for tmp tables */ #define tmp_file_prefix_length 4 #define TMP_TABLE_KEY_EXTRA 8 +#define ROCKSDB_DIRECTORY_NAME "#rocksdb" /** Enumerate possible types of a table from re-execution |