upmerge to bug#14548159

1 files changed, 19 insertions, 15 deletions

diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index 67ed608f114..2285131fade 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -24,6 +24,7 @@
 #include "sql_acl.h"     // DROP_ACL
 #include "sql_parse.h"   // check_one_table_access()
 #include "sql_truncate.h"
+#include "sql_show.h"    //append_identifier()
 
 
 /**
@@ -43,9 +44,8 @@ static bool fk_info_append_fields(String *str, List<LEX_STRING> *fields)
 
   while ((field= it++))
   {
-    res|= str->append("`");
-    res|= str->append(field);
-    res|= str->append("`, ");
+    append_identifier(NULL, str, field->str, field->length);
+    res|= str->append(", ");
   }
 
   str->chop();
@@ -76,19 +76,23 @@ static const char *fk_info_str(THD *thd, FOREIGN_KEY_INFO *fk_info)
     `db`.`tbl`, CONSTRAINT `id` FOREIGN KEY (`fk`) REFERENCES `db`.`tbl` (`fk`)
   */
 
-  res|= str.append('`');
-  res|= str.append(fk_info->foreign_db);
-  res|= str.append("`.`");
-  res|= str.append(fk_info->foreign_table);
-  res|= str.append("`, CONSTRAINT `");
-  res|= str.append(fk_info->foreign_id);
-  res|= str.append("` FOREIGN KEY (");
+  append_identifier(NULL, &str, fk_info->foreign_db->str,
+                    fk_info->foreign_db->length);
+  res|= str.append(".");
+  append_identifier(NULL, &str, fk_info->foreign_table->str,
+                    fk_info->foreign_table->length);
+  res|= str.append(", CONSTRAINT ");
+  append_identifier(NULL, &str, fk_info->foreign_id->str,
+                    fk_info->foreign_id->length);
+  res|= str.append(" FOREIGN KEY (");
   res|= fk_info_append_fields(&str, &fk_info->foreign_fields);
-  res|= str.append(") REFERENCES `");
-  res|= str.append(fk_info->referenced_db);
-  res|= str.append("`.`");
-  res|= str.append(fk_info->referenced_table);
-  res|= str.append("` (");
+  res|= str.append(") REFERENCES ");
+  append_identifier(NULL, &str, fk_info->referenced_db->str,
+                    fk_info->referenced_db->length);
+  res|= str.append(".");
+  append_identifier(NULL, &str, fk_info->referenced_table->str,
+                    fk_info->referenced_table->length);
+  res|= str.append(" (");
   res|= fk_info_append_fields(&str, &fk_info->referenced_fields);
   res|= str.append(')');