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_select.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_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a1f6abfd53a..1b03a70c43d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9130,16 +9130,16 @@ int mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, select_result *result) { res= mysql_explain_select(thd, sl, (((&thd->lex->select_lex)==sl)? - ((thd->lex->all_selects_list != sl)?"PRIMARY": - "SIMPLE"): + ((thd->lex->all_selects_list != sl) ? + primary_key_name : "SIMPLE"): ((sl == first)? ((sl->linkage == DERIVED_TABLE_TYPE) ? "DERIVED": - ((sl->uncacheable & UNCACHEABLE_DEPENDENT)? + ((sl->uncacheable & UNCACHEABLE_DEPENDENT) ? "DEPENDENT SUBQUERY": (sl->uncacheable?"UNCACHEABLE SUBQUERY": "SUBQUERY"))): - ((sl->uncacheable & UNCACHEABLE_DEPENDENT)? + ((sl->uncacheable & UNCACHEABLE_DEPENDENT) ? "DEPENDENT UNION": sl->uncacheable?"UNCACHEABLE UNION": "UNION"))), |