database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with global tree

Browse Source
This commit is contained in:
monty@mysql.com
2005-02-25 17:12:06 +02:00
parent fe2a800423 0a6b7aedb2
commit 7e5f74f8f2
65 changed files with 233 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@ -622,7 +622,6 @@ bool is_update_query(enum enum_sql_command command)
static void time_out_user_resource_limits(THD *thd, USER_CONN *uc)
{
bool error= 0;
time_t check_time = thd->start_time ? thd->start_time : time(NULL);
DBUG_ENTER("time_out_user_resource_limits");
@ -1330,7 +1329,6 @@ int end_trans(THD *thd, enum enum_mysql_completiontype completion)
{
bool do_release= 0;
int res= 0;
LEX *lex= thd->lex;
DBUG_ENTER("end_trans");
switch (completion) {
@ -1901,9 +1899,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
{
statistic_increment(thd->status_var.com_stat[SQLCOM_DROP_DB],
&LOCK_status);
char *db=thd->strdup(packet), *alias;
char *db=thd->strdup(packet);
/* null test to handle EOM */
if (!db || !(alias= thd->strdup(db)) || check_db_name(db))
if (!db || check_db_name(db))
{
my_error(ER_WRONG_DB_NAME, MYF(0), db ? db : "NULL");
break;
@ -3573,8 +3571,7 @@ unsent_create_error:
}
case SQLCOM_DROP_DB:
{
char *alias;
if (!(alias=thd->strdup(lex->name)) || check_db_name(lex->name))
if (check_db_name(lex->name))
{
my_error(ER_WRONG_DB_NAME, MYF(0), lex->name);
break;
@ -4023,7 +4020,7 @@ unsent_create_error:
char *name, *db;
int result;
DBUG_ASSERT(lex->sphead);
DBUG_ASSERT(lex->sphead != 0);
if (check_access(thd, CREATE_PROC_ACL, lex->sphead->m_db.str, 0, 0, 0))
{