summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-10 13:54:04 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-10 13:54:04 +0100
commitbd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (patch)
tree78117460df06878cb987630a95e6304b587a7f39 /sql/sql_db.cc
parent3c987667d903826e8643f7835f102272ce98987e (diff)
parent2e11ca36f28133c18b72351d176ee2fd7fcbc465 (diff)
downloadmariadb-git-bd87fed1dc0caa0720e5a60f0fca1b714c58ac75.tar.gz
5.1 merge
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 707630ee16e..3ca35159244 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1,5 +1,6 @@
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -881,7 +882,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
{
long deleted=0;
int error= 0;
- char path[FN_REFLEN+16];
+ char path[FN_REFLEN + 16];
MY_DIR *dirp;
uint length;
TABLE_LIST* dropped_tables= 0;
@@ -1019,7 +1020,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
if (!(query= (char*) thd->alloc(MAX_DROP_TABLE_Q_LEN)))
goto exit; /* not much else we can do */
- query_pos= query_data_start= strmov(query,"drop table ");
+ query_pos= query_data_start= strmov(query,"DROP TABLE ");
query_end= query + MAX_DROP_TABLE_Q_LEN;
db_len= strlen(db);