Bug#29492113 TABLE NOT ACCESSIBLE AFTER MOVING THE IBD FILE, WHEN THE

Rahul Agarkar · Rahul Agarkar · commit c1315d016944 · 2019-04-18T15:23:54.000+05:30
DATABASE NAME HAS "/"

The problems happen because of incorrect parsing of dbname and tablename
if they have a "/" in their names. The server considers them as
directory separator and not part of the name itself.

This leads to situations where incorrect strings are considered as
dbname or filename leading to multiple issues.

Solution:
The dbname and filename are correctly parsed when converted to the
filesystem charset. However, in some cases, the name strings were
in the tablespace charset leading to the problems. The solution is to
use these names consistently in filesystem charset and convert them to
the tablespace charset as and when needed.

RB# 21921
Reviewer: Kevin Lewis (kevin.lewis@oracle.com)
diff --git a/mysql-test/suite/innodb/r/innodb_tablespace.result b/mysql-test/suite/innodb/r/innodb_tablespace.result
@@ -635,3 +635,94 @@ FLUSH TABLES t1 FOR EXPORT;
 ERROR HY000: Tablespace has been discarded for table 't1'
 UNLOCK TABLES;
 DROP TABLE t1;
+#
+# Bug#29492113 TABLE NOT ACCESSIBLE AFTER MOVING THE IBD FILE,
+# WHEN THE DATABASE NAME HAS "/"
+#
+#
+# Scenario-1
+# create database `abc/def`
+# create table `abc/def`.`xyz/123` in MYSQL_TMP_DIR/my_dir1
+# The directory structure after creating the table should be
+# MYSQL_TMP_DIR/my_dir1/abc@002fdef/xyz@002f123.ibd
+#
+CREATE DATABASE `abc/def`;
+CREATE TABLE `abc/def`.`xyz/123` (c1 INT) DATA DIRECTORY 'MYSQL_TMP_DIR/my_dir1';
+SHOW WARNINGS;
+Level	Code	Message
+#
+# Validate the directory structure
+#
+abc@002fdef
+xyz@002f123.ibd
+INSERT INTO `abc/def`.`xyz/123` VALUES (1), (2), (3);
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+COUNT(*)
+3
+SELECT file_name, tablespace_name FROM information_schema.files WHERE file_name LIKE '%123%';
+FILE_NAME	TABLESPACE_NAME
+MYSQL_TMP_DIR/my_dir1/abc@002fdef/xyz@002f123.ibd	abc/def/xyz/123
+SELECT name, space_type FROM information_schema.innodb_tablespaces WHERE name LIKE '%123%';
+name	space_type
+abc/def/xyz/123	Single
+#
+# Shutdown the server
+#
+#
+# Scenario-2
+# Move the IBD file from MYSQL_TMP_DIR/my_dir1 to MYSQL_TMP_DIR/my_dir2
+# Restart the server with --innodb_directories MYSQL_TMP_DIR/my_dir2
+# Query the table
+# Restart the server without --innodb_directories option
+#
+#
+# Move IBD file in MYSQL_TMP_DIR/my_dir1 to MYSQL_TMP_DIR/my_dir2
+#
+#
+# Resart server with --innodb_directories MYSQL_TMP_DIR/my_dir2
+#
+# restart: --innodb_directories=MYSQL_TMP_DIR/my_dir2
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+COUNT(*)
+3
+#
+# Restart server without --innodb_directories option
+#
+# restart:
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+COUNT(*)
+3
+SELECT file_name, tablespace_name FROM information_schema.files WHERE file_name LIKE '%123%';
+FILE_NAME	TABLESPACE_NAME
+MYSQL_TMP_DIR/my_dir2/abc@002fdef/xyz@002f123.ibd	abc/def/xyz/123
+SELECT name, space_type FROM information_schema.innodb_tablespaces WHERE name LIKE '%123%';
+name	space_type
+abc/def/xyz/123	Single
+#
+# Shutdown server
+#
+#
+# Scenario-3
+# Move the IBD file from MYSQL_TMP_DIR/my_dir2 to MYSQL_TMP_DIR/my_dir1
+# Restart the server with --innodb_directories MYSQL_TMP_DIR/my_dir1
+#
+#
+# Move IBD file from MYSQL_TMP_DIR/my_dir2 to MYSQL_TMP_DIR/my_dir1
+#
+#
+# Restart server with --innodb_directories MYSQL_TMP_DIR/my_dir1
+#
+# restart: --innodb_directories=MYSQL_TMP_DIR/my_dir1
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+COUNT(*)
+3
+SELECT file_name, tablespace_name FROM information_schema.files WHERE file_name LIKE '%123%';
+FILE_NAME	TABLESPACE_NAME
+MYSQL_TMP_DIR/my_dir1/abc@002fdef/xyz@002f123.ibd	abc/def/xyz/123
+SELECT name, space_type FROM information_schema.innodb_tablespaces WHERE name LIKE '%123%';
+name	space_type
+abc/def/xyz/123	Single
+#
+# Cleanup
+#
+DROP DATABASE `abc/def`;
diff --git a/mysql-test/suite/innodb/t/innodb_tablespace.test b/mysql-test/suite/innodb/t/innodb_tablespace.test
@@ -437,3 +437,114 @@ ALTER TABLE t1 DISCARD TABLESPACE;
 FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#29492113 TABLE NOT ACCESSIBLE AFTER MOVING THE IBD FILE,
