database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0
This commit is contained in:
vva@eagle.mysql.r18.ru
2004-03-12 17:56:27 +04:00
parent 91a8546112 131fd37cef
commit 158770e356
5 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@@ -1133,8 +1133,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
statistic_increment(com_stat[SQLCOM_CREATE_DB],&LOCK_status);
// null test to handle EOM
if (!db || !strip_sp(db) || !(alias= thd->strdup(db)) ||
check_db_name(db))
if (!db || !(alias= thd->strdup(db)) || check_db_name(db))
{
net_printf(&thd->net,ER_WRONG_DB_NAME, db ? db : "NULL");
break;
@@ -1150,8 +1149,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
statistic_increment(com_stat[SQLCOM_DROP_DB],&LOCK_status);
char *db=thd->strdup(packet), *alias;
// null test to handle EOM
if (!db || !strip_sp(db) || !(alias= thd->strdup(db)) ||
check_db_name(db))
if (!db || !(alias= thd->strdup(db)) || check_db_name(db))
{
net_printf(&thd->net,ER_WRONG_DB_NAME, db ? db : "NULL");
break;
@@ -2332,8 +2330,7 @@ mysql_execute_command(void)
case SQLCOM_CREATE_DB:
{
char *alias;
if (!strip_sp(lex->name) || !(alias=thd->strdup(lex->name)) ||
check_db_name(lex->name))
if (!(alias=thd->strdup(lex->name)) || check_db_name(lex->name))
{
net_printf(&thd->net,ER_WRONG_DB_NAME, lex->name);
break;
@@ -2362,8 +2359,7 @@ mysql_execute_command(void)
case SQLCOM_DROP_DB:
{
char *alias;
if (!strip_sp(lex->name) || !(alias=thd->strdup(lex->name)) ||
check_db_name(lex->name))
if (!(alias=thd->strdup(lex->name)) || check_db_name(lex->name))
{
net_printf(&thd->net,ER_WRONG_DB_NAME, lex->name);
break;