System Versioning pre0.12

Merge remote-tracking branch 'origin/archive/2017-10-17' into 10.3

1 files changed, 64 insertions, 0 deletions

diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
index 93a3007d1ea..b07ec0b418c 100644
--- a/sql/sql_tablespace.cc
+++ b/sql/sql_tablespace.cc
@@ -22,6 +22,70 @@
 #include "sql_table.h"                          // write_bin_log
 #include "sql_class.h"                          // THD
 
+/**
+  Check if tablespace name is valid
+
+  @param tablespace_name        Name of the tablespace
+
+  @note Tablespace names are not reflected in the file system, so
+        character case conversion or consideration is not relevant.
+
+  @note Checking for path characters or ending space is not done.
+        The only checks are for identifier length, both in terms of
+        number of characters and number of bytes.
+
+  @retval  IDENT_NAME_OK        Identifier name is ok (Success)
+  @retval  IDENT_NAME_WRONG     Identifier name is wrong, if length == 0
+*                               (ER_WRONG_TABLESPACE_NAME)
+  @retval  IDENT_NAME_TOO_LONG  Identifier name is too long if it is greater
+                                than 64 characters (ER_TOO_LONG_IDENT)
+
+  @note In case of IDENT_NAME_TOO_LONG or IDENT_NAME_WRONG, the function
+        reports an error (using my_error()).
+*/
+
+enum_ident_name_check check_tablespace_name(const char *tablespace_name)
+{
+  size_t name_length= 0;                       //< Length as number of bytes
+  size_t name_length_symbols= 0;               //< Length as number of symbols
+
+  // Name must be != NULL and length must be > 0
+  if (!tablespace_name || (name_length= strlen(tablespace_name)) == 0)
+  {
+    my_error(ER_WRONG_TABLESPACE_NAME, MYF(0), tablespace_name);
+    return IDENT_NAME_WRONG;
+  }
+
+  // If we do not have too many bytes, we must check the number of symbols,
+  // provided the system character set may use more than one byte per symbol.
+  if (name_length <= NAME_LEN && use_mb(system_charset_info))
+  {
+    const char *name= tablespace_name;   //< The actual tablespace name
+    const char *end= name + name_length; //< Pointer to first byte after name
+
+    // Loop over all symbols as long as we don't have too many already
+    while (name != end && name_length_symbols <= NAME_CHAR_LEN)
+    {
+      int len= my_ismbchar(system_charset_info, name, end);
+      if (len)
+        name += len;
+      else
+        name++;
+
+      name_length_symbols++;
+    }
+  }
+
+  if (name_length_symbols > NAME_CHAR_LEN || name_length > NAME_LEN)
+  {
+    my_error(ER_TOO_LONG_IDENT, MYF(0), tablespace_name);
+    return IDENT_NAME_TOO_LONG;
+  }
+
+  return IDENT_NAME_OK;
+}
+
+
 int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
 {
   int error= HA_ADMIN_NOT_IMPLEMENTED;