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

MariaDB · Oct 9, 2016 · 3af9986 · 3af9986
1 parent a06faac
commit 3af9986
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc
@@ -3128,7 +3128,7 @@ bool Rdb_validate_tbls::scan_for_frms(
 
   /* Scan through the files in the directory */
   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 '#') */
     const char* ext = strrchr(file_info->name, '.');
@@ -3179,7 +3179,7 @@ bool Rdb_validate_tbls::compare_to_actual_tables(
   }
 
   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 '.' */
     if (file_info->name[0] == '.')

diff --git a/storage/rocksdb/rdb_sst_info.cc b/storage/rocksdb/rdb_sst_info.cc
@@ -398,7 +398,7 @@ void Rdb_sst_info::init(rocksdb::DB* db)
 
   // Scan through the files in the directory
   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 ...
     std::string name= file_info->name;