summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-01-14 16:01:55 +0400
committerunknown <ram@gw.mysql.r18.ru>2004-01-14 16:01:55 +0400
commit13cf5e6b0ae32d25d4f6d13928ce5766ba0e2f50 (patch)
treea59a16934279171311c77c8d442a131b753866d8 /sql/sql_show.cc
parentd228cd2e0fa78b46068c7b6cf54cfe4f7be8fa33 (diff)
downloadmariadb-git-13cf5e6b0ae32d25d4f6d13928ce5766ba0e2f50.tar.gz
fix for the 2361 bug: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key
"PRIMARY" has been replaced by primary_key_name. sql/mysql_priv.h: "PRIMARY" replaced by primary_key_name. sql/sql_help.cc: "PRIMARY" replaced by primary_key_name. sql/sql_select.cc: "PRIMARY" replaced by primary_key_name. sql/sql_show.cc: "PRIMARY" replaced by primary_key_name. sql/sql_table.cc: fix for the 2361 bug: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key "PRIMARY" replaced by primary_key_name. sql/table.cc: "PRIMARY" replaced by primary_key_name.
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 52f7e6cb9ed..984d57fc354 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1167,7 +1167,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
bool found_primary=0;
packet->append(",\n ", 4);
- if (i == primary_key && !strcmp(key_info->name,"PRIMARY"))
+ if (i == primary_key && !strcmp(key_info->name, primary_key_name))
{
found_primary=1;
packet->append("PRIMARY ", 8);