summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-09-11 23:18:27 +0200
committerunknown <guilhem@mysql.com>2003-09-11 23:18:27 +0200
commit0c04d1303b3eec006da167f3906e0987ddf48c6f (patch)
treea976c77fddb865320f3fc6a494d2e039ee6d163f /sql/sql_parse.cc
parent4d2d0eb5d8b39c3d892b3ca365497aa4a16115e1 (diff)
parent69b8b3ff7c37dd72a5f5f265e92e801783e7b9bd (diff)
downloadmariadb-git-0c04d1303b3eec006da167f3906e0987ddf48c6f.tar.gz
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 4d010ac9a4b..0c4e3cad763 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1568,9 +1568,12 @@ mysql_execute_command(void)
goto error;
}
LOCK_ACTIVE_MI;
- // fetch_master_table will send the error to the client on failure
+ /*
+ fetch_master_table will send the error to the client on failure.
+ Give error if the table already exists.
+ */
if (!fetch_master_table(thd, tables->db, tables->real_name,
- active_mi, 0))
+ active_mi, 0, 0))
{
send_ok(&thd->net);
}