summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-10-22 22:10:52 +0300
committerbell@sanja.is.com.ua <>2004-10-22 22:10:52 +0300
commitbc68cd7d322b45d724cf433f86aa4c427a51abaf (patch)
tree6069d51f16423e2b775b3da883f22c3a1950659f /sql
parentded12c828ded747d2f76c97addb4b4a6677594fe (diff)
parent6b6692dc4d3d54d844e91105de8ce32c55e5d43d (diff)
downloadmariadb-git-bc68cd7d322b45d724cf433f86aa4c427a51abaf.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9e0853a370b..7c21a5af2a6 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1142,7 +1142,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if (check_access(thd,CREATE_ACL,db,0,1))
break;
mysql_log.write(thd,command,packet);
- mysql_create_db(thd,(lower_case_table_names == 2 ? alias : db),0,0);
+ if (mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
+ 0, 0) < 0)
+ send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);
break;
}
case COM_DROP_DB: // QQ: To be removed
@@ -1163,7 +1165,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break;
}
mysql_log.write(thd,command,db);
- mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db), 0, 0);
+ if (mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
+ 0, 0) < 0)
+ send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);
break;
}
case COM_BINLOG_DUMP: