diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
| commit | aca8e7ed6b176f28e8a34ebddc989574d93f305c (patch) | |
| tree | c0d20e5b3e9518f48d789e2220eea46d9010966d /sql/sql_db.cc | |
| parent | 750b9147fced7202b541be946e044eb739b20a03 (diff) | |
| parent | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (diff) | |
| download | mariadb-git-aca8e7ed6b176f28e8a34ebddc989574d93f305c.tar.gz | |
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 99e5f3a035c..cbe59503058 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 @@ -754,7 +755,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) { ulong deleted_tables= 0; bool error= true; - char path[FN_REFLEN+16]; + char path[FN_REFLEN + 16]; MY_DIR *dirp; uint length; bool found_other_files= false; @@ -916,7 +917,7 @@ update_binlog: 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); |