merging with mysql-5.1-bugteam

storage/ibmdb2i/db2i_misc.h

@@ -92,11 +92,17 @@ bool convertMySQLNameToDB2Name(const char* input,
   return (o <= outlen-1);
 }
 
-bool isUpperOrQuote(const CHARSET_INFO* cs, const char* s)
+bool isOrdinaryIdentifier(const char* s)
 {
   while (*s)
   {
-    if (my_isupper(cs, *s) || (*s == '"'))
+    if (my_isupper(system_charset_info, *s) ||
+        my_isdigit(system_charset_info, *s) ||
+        (*s == '_') ||
+        (*s == '@') ||
+        (*s == '$') ||
+        (*s == '#') ||
+        (*s == '"'))
       ++s;
     else
       return false;

storage/ibmdb2i/ha_ibmdb2i.cc

@@ -2122,7 +2122,7 @@ int ha_ibmdb2i::create(const char *name, TABLE *table_arg,
   if (osVersion.v < 6)
   {
     if (strlen(libName) > 
-         MAX_DB2_V5R4_LIBNAME_LENGTH + (isUpperOrQuote(system_charset_info, libName) ? 2 : 0))
+         MAX_DB2_V5R4_LIBNAME_LENGTH + (isOrdinaryIdentifier(libName) ? 2 : 0))
     {
       getErrTxt(DB2I_ERR_TOO_LONG_SCHEMA,libName, MAX_DB2_V5R4_LIBNAME_LENGTH);
       DBUG_RETURN(DB2I_ERR_TOO_LONG_SCHEMA);