Commit 3af99862 authored by Sergei Petrunia's avatar Sergei Petrunia

MariaRocks port: dir_entry has number_of_files with one 'f' in MariaDB

parent a06faac2
...@@ -3128,7 +3128,7 @@ bool Rdb_validate_tbls::scan_for_frms( ...@@ -3128,7 +3128,7 @@ bool Rdb_validate_tbls::scan_for_frms(
/* Scan through the files in the directory */ /* Scan through the files in the directory */
struct fileinfo* file_info = dir_info->dir_entry; struct fileinfo* file_info = dir_info->dir_entry;
for (uint ii = 0; ii < dir_info->number_off_files; ii++, file_info++) for (uint ii = 0; ii < dir_info->number_of_files; ii++, file_info++)
{ {
/* Find .frm files that are not temp files (those that start with '#') */ /* Find .frm files that are not temp files (those that start with '#') */
const char* ext = strrchr(file_info->name, '.'); const char* ext = strrchr(file_info->name, '.');
...@@ -3179,7 +3179,7 @@ bool Rdb_validate_tbls::compare_to_actual_tables( ...@@ -3179,7 +3179,7 @@ bool Rdb_validate_tbls::compare_to_actual_tables(
} }
file_info = dir_info->dir_entry; file_info = dir_info->dir_entry;
for (uint ii = 0; ii < dir_info->number_off_files; ii++, file_info++) for (uint ii = 0; ii < dir_info->number_of_files; ii++, file_info++)
{ {
/* Ignore files/dirs starting with '.' */ /* Ignore files/dirs starting with '.' */
if (file_info->name[0] == '.') if (file_info->name[0] == '.')
......
...@@ -398,7 +398,7 @@ void Rdb_sst_info::init(rocksdb::DB* db) ...@@ -398,7 +398,7 @@ void Rdb_sst_info::init(rocksdb::DB* db)
// Scan through the files in the directory // Scan through the files in the directory
struct fileinfo* file_info= dir_info->dir_entry; struct fileinfo* file_info= dir_info->dir_entry;
for (uint ii= 0; ii < dir_info->number_off_files; ii++, file_info++) for (uint ii= 0; ii < dir_info->number_of_files; ii++, file_info++)
{ {
// find any files ending with m_suffix ... // find any files ending with m_suffix ...
std::string name= file_info->name; std::string name= file_info->name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment