bk commit into 5.1 tree (bar:1.2370)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar 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.2370 06/04/19 09:50:17 bar@stripped +3 -0
  Merge abarkov@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1

  mysys/my_access.c
    1.9 06/04/19 09:49:40 bar@stripped +0 -0
    SCCS merged

  sql/sql_table.cc
    1.326 06/04/19 09:22:27 bar@stripped +0 -0
    Auto merged

  include/my_sys.h
    1.190 06/04/19 09:22:27 bar@stripped +0 -0
    Auto merged

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new.b17870v1/RESYNC

--- 1.189/include/my_sys.h	2006-04-04 12:59:13 +05:00
+++ 1.190/include/my_sys.h	2006-04-19 09:22:27 +05:00
@@ -608,6 +608,7 @@ extern File my_sopen(const char *path, i
 #define my_access access
 #endif
 extern int check_if_legal_filename(const char *path);
+extern int check_if_legal_tablename(const char *path);
 
 #ifndef TERMINATE
 extern void TERMINATE(FILE *file);

--- 1.325/sql/sql_table.cc	2006-04-16 06:17:26 +05:00
+++ 1.326/sql/sql_table.cc	2006-04-19 09:22:27 +05:00
@@ -72,12 +72,19 @@ uint filename_to_tablename(const char *f
 
 uint tablename_to_filename(const char *from, char *to, uint to_length)
 {
-  uint errors;
+  uint errors, length;
   if (from[0] == '#' && !strncmp(from, MYSQL50_TABLE_NAME_PREFIX,
                                  MYSQL50_TABLE_NAME_PREFIX_LENGTH))
     return my_snprintf(to, to_length, "%s", from + 9);
-  return strconvert(system_charset_info, from,
-                    &my_charset_filename, to, to_length, &errors);
+  length= strconvert(system_charset_info, from,
+                     &my_charset_filename, to, to_length, &errors);
+  if (check_if_legal_tablename(to) &&
+      length + 4 < to_length)
+  {
+    memcpy(to + length, "@@@", 4);
+    length+= 3;
+  }
+  return length;
 }
 
 

--- 1.8/mysys/my_access.c	2006-04-11 18:16:03 +05:00
+++ 1.9/mysys/my_access.c	2006-04-19 09:49:40 +05:00
@@ -54,6 +54,7 @@ int my_access(const char *path, int amod
 
 #endif /* __WIN__ */
 
+#if defined(MSDOS) || defined(__WIN__)
 
 /*
   List of file names that causes problem on windows
@@ -199,11 +200,3 @@ int check_if_legal_filename(const char *
   DBUG_RETURN(0);
 }
 #endif
-
-
-#ifdef OS2
-int check_if_legal_filename(const char *path)
-{
-  return 0;
-}
-#endif /* OS2 */