1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

Browse Source
This commit is contained in:
serg@serg.mysql.com 2001-03-24 16:21:41 +01:00
commit faa63c5013
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BitKeeper/etc/logging_ok
View File

@ -1 +1,6 @@
heikki@donna.mysql.fi
jani@hynda.mysql.fi
monty@donna.mysql.fi
paul@central.snake.net
sasha@mysql.sashanet.com
serg@serg.mysql.com

2
Docs/manual.texi
View File

@ -13744,7 +13744,7 @@ in ANSI mode. @xref{ANSI mode}.
@multitable @columnfractions .15 .15 .70
@item @strong{Identifier} @tab @strong{Max length} @tab @strong{Allowed characters}
@item Database @tab 64 @tab Any character that is allowed in a directory name except @samp{/}.
@item Database @tab 64 @tab Any character that is allowed in a directory name except @samp{/} or @samp{.}.
@item Table @tab 64 @tab Any character that is allowed in a file name, except @samp{/} or @samp{.}.
@item Column @tab 64 @tab All characters.
@item Alias @tab 255 @tab All characters.

3
sql/sql_db.cc
View File

@ -264,9 +264,10 @@ bool mysql_change_db(THD *thd,const char *name)
send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: inspected */
DBUG_RETURN(1); /* purecov: inspected */
}
if (length > NAME_LEN)
if ((length > NAME_LEN) || check_db_name(dbname))
{
net_printf(&thd->net,ER_WRONG_DB_NAME, dbname);
x_free(dbname);
DBUG_RETURN(1);
}
DBUG_PRINT("general",("Use database: %s", dbname));

2
sql/table.cc
View File

@ -1052,7 +1052,7 @@ bool check_db_name(const char *name)
}
}
#endif
if (*name == '/' || *name == FN_LIBCHAR)
if (*name == '/' || *name == FN_LIBCHAR || *name == FN_EXTCHAR)
return 1;
name++;
}