diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-01-14 16:01:55 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-01-14 16:01:55 +0400 |
| commit | 13cf5e6b0ae32d25d4f6d13928ce5766ba0e2f50 (patch) | |
| tree | a59a16934279171311c77c8d442a131b753866d8 /sql/sql_help.cc | |
| parent | d228cd2e0fa78b46068c7b6cf54cfe4f7be8fa33 (diff) | |
| download | mariadb-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_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index c40133c04a8..d5516fe3337 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -274,9 +274,9 @@ int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations, DBUG_ENTER("get_topics_for_keyword"); - if ((iindex_topic= find_type((char*) "PRIMARY", + if ((iindex_topic= find_type((char*) primary_key_name, &topics->keynames, 1+2)-1)<0 || - (iindex_relations= find_type((char*) "PRIMARY", + (iindex_relations= find_type((char*) primary_key_name, &relations->keynames, 1+2)-1)<0) { send_error(thd,ER_CORRUPT_HELP_DB); |