diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
commit | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch) | |
tree | 568cd8f2997888d5c1035ad8e9b5e823197dcf62 /sql/sql_db.cc | |
parent | b0ee31c89480519490537b89dca1e8cc65e2b73b (diff) | |
parent | bd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff) | |
download | mariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz |
5.2->5.3 merge
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r-- | sql/sql_db.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 0b5f6257717..b7b0a853233 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 @@ -882,7 +883,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; @@ -1020,7 +1021,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); |