MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Ignacio Galarza Date:June 23 2006 4:15pm
Subject:bk commit into 5.0 tree (iggy:1.2206) BUG#20616
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2206 06/06/23 12:15:39 iggy@stripped +2 -0
  Bug#20616: drop_temp_table test fails on Windows platform

  sql/table.cc
    1.222 06/06/23 12:15:34 iggy@stripped +0 -8
    Removed the check for FN_DEVCHAR is done at this level because it prevents Windows from creating any table with FN_DEVCHAR in the name.

  sql/sql_table.cc
    1.314 06/06/23 12:15:34 iggy@stripped +16 -1
    Check for FN_DEVCHAR in the table name just before file creation. This allows for temporary tables to contain FN_DEVCHAR in the name.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-5.0-maint_bug20616

--- 1.313/sql/sql_table.cc	2006-06-01 09:08:51 -04:00
+++ 1.314/sql/sql_table.cc	2006-06-23 12:15:34 -04:00
@@ -1656,8 +1656,23 @@ bool mysql_create_table(THD *thd,const c
       my_casedn_str(files_charset_info, path);
     create_info->table_options|=HA_CREATE_DELAY_KEY_WRITE;
   }
-  else
+  else  
+  {
+	#ifdef FN_DEVCHAR
+	  /* check if the table name contains FN_DEVCHAR when defined */
+	  const char *start= alias;
+	  while (*start != '\0')
+	  {
+		  if (*start == FN_DEVCHAR)
+		  {
+			  my_error(ER_WRONG_TABLE_NAME, MYF(0), alias);
+			  DBUG_RETURN(TRUE);
+		  }
+		  start++;
+	  }	  
+	#endif
     build_table_path(path, sizeof(path), db, alias, reg_ext);
+  }
 
   /* Check if table already exists */
   if ((create_info->options & HA_LEX_CREATE_TMP_TABLE)

--- 1.221/sql/table.cc	2006-06-02 15:31:44 -04:00
+++ 1.222/sql/table.cc	2006-06-23 12:15:34 -04:00
@@ -1614,10 +1614,6 @@ bool check_db_name(char *name)
     if (*name == '/' || *name == '\\' || *name == FN_LIBCHAR ||
 	*name == FN_EXTCHAR)
       return 1;
-#ifdef FN_DEVCHAR
-    if (*name == FN_DEVCHAR)
-      return 1;
-#endif
     name++;
   }
   return last_char_is_space || (uint) (name - start) > NAME_LEN;
@@ -1660,10 +1656,6 @@ bool check_table_name(const char *name, 
 #endif
     if (*name == '/' || *name == '\\' || *name == FN_EXTCHAR)
       return 1;
-#ifdef FN_DEVCHAR
-    if (*name == FN_DEVCHAR)
-      return 1;
-#endif
     name++;
   }
 #if defined(USE_MB) && defined(USE_MB_IDENT)
Thread
bk commit into 5.0 tree (iggy:1.2206) BUG#20616Ignacio Galarza23 Jun