+--echo # WHEN THE DATABASE NAME HAS "/"
+--echo #
+
+--echo #
+--echo # Scenario-1
+--echo # create database `abc/def`
+--echo # create table `abc/def`.`xyz/123` in MYSQL_TMP_DIR/my_dir1
+--echo # The directory structure after creating the table should be
+--echo # MYSQL_TMP_DIR/my_dir1/abc@002fdef/xyz@002f123.ibd
+--echo #
+
+CREATE DATABASE `abc/def`;
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE `abc/def`.`xyz/123` (c1 INT) DATA DIRECTORY '$MYSQL_TMP_DIR/my_dir1';
+SHOW WARNINGS;
+
+--echo #
+--echo # Validate the directory structure
+--echo #
+--list_files $MYSQL_TMP_DIR/my_dir1 *
+--list_files $MYSQL_TMP_DIR/my_dir1/abc@002fdef *
+
+INSERT INTO `abc/def`.`xyz/123` VALUES (1), (2), (3);
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SELECT file_name, tablespace_name FROM information_schema.files WHERE file_name LIKE '%123%';
+SELECT name, space_type FROM information_schema.innodb_tablespaces WHERE name LIKE '%123%';
+
+--echo #
+--echo # Shutdown the server
+--echo #
+--source include/shutdown_mysqld.inc
+
+--echo #
+--echo # Scenario-2
+--echo # Move the IBD file from MYSQL_TMP_DIR/my_dir1 to MYSQL_TMP_DIR/my_dir2
+--echo # Restart the server with --innodb_directories MYSQL_TMP_DIR/my_dir2
+--echo # Query the table
+--echo # Restart the server without --innodb_directories option
+--echo #
+
+--echo #
+--echo # Move IBD file in MYSQL_TMP_DIR/my_dir1 to MYSQL_TMP_DIR/my_dir2
+--echo #
+--mkdir $MYSQL_TMP_DIR/my_dir2
+--mkdir $MYSQL_TMP_DIR/my_dir2/abc@002fdef
+--copy_files_wildcard $MYSQL_TMP_DIR/my_dir1/abc@002fdef/ $MYSQL_TMP_DIR/my_dir2/abc@002fdef/ *
+--remove_files_wildcard $MYSQL_TMP_DIR/my_dir1/abc@002fdef/ *
+
+--echo #
+--echo # Resart server with --innodb_directories MYSQL_TMP_DIR/my_dir2
+--echo #
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--let $restart_parameters = "restart: --innodb_directories=$MYSQL_TMP_DIR/my_dir2"
+--source include/start_mysqld.inc
+
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+
+--echo #
+--echo # Restart server without --innodb_directories option
+--echo #
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--let $restart_parameters = "restart:"
+--source include/restart_mysqld.inc
+
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SELECT file_name, tablespace_name FROM information_schema.files WHERE file_name LIKE '%123%';
+SELECT name, space_type FROM information_schema.innodb_tablespaces WHERE name LIKE '%123%';
+
+--echo #
+--echo # Shutdown server
+--echo #
+--source include/shutdown_mysqld.inc
+
+--echo #
+--echo # Scenario-3
+--echo # Move the IBD file from MYSQL_TMP_DIR/my_dir2 to MYSQL_TMP_DIR/my_dir1
+--echo # Restart the server with --innodb_directories MYSQL_TMP_DIR/my_dir1
+--echo #
+
+--echo #
+--echo # Move IBD file from MYSQL_TMP_DIR/my_dir2 to MYSQL_TMP_DIR/my_dir1
+--echo #
+--copy_files_wildcard $MYSQL_TMP_DIR/my_dir2/abc@002fdef/ $MYSQL_TMP_DIR/my_dir1/abc@002fdef/ *
+--force-rmdir $MYSQL_TMP_DIR/my_dir2
+
+--echo #
+--echo # Restart server with --innodb_directories MYSQL_TMP_DIR/my_dir1
+--echo #
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--let $restart_parameters="restart: --innodb_directories=$MYSQL_TMP_DIR/my_dir1"
+--source include/start_mysqld.inc
+
+SELECT COUNT(*) FROM `abc/def`.`xyz/123`;
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SELECT file_name, tablespace_name FROM information_schema.files WHERE file_name LIKE '%123%';
+SELECT name, space_type FROM information_schema.innodb_tablespaces WHERE name LIKE '%123%';
+
+--echo #
+--echo # Cleanup
+--echo #
+DROP DATABASE `abc/def`;
+--force-rmdir $MYSQL_TMP_DIR/my_dir1
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -6517,23 +6517,30 @@ bool prepare_index_and_data_dir_path(THD *thd, const char **data_file_name,
 
 int append_file_to_dir(THD *thd, const char **filename_ptr,
                        const char *table_name) {
-  char buff[FN_REFLEN], *ptr, *end;
+  char tbbuff[FN_REFLEN];
+  char buff[FN_REFLEN];
+  char *ptr;
+  char *end;
+
   if (!*filename_ptr) return 0;  // nothing to do
 
+  /* Convert tablename to filename charset so that "/" gets converted
+  appropriately */
+  size_t tab_len = tablename_to_filename(table_name, tbbuff, sizeof(tbbuff));
+
   /* Check that the filename is not too long and it's a hard path */
-  if (strlen(*filename_ptr) + strlen(table_name) >= FN_REFLEN - 1)
-    return ER_PATH_LENGTH;
+  if (strlen(*filename_ptr) + tab_len >= FN_REFLEN - 1) return ER_PATH_LENGTH;
 
   if (!test_if_hard_path(*filename_ptr)) return ER_WRONG_VALUE;
 
   /* Fix is using unix filename format on dos */
   my_stpcpy(buff, *filename_ptr);
   end = convert_dirname(buff, *filename_ptr, NullS);
-  if (!(ptr =
-            (char *)thd->alloc((size_t)(end - buff) + strlen(table_name) + 1)))
-    return ER_OUTOFMEMORY;  // End of memory
+
+  ptr = (char *)thd->alloc((size_t)(end - buff) + tab_len + 1);
+  if (ptr == nullptr) return ER_OUTOFMEMORY;  // End of memory
   *filename_ptr = ptr;
-  strxmov(ptr, buff, table_name, NullS);
+  strxmov(ptr, buff, tbbuff, NullS);
   return 0;
 }
 
diff --git a/storage/innobase/dict/dict0dd.cc b/storage/innobase/dict/dict0dd.cc
@@ -3790,7 +3790,7 @@ void dd_load_tablespace(const Table *dd_table, dict_table_t *table,
     is in the DD even if the datafile was moved. So let's use
     that path to open this tablespace. */
     mutex_exit(&dict_sys->mutex);
-    char *filepath = dd_get_first_path(heap, table, dd_table);
+    filepath = dd_get_first_path(heap, table, dd_table);
     mutex_enter(&dict_sys->mutex);
 
     if (filepath == nullptr) {
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
