Merge lp:~laurynas-biveinis/percona-server/bug1208371 into lp:percona-server/5.6

[Laurynas Biveinis]

Fix
- bug 1208371 (Revert our fixes for bug 1049871, bug 1175519, bug
1223196, and bug 1277351) and
- bug 1350386 (Restore MySQL 5.6.10 change for "15847447").

The former fix is a straightforward revert of MariaDB patch for
MDEV-382, while keeping a testcase. Since the Oracle fix for the same
issue is not complete yet (bug 1277351 /
http://bugs.mysql.com/bug.php?id=71603 is outstanding currently), fix
it in the same commit by passing the file name through String::print
in Load_log_event::print_query.

The MariaDB patch revert also uncovers and together with a testcase
re-record fixes bug 1350386, which is a MySQL 5.6.10 merge
regression.

Even though it's a large patch, there's only one non-revert bit:

@ -5852,7 +5895,8 @@
   return
     //the DB name may double if we escape the quote character
     5 + 2*db_len + 3 +
- 18 + fname_len + 2 + // "LOAD DATA INFILE 'file''"
+ // Likewise for the fname
+ 18 + 2 * fname_len + 2 + // "LOAD DATA INFILE 'file''"
     11 + // "CONCURRENT "
     7 + // LOCAL
     9 + // " REPLACE or IGNORE "
@@ -5899,8 +5943,10 @@
   if (check_fname_outside_temp_buf())
     pos= strmov(pos, "LOCAL ");
   pos= strmov(pos, "INFILE '");
- memcpy(pos, fname, fname_len);
- pos= strmov(pos+fname_len, "' ");
+ String quoted_fname;
+ String(fname, fname_len, NULL).print(&quoted_fname);
+ memcpy(pos, quoted_fname.ptr(), quoted_fname.length());
+ pos= strmov(pos + quoted_fname.length(), "' ");

   if (sql_ex.opt_flags & REPLACE_FLAG)
     pos= strmov(pos, "REPLACE ");

http://jenkins.percona.com/job/percona-server-5.6-param/676/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'client/sql_string.cc'
--- client/sql_string.cc	2013-08-14 03:57:21 +0000
+++ client/sql_string.cc	2014-07-31 14:56:03 +0000
@@ -479,50 +479,6 @@
   return FALSE;
 }
 
-bool String::append_identifier(const char *name,
-			       uint length,
-			       const CHARSET_INFO *ci,
-			       int quote_char)
-{
-  const char *name_end;
-  char q= (char)quote_char;
-  const CHARSET_INFO *lci = ci ? ci : charset();
-
-  if (quote_char == EOF)
-    return append(name, length, charset());
-
-  /*
-    The identifier must be quoted as it includes a quote character or
-   it's a keyword
-  */
-
-  (void)reserve(length*2 + 2);
-  if (append(&q, 1, lci))
-    return true;
-
-  for (name_end= name+length ; name < name_end ; name+= length)
-  {
-    uchar chr= (uchar) *name;
-    length= my_mbcharlen(lci, chr);
-    /*
-      my_mbcharlen can return 0 on a wrong multibyte
-      sequence. It is possible when upgrading from 4.0,
-      and identifier contains some accented characters.
-      The manual says it does not work. So we'll just
-      change length to 1 not to hang in the endless loop.
-    */
-    if (!length)
-      length= 1;
-    if (length == 1 && chr == (uchar) q &&
-        append(&q, 1, lci))
-      return true;
-    if (append(name, length, lci))
-      return true;
-  }
-  return append(&q, 1, lci);
-}
-
-
 uint32 String::numchars() const
 {
   return str_charset->cset->numchars(str_charset, Ptr, Ptr+str_length);

=== modified file 'client/sql_string.h'
--- client/sql_string.h	2013-08-14 03:57:21 +0000
+++ client/sql_string.h	2014-07-31 14:56:03 +0000
@@ -21,12 +21,6 @@
 #include "m_ctype.h"
 #include "my_sys.h"
 
-#define QUOTED_IDENTIFIER(str_name, buf_size, q, cs, id_name, id_size) \
-	char buf_##str_name[(buf_size)]; \
-	String str_name((buf_##str_name), (buf_size), (cs)); \
-	str_name.length(0); \
-	str_name.append_identifier((id_name), (id_size), (cs), (q));
-
 class String;
 int sortcmp(const String *a,const String *b, const CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
@@ -263,10 +257,6 @@
   bool append(IO_CACHE* file, uint32 arg_length);
   bool append_with_prefill(const char *s, uint32 arg_length, 
 			   uint32 full_length, char fill_char);
-  bool append_identifier(const char *name,
-			 uint length,
-			 const CHARSET_INFO *ci,
-			 int quote_char);
   int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   bool replace(uint32 offset,uint32 arg_length,const char *to,uint32 length);

=== modified file 'mysql-test/suite/rpl/r/rpl_mdev382.result'
--- mysql-test/suite/rpl/r/rpl_mdev382.result	2014-07-28 15:17:28 +0000
+++ mysql-test/suite/rpl/r/rpl_mdev382.result	2014-07-31 14:56:03 +0000
@@ -318,9 +318,7 @@
 # The DELETE statement should be correctly quoted
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	#	Query	#	#	BEGIN
 master-bin.000002	#	Query	#	#	use `test`; DELETE FROM `db1``; select 'oops!'`.`t``1`
-master-bin.000002	#	Query	#	#	COMMIT
 include/start_slave.inc
 # The table should be empty on the slave also.
 SELECT * FROM `db1``; select 'oops!'`.`t``1`;

=== modified file 'sql/binlog.cc'
--- sql/binlog.cc	2014-07-28 12:15:33 +0000
+++ sql/binlog.cc	2014-07-31 14:56:03 +0000
@@ -1836,10 +1836,11 @@
   int error= 1;
 
   String log_query;
-  if (log_query.append(STRING_WITH_LEN("SAVEPOINT ")) ||
-      append_identifier(thd, &log_query, thd->lex->ident.str,
-                        thd->lex->ident.length))
+  if (log_query.append(STRING_WITH_LEN("SAVEPOINT ")))
     DBUG_RETURN(error);
+  else
+    append_identifier(thd, &log_query, thd->lex->ident.str,
+                      thd->lex->ident.length);
 
   int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
   Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),
@@ -1879,8 +1880,9 @@
   {
     String log_query;
     if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")) ||
-        append_identifier(thd, &log_query, thd->lex->ident.str,
-                          thd->lex->ident.length))
+        log_query.append("`") ||
+        log_query.append(thd->lex->ident.str, thd->lex->ident.length) ||
+        log_query.append("`"))
       DBUG_RETURN(1);
     int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
     Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),
@@ -2449,7 +2451,7 @@
         description_event->checksum_alg= ev->checksum_alg;
 
       if (event_count >= limit_start &&
-        ev->net_send(thd, protocol, linfo.log_file_name, pos))
+        ev->net_send(protocol, linfo.log_file_name, pos))
       {
 	errmsg = "Net error";
 	delete ev;

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- sql/ha_ndbcluster_binlog.cc	2013-12-16 08:45:31 +0000
+++ sql/ha_ndbcluster_binlog.cc	2014-07-31 14:56:03 +0000
@@ -1828,9 +1828,12 @@
     DBUG_RETURN(0);
   }
 
-  char tmp_buf2_mem[FN_REFLEN];
-  String tmp_buf2(tmp_buf2_mem, sizeof(tmp_buf2_mem), system_charset_info);
-  tmp_buf2.length(0);
+  char tmp_buf2[FN_REFLEN];
+  char quoted_table1[2 + 2 * FN_REFLEN + 1];
+  char quoted_db1[2 + 2 * FN_REFLEN + 1];
+  char quoted_db2[2 + 2 * FN_REFLEN + 1];
+  char quoted_table2[2 + 2 * FN_REFLEN + 1];
+  int id_length= 0;
   const char *type_str;
   int also_internal= 0;
   uint32 log_type= (uint32)type;
@@ -1841,10 +1844,15 @@
     if (thd->lex->sql_command ==  SQLCOM_DROP_DB)
       DBUG_RETURN(0);
     /* redo the drop table query as is may contain several tables */
-    tmp_buf2.append(STRING_WITH_LEN("drop table "));
-    append_identifier(thd, &tmp_buf2, table_name, strlen(table_name));
-    query= tmp_buf2.c_ptr_safe();
-    query_length= tmp_buf2.length();
+    query= tmp_buf2;
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_table1,
+                                            table_name, 0);
+    quoted_table1[id_length]= '\0';
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_db1,
+                                            db, 0);
+    quoted_db1[id_length]= '\0';
+    query_length= (uint) (strxmov(tmp_buf2, "drop table ", quoted_db1, ".",
+                                  quoted_table1, NullS) - tmp_buf2);
     type_str= "drop table";
     break;
   case SOT_RENAME_TABLE_PREPARE:
@@ -1853,16 +1861,22 @@
     break;
   case SOT_RENAME_TABLE:
     /* redo the rename table query as is may contain several tables */
-    tmp_buf2.append(STRING_WITH_LEN("rename table "));
-    append_identifier(thd, &tmp_buf2, db, strlen(db));
-    tmp_buf2.append(STRING_WITH_LEN("."));
-    append_identifier(thd, &tmp_buf2, table_name, strlen(table_name));
-    tmp_buf2.append(STRING_WITH_LEN(" to "));
-    append_identifier(thd, &tmp_buf2, new_db, strlen(new_db));
-    tmp_buf2.append(STRING_WITH_LEN("."));
-    append_identifier(thd, &tmp_buf2, new_table_name, strlen(new_table_name));
-    query= tmp_buf2.c_ptr_safe();
-    query_length= tmp_buf2.length();
+    query= tmp_buf2;
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_db1,
+                                            db, 0);
+    quoted_db1[id_length]= '\0';
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_table1,
+                                            table_name, 0);
+    quoted_table1[id_length]= '\0';
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_db2,
+                                            new_db, 0);
+    quoted_db2[id_length]= '\0';
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_table2,
+                                            new_table_name, 0);
+    quoted_table2[id_length]= '\0';
+    query_length= (uint) (strxmov(tmp_buf2, "rename table ",
+                                  quoted_db1, ".", quoted_table1, " to ",
+                                  quoted_db2, ".", quoted_table2, NullS) - tmp_buf2);
     type_str= "rename table";
     break;
   case SOT_CREATE_TABLE:

=== modified file 'sql/item.cc'
--- sql/item.cc	2014-06-11 13:33:46 +0000
+++ sql/item.cc	2014-07-31 14:56:03 +0000
@@ -1013,22 +1013,6 @@
   }
 }
 
-void Item_name_string::copy_no_truncate(const char *str, size_t length,
-                                        const CHARSET_INFO *cs)
-{
-  if (!my_charset_same(cs, system_charset_info))
-  {
-    size_t res_length;
-    char *tmp= sql_strmake_with_convert(str, length, cs, UINT_MAX,
-                                        system_charset_info, &res_length);
-    set(tmp, tmp ? res_length : 0);
-  }
-  else
-  {
-    char *tmp= sql_strmake(str, length);
-    set(tmp, tmp ? length : 0);
-  }
-}
 
 void Item_name_string::copy(const char *str_arg, size_t length_arg,
                             const CHARSET_INFO *cs_arg,

=== modified file 'sql/item.h'
--- sql/item.h	2014-06-04 14:48:06 +0000
+++ sql/item.h	2014-07-31 14:56:03 +0000
@@ -190,7 +190,6 @@
     Allocate space using sql_strmake() or sql_strmake_with_convert().
   */
   void copy(const char *str, size_t length, const CHARSET_INFO *cs);
-
   /**
     Variants for copy(), for various argument combinations.
   */
@@ -279,9 +278,6 @@
   */
   void copy(const char *str_arg, size_t length_arg, const CHARSET_INFO *cs_arg,
            bool is_autogenerated_arg);
-
-  void copy_no_truncate(const char *str, size_t length,
-                        const CHARSET_INFO *cs);
 };
 
 

=== modified file 'sql/item_func.cc'
--- sql/item_func.cc	2014-06-11 13:33:46 +0000
+++ sql/item_func.cc	2014-07-31 14:56:03 +0000
@@ -5747,10 +5747,10 @@
 }
 
 
-void Item_user_var_as_out_param::print_for_load(THD *thd, String *str)
+void Item_user_var_as_out_param::print(String *str, enum_query_type query_type)
 {
   str->append('@');
-  append_identifier(thd, str, name.ptr(), name.length());
+  append_identifier(current_thd, str, name);
 }
 
 

=== modified file 'sql/item_func.h'
--- sql/item_func.h	2014-06-11 13:33:46 +0000
+++ sql/item_func.h	2014-07-31 14:56:03 +0000
@@ -1796,7 +1796,7 @@
 
   /* fix_fields() binds variable name with its entry structure */
   bool fix_fields(THD *thd, Item **ref);
-  virtual void print_for_load(THD *thd, String *str);
+  virtual void print(String *str, enum_query_type query_type);
   void set_null_value(const CHARSET_INFO* cs);
   void set_value(const char *str, uint length, const CHARSET_INFO* cs);
 };

=== modified file 'sql/log_event.cc'
--- sql/log_event.cc	2014-06-04 14:48:06 +0000
+++ sql/log_event.cc	2014-07-31 14:56:03 +0000
@@ -18,7 +18,6 @@
 #ifdef MYSQL_CLIENT
 
 #include "sql_priv.h"
-#include "../client/sql_string.h"
 #include "mysqld_error.h"
 
 #else
@@ -27,7 +26,6 @@
 #include "sql_priv.h"
 #include "unireg.h"
 #include "my_global.h" // REQUIRED by log_event.h > m_string.h > my_bitmap.h
-#include "sql_string.h"
 #include "log_event.h"
 #include "sql_base.h"                           // close_thread_tables
 #include "sql_cache.h"                       // QUERY_CACHE_FLAGS_SIZE
@@ -427,28 +425,29 @@
   pretty_print_str()
 */
 
-static void
-pretty_print_str(String *packet, const char *str, int len)
+static char *pretty_print_str(char *packet, const char *str, int len)
 {
   const char *end= str + len;
-  packet->append(STRING_WITH_LEN("'"));
+  char *pos= packet;
+  *pos++= '\'';
   while (str < end)
   {
     char c;
     switch ((c=*str++)) {
-    case '\n': packet->append(STRING_WITH_LEN("\\n")); break;
-    case '\r': packet->append(STRING_WITH_LEN("\\r")); break;
-    case '\\': packet->append(STRING_WITH_LEN("\\\\")); break;
-    case '\b': packet->append(STRING_WITH_LEN("\\b")); break;
-    case '\t': packet->append(STRING_WITH_LEN("\\t")); break;
-    case '\'': packet->append(STRING_WITH_LEN("\\'")); break;
-    case 0   : packet->append(STRING_WITH_LEN("\\0")); break;
+    case '\n': *pos++= '\\'; *pos++= 'n'; break;
+    case '\r': *pos++= '\\'; *pos++= 'r'; break;
+    case '\\': *pos++= '\\'; *pos++= '\\'; break;
+    case '\b': *pos++= '\\'; *pos++= 'b'; break;
+    case '\t': *pos++= '\\'; *pos++= 't'; break;
+    case '\'': *pos++= '\\'; *pos++= '\''; break;
+    case 0   : *pos++= '\\'; *pos++= '0'; break;
     default:
-      packet->append(&c, 1);
+      *pos++= c;
       break;
     }
   }
-  packet->append(STRING_WITH_LEN("'"));
+  *pos++= '\'';
+  return pos;
 }
 #endif /* !MYSQL_CLIENT */
 
@@ -897,7 +896,7 @@
   Log_event::pack_info()
 */
 
-int Log_event::pack_info(THD* thd, Protocol *protocol)
+int Log_event::pack_info(Protocol *protocol)
 {
   protocol->store("", &my_charset_bin);
   return 0;
@@ -907,8 +906,7 @@
 /**
   Only called by SHOW BINLOG EVENTS
 */
-int Log_event::net_send(THD *thd, Protocol *protocol, const char* log_name,
-                        my_off_t pos)
+int Log_event::net_send(Protocol *protocol, const char* log_name, my_off_t pos)
 {
   const char *p= strrchr(log_name, FN_LIBCHAR);
   const char *event_type;
@@ -922,7 +920,7 @@
   protocol->store(event_type, strlen(event_type), &my_charset_bin);
   protocol->store((uint32) server_id);
   protocol->store((ulonglong) log_pos);
-  if (pack_info(thd, protocol))
+  if (pack_info(protocol))
     return 1;
   return protocol->write();
 }
@@ -3178,25 +3176,23 @@
     show the catalog ??
 */
 
-int Query_log_event::pack_info(THD* thd, Protocol *protocol)
+int Query_log_event::pack_info(Protocol *protocol)
 {
   // TODO: show the catalog ??
-  char temp_buf_mem[1024];
-  String temp_buf(temp_buf_mem, sizeof(temp_buf_mem), system_charset_info);
-  temp_buf.real_alloc(9 + db_len + q_len);
+  String temp_buf;
   // Add use `DB` to the string if required
   if (!(flags & LOG_EVENT_SUPPRESS_USE_F)
       && db && db_len)
   {
-    temp_buf.append(STRING_WITH_LEN("use "));
-    append_identifier(thd, &temp_buf, db, db_len);
+    temp_buf.append("use ");
+    append_identifier(this->thd, &temp_buf, db, db_len);
     temp_buf.append("; ");
   }
   // Add the query to the string
   if (query && q_len)
-    temp_buf.append(query, q_len);
-  // persist the buffer in protocol
-  protocol->store(&temp_buf);
+    temp_buf.append(query);
+ // persist the buffer in protocol
+  protocol->store(temp_buf.ptr(), temp_buf.length(), &my_charset_bin);
   return 0;
 }
 #endif
@@ -4269,19 +4265,7 @@
     if (different_db)
       memcpy(print_event_info->db, db, db_len + 1);
     if (db[0] && different_db) 
-    {
-      QUOTED_IDENTIFIER(q_db,
-			/* Room for expand ` to `` + initial/final ` + \0 */
-			FN_REFLEN*2+3,
-			'`',
-			&my_charset_bin,
-			db,
-			db_len);
-      my_b_printf(file,
-		  "use %s%s\n",
-		  q_db.c_ptr(),
-		  print_event_info->delimiter);
-    }
+      my_b_printf(file, "use %s%s\n", quoted_id, print_event_info->delimiter);
   }
 
   end=int10_to_str((long) when.tv_sec, strmov(buff,"SET TIMESTAMP="),10);
@@ -5156,7 +5140,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Start_log_event_v3::pack_info(THD* thd, Protocol *protocol)
+int Start_log_event_v3::pack_info(Protocol *protocol)
 {
   char buf[12 + ST_SERVER_VER_LEN + 14 + 22], *pos;
   pos= strmov(buf, "Server ver: ");
@@ -5906,110 +5890,142 @@
   **************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-void Load_log_event::print_query(THD* thd, bool need_db, const char *cs,
-                                 String *buf, my_off_t *fn_start,
-                                 my_off_t *fn_end, const char *qualify_db)
-{
+uint Load_log_event::get_query_buffer_length()
+{
+  return
+    //the DB name may double if we escape the quote character
+    5 + 2*db_len + 3 +
+    // Likewise for the fname
+    18 + 2 * fname_len + 2 +                // "LOAD DATA INFILE 'file''"
+    11 +                                    // "CONCURRENT "
+    7 +					    // LOCAL
+    9 +                                     // " REPLACE or IGNORE "
+    13 + table_name_len*2 +                 // "INTO TABLE `table`"
+    21 + sql_ex.field_term_len*4 + 2 +      // " FIELDS TERMINATED BY 'str'"
+    23 + sql_ex.enclosed_len*4 + 2 +        // " OPTIONALLY ENCLOSED BY 'str'"
+    12 + sql_ex.escaped_len*4 + 2 +         // " ESCAPED BY 'str'"
+    21 + sql_ex.line_term_len*4 + 2 +       // " LINES TERMINATED BY 'str'"
+    19 + sql_ex.line_start_len*4 + 2 +      // " LINES STARTING BY 'str'"
+    15 + 22 +                               // " IGNORE xxx  LINES"
+    3 + (num_fields-1)*2 + field_block_len; // " (field1, field2, ...)"
+}
+
+
+void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
+                                 char **end, char **fn_start, char **fn_end)
+{
+  char quoted_id[1 + NAME_LEN * 2 + 2];//quoted  length
+  int  quoted_id_len= 0;
+  char *pos= buf;
+
   if (need_db && db && db_len)
   {
-    buf->append(STRING_WITH_LEN("use "));
-    append_identifier(thd, buf, db, db_len);
-    buf->append(STRING_WITH_LEN("; "));
+    pos= strmov(pos, "use ");
+#ifdef MYSQL_SERVER
+    quoted_id_len= my_strmov_quoted_identifier(this->thd, (char *) quoted_id,
+                                               db, 0);
+#else
+    quoted_id_len= my_strmov_quoted_identifier((char *) quoted_id, db);
+#endif
+    quoted_id[quoted_id_len]= '\0';
+    pos= strmov(pos, quoted_id);
+    pos= strmov(pos, "; ");
   }
 
-  buf->append(STRING_WITH_LEN("LOAD DATA "));
+  pos= strmov(pos, "LOAD DATA ");
 
   if (is_concurrent)
-    buf->append(STRING_WITH_LEN("CONCURRENT "));
+    pos= strmov(pos, "CONCURRENT ");
 
   if (fn_start)
-    *fn_start= buf->length();
+    *fn_start= pos;
 
   if (check_fname_outside_temp_buf())
-    buf->append(STRING_WITH_LEN("LOCAL "));
-  buf->append(STRING_WITH_LEN("INFILE '"));
-  buf->append_for_single_quote(fname, fname_len);
-  buf->append(STRING_WITH_LEN("' "));
+    pos= strmov(pos, "LOCAL ");
+  pos= strmov(pos, "INFILE '");
+  String quoted_fname;
+  String(fname, fname_len, NULL).print(&quoted_fname);
+  memcpy(pos, quoted_fname.ptr(), quoted_fname.length());
+  pos= strmov(pos + quoted_fname.length(), "' ");
 
   if (sql_ex.opt_flags & REPLACE_FLAG)
-    buf->append(STRING_WITH_LEN("REPLACE "));
+    pos= strmov(pos, "REPLACE ");
   else if (sql_ex.opt_flags & IGNORE_FLAG)
-    buf->append(STRING_WITH_LEN("IGNORE "));
+    pos= strmov(pos, "IGNORE ");
 
-  buf->append(STRING_WITH_LEN("INTO"));
+  pos= strmov(pos ,"INTO");
 
   if (fn_end)
-    *fn_end= buf->length();
+    *fn_end= pos;
 
-  buf->append(STRING_WITH_LEN(" TABLE "));
-  buf->append(table_name, table_name_len);
+  pos= strmov(pos ," TABLE ");
+  memcpy(pos, table_name, table_name_len);
+  pos+= table_name_len;
 
   if (cs != NULL)
   {
-    buf->append(STRING_WITH_LEN(" CHARACTER SET "));
-    buf->append(cs, strlen(cs));
+    pos= strmov(pos ," CHARACTER SET ");
+    pos= strmov(pos ,  cs);
   }
 
   /* We have to create all optional fields as the default is not empty */
-  buf->append(STRING_WITH_LEN(" FIELDS TERMINATED BY "));
-  pretty_print_str(buf, sql_ex.field_term, sql_ex.field_term_len);
+  pos= strmov(pos, " FIELDS TERMINATED BY ");
+  pos= pretty_print_str(pos, sql_ex.field_term, sql_ex.field_term_len);
   if (sql_ex.opt_flags & OPT_ENCLOSED_FLAG)
-    buf->append(STRING_WITH_LEN(" OPTIONALLY "));
-  buf->append(STRING_WITH_LEN(" ENCLOSED BY "));
-  pretty_print_str(buf, sql_ex.enclosed, sql_ex.enclosed_len);
-
-  buf->append(STRING_WITH_LEN(" ESCAPED BY "));
-  pretty_print_str(buf, sql_ex.escaped, sql_ex.escaped_len);
-
-  buf->append(STRING_WITH_LEN(" LINES TERMINATED BY "));
-  pretty_print_str(buf, sql_ex.line_term, sql_ex.line_term_len);
+    pos= strmov(pos, " OPTIONALLY ");
+  pos= strmov(pos, " ENCLOSED BY ");
+  pos= pretty_print_str(pos, sql_ex.enclosed, sql_ex.enclosed_len);
+
+  pos= strmov(pos, " ESCAPED BY ");
+  pos= pretty_print_str(pos, sql_ex.escaped, sql_ex.escaped_len);
+
+  pos= strmov(pos, " LINES TERMINATED BY ");
+  pos= pretty_print_str(pos, sql_ex.line_term, sql_ex.line_term_len);
   if (sql_ex.line_start_len)
   {
-    buf->append(STRING_WITH_LEN(" STARTING BY "));
-    pretty_print_str(buf, sql_ex.line_start, sql_ex.line_start_len);
+    pos= strmov(pos, " STARTING BY ");
+    pos= pretty_print_str(pos, sql_ex.line_start, sql_ex.line_start_len);
   }
 
   if ((long) skip_lines > 0)
   {
-    char skipbuf[22];
-    buf->append(STRING_WITH_LEN(" IGNORE "));
-    longlong10_to_str((longlong) skip_lines, skipbuf, 10);
-    buf->append(skipbuf);
-    buf->append(STRING_WITH_LEN(" LINES "));
+    pos= strmov(pos, " IGNORE ");
+    pos= longlong10_to_str((longlong) skip_lines, pos, 10);
+    pos= strmov(pos," LINES ");    
   }
 
   if (num_fields)
   {
     uint i;
     const char *field= fields;
-    buf->append(STRING_WITH_LEN(" ("));
+    pos= strmov(pos, " (");
     for (i = 0; i < num_fields; i++)
     {
       if (i)
       {
-        /*
-          Yes, the space and comma is reversed here. But this is mostly dead
-          code, at most used when reading really old binlogs from old servers,
-          so better just leave it as is...
-        */
-        buf->append(STRING_WITH_LEN(" ,"));
+        *pos++= ' ';
+        *pos++= ',';
       }
-      append_identifier(thd, buf, field, field_lens[i]);
-      field+= field_lens[i]  + 1;
+      quoted_id_len= my_strmov_quoted_identifier(this->thd, quoted_id, field,
+                                                 0);
+      memcpy(pos, quoted_id, quoted_id_len-1);
     }
-    buf->append(STRING_WITH_LEN(")"));
+    *pos++= ')';
   }
+
+  *end= pos;
 }
 
 
-int Load_log_event::pack_info(THD *thd, Protocol *protocol)
+int Load_log_event::pack_info(Protocol *protocol)
 {
-  char query_buffer[1024];
-  String query_str(query_buffer, sizeof(query_buffer), system_charset_info);
+  char *buf, *end;
 
-  query_str.length(0);
-  print_query(thd, TRUE, NULL, &query_str, 0, 0, NULL);
-  protocol->store(query_str.ptr(), query_str.length(), &my_charset_bin);
+  if (!(buf= (char*) my_malloc(get_query_buffer_length(), MYF(MY_WME))))
+    return 1;
+  print_query(TRUE, NULL, buf, &end, 0, 0);
+  protocol->store(buf, end-buf, &my_charset_bin);
+  my_free(buf);
   return 0;
 }
 #endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */
@@ -6314,14 +6330,15 @@
     my_b_printf(head,"REPLACE ");
   else if (sql_ex.opt_flags & IGNORE_FLAG)
     my_b_printf(head,"IGNORE ");
-  
-  QUOTED_IDENTIFIER(quoted_table_name,
-		    512,
-		    '`',
-		    &my_charset_bin,
-		    table_name,
-		    strlen(table_name));
-  my_b_printf(head, "INTO TABLE %s", quoted_table_name.c_ptr());
+
+#ifdef MYSQL_SERVER
+    id_len= my_strmov_quoted_identifier(this->thd, temp_buf, table_name, 0);
+#else
+    id_len= my_strmov_quoted_identifier(temp_buf, table_name);
+#endif
+  temp_buf[id_len]= '\0';
+  my_b_printf(head, "INTO TABLE %s", temp_buf);
+
   my_b_printf(head, " FIELDS TERMINATED BY ");
   pretty_print_str(head, sql_ex.field_term, sql_ex.field_term_len);
 
@@ -6505,21 +6522,16 @@
     else
     {
       char llbuff[22];
+      char *end;
       enum enum_duplicates handle_dup;
       bool ignore= 0;
       char *load_data_query;
-      char query_buffer[1024];
-      String query_str(query_buffer, sizeof(query_buffer), system_charset_info);
-      query_str.length(0);
 
-      print_query(thd, FALSE, NULL, &query_str, NULL, NULL, NULL);
       /*
         Forge LOAD DATA INFILE query which will be used in SHOW PROCESS LIST
         and written to slave's binlog if binlogging is on.
       */
-      if (!(load_data_query= (char *) thd->strmake(query_str.ptr(),
-						   query_str.length() +
-	                                           sizeof(size_t))))
+      if (!(load_data_query= (char *)thd->alloc(get_query_buffer_length() + 1)))
       {
         /*
           This will set thd->fatal_error in case of OOM. So we surely will notice
@@ -6528,11 +6540,9 @@
         goto error;
       }
 
-      memcpy(load_data_query + query_str.length() + 1,
-	     (char *) &thd->db_length,
-	     sizeof(size_t));
-
-      thd->set_query(load_data_query, query_str.length());
+      print_query(FALSE, NULL, load_data_query, &end, NULL, NULL);
+      *end= 0;
+      thd->set_query(load_data_query, (uint) (end - load_data_query));
 
       if (sql_ex.opt_flags & REPLACE_FLAG)
         handle_dup= DUP_REPLACE;
@@ -6720,7 +6730,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Rotate_log_event::pack_info(THD *thd, Protocol *protocol)
+int Rotate_log_event::pack_info(Protocol *protocol)
 {
   char buf1[256], buf[22];
   String tmp(buf1, sizeof(buf1), log_cs);
@@ -6991,7 +7001,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Intvar_log_event::pack_info(THD *thd, Protocol *protocol)
+int Intvar_log_event::pack_info(Protocol *protocol)
 {
   char buf[256], *pos;
   pos= strmake(buf, get_var_type_name(), sizeof(buf)-23);
@@ -7144,7 +7154,7 @@
 **************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Rand_log_event::pack_info(THD *thd, Protocol *protocol)
+int Rand_log_event::pack_info(Protocol *protocol)
 {
   char buf1[256], *pos;
   pos= strmov(buf1,"rand_seed1=");
@@ -7269,7 +7279,7 @@
 **************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Xid_log_event::pack_info(THD *thd, Protocol *protocol)
+int Xid_log_event::pack_info(Protocol *protocol)
 {
   char buf[128], *pos;
   pos= strmov(buf, "COMMIT /* xid=");
@@ -7510,122 +7520,85 @@
 **************************************************************************/
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-static bool
-user_var_append_name_part(THD *thd, String *buf,
-                          const char *name, size_t name_len)
+int User_var_log_event::pack_info(Protocol* protocol)
 {
-  return buf->append("@") ||
-    append_identifier(thd, buf, name, name_len) ||
-    buf->append("=");
-}
+  char *buf= 0;
+  char quoted_id[1 + FN_REFLEN * 2 + 2];// quoted identifier
+  int id_len= my_strmov_quoted_identifier(this->thd, quoted_id, name, name_len);
+  quoted_id[id_len]= '\0';
+  uint val_offset= 2 + id_len;
+  uint event_len= val_offset;
 
-int User_var_log_event::pack_info(THD *thd, Protocol* protocol)
-{
   if (is_null)
   {
-    char buf_mem[FN_REFLEN+7];
-    String buf(buf_mem, sizeof(buf_mem), system_charset_info);
-    buf.length(0);
-    if (user_var_append_name_part(thd, &buf, name, name_len) ||
-        buf.append("NULL"))
+    if (!(buf= (char*) my_malloc(val_offset + 5, MYF(MY_WME))))
       return 1;
-    protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
+    strmov(buf + val_offset, "NULL");
+    event_len= val_offset + 4;
   }
   else
   {
     switch (type) {
     case REAL_RESULT:
-    {
       double real_val;
-      char buf2[MY_GCVT_MAX_FIELD_WIDTH + 1];
-      char buf_mem[FN_REFLEN + MY_GCVT_MAX_FIELD_WIDTH + 1];
-      String buf(buf_mem, sizeof(buf_mem), system_charset_info);
       float8get(real_val, val);
-      my_gcvt(real_val, MY_GCVT_ARG_DOUBLE, MY_GCVT_MAX_FIELD_WIDTH,
-	      buf2, NULL);
-      buf.length(0);
-      if (user_var_append_name_part(thd, &buf, name, name_len) ||
-          buf.append(buf2))
-         return 1;
-      protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
+      if (!(buf= (char*) my_malloc(val_offset + MY_GCVT_MAX_FIELD_WIDTH + 1,
+                                   MYF(MY_WME))))
+        return 1;
+      event_len+= my_gcvt(real_val, MY_GCVT_ARG_DOUBLE, MY_GCVT_MAX_FIELD_WIDTH,
+                          buf + val_offset, NULL);
       break;
-    }
     case INT_RESULT:
-    {
-      char buf2[22];
-      char buf_mem[FN_REFLEN + 22];
-      String buf(buf_mem, sizeof(buf_mem), system_charset_info);
-      buf.length(0);
-      if (user_var_append_name_part(thd, &buf, name, name_len) ||
-          buf.append(buf2,
-		     longlong10_to_str(uint8korr(val),
-				       buf2,
-				       (flags &
-					User_var_log_event::UNSIGNED_F) ?
-				       10 : -10)
-		     -buf2))
+      if (!(buf= (char*) my_malloc(val_offset + 22, MYF(MY_WME))))
         return 1;
-      protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
+      event_len= longlong10_to_str(uint8korr(val), buf + val_offset, 
+                                   ((flags & User_var_log_event::UNSIGNED_F) ? 
+                                    10 : -10))-buf;
       break;
-    }
     case DECIMAL_RESULT:
     {
-      char buf_mem[FN_REFLEN + DECIMAL_MAX_STR_LENGTH];
-      String buf(buf_mem, sizeof(buf_mem), system_charset_info);
-      char buf2[DECIMAL_MAX_STR_LENGTH+1];
-      String str(buf2, sizeof(buf2), &my_charset_bin);
+      if (!(buf= (char*) my_malloc(val_offset + DECIMAL_MAX_STR_LENGTH + 1,
+                                   MYF(MY_WME))))
+        return 1;
+      String str(buf+val_offset, DECIMAL_MAX_STR_LENGTH + 1, &my_charset_bin);
       my_decimal dec;
-      buf.length(0);
       binary2my_decimal(E_DEC_FATAL_ERROR, (uchar*) (val+2), &dec, val[0],
                         val[1]);
       my_decimal2string(E_DEC_FATAL_ERROR, &dec, 0, 0, 0, &str);
-      if (user_var_append_name_part(thd, &buf, name, name_len) ||
-          buf.append(buf2))
-        return 1;
-      protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
+      event_len= str.length() + val_offset;
       break;
-    }
+    } 
     case STRING_RESULT:
-    {
       /* 15 is for 'COLLATE' and other chars */
-      char buf_mem[FN_REFLEN + 512 + 1 + 2*MY_CS_NAME_SIZE+15];
-      String buf(buf_mem, sizeof(buf_mem), system_charset_info);
+      buf= (char*) my_malloc(event_len+val_len*2+1+2*MY_CS_NAME_SIZE+15,
+                             MYF(MY_WME));
       CHARSET_INFO *cs;
-      buf.length(0);
+      if (!buf)
+        return 1;
       if (!(cs= get_charset(charset_number, MYF(0))))
       {
-        if (buf.append("???"))
-          return 1;
+        strmov(buf+val_offset, "???");
+        event_len+= 3;
       }
       else
       {
-        size_t old_len;
-        char *beg, *end;
-        if (user_var_append_name_part(thd, &buf, name, name_len) ||
-            buf.append("_") ||
-            buf.append(cs->csname) ||
-            buf.append(" "))
-          return 1;
-        old_len= buf.length();
-        if (buf.reserve(old_len + val_len*2 + 2 + sizeof(" COLLATE ") +
-                        MY_CS_NAME_SIZE))
-          return 1;
-        beg= const_cast<char *>(buf.ptr()) + old_len;
-        end= str_to_hex(beg, val, val_len);
-        buf.length(old_len + (end - beg));
-        if (buf.append(" COLLATE ") ||
-            buf.append(cs->name))
-          return 1;
+        char *p= strxmov(buf + val_offset, "_", cs->csname, " ", NullS);
+        p= str_to_hex(p, val, val_len);
+        p= strxmov(p, " COLLATE ", cs->name, NullS);
+        event_len= p-buf;
       }
-      protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
       break;
-    }
     case ROW_RESULT:
     default:
       DBUG_ASSERT(1);
       return 1;
     }
   }
+  buf[0]= '@';
+  memcpy(buf + 1, quoted_id, id_len);
+  buf[1 + id_len]= '=';
+  protocol->store(buf, event_len, &my_charset_bin);
+  my_free(buf);
   return 0;
 }
 #endif /* !MYSQL_CLIENT */
@@ -7808,20 +7781,22 @@
 void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
 {
   IO_CACHE *const head= &print_event_info->head_cache;
+  char quoted_id[1 + NAME_LEN * 2 + 2];// quoted length of the identifier
+  char name_id[NAME_LEN];
+  int quoted_len= 0;
 
   if (!print_event_info->short_form)
   {
     print_header(head, print_event_info, FALSE);
     my_b_printf(head, "\tUser_var\n");
   }
-
-  QUOTED_IDENTIFIER(quoted_name,
-		    512,
-		    '`',
-		    &my_charset_bin,
-		    name,
-		    name_len);
-  my_b_printf(head, "SET @%s", quoted_name.c_ptr());
+  strmov(name_id, name);
+  name_id[name_len]= '\0';
+  my_b_printf(head, "SET @");
+  quoted_len= my_strmov_quoted_identifier((char *) quoted_id,
+                                          (const char *) name_id);
+  quoted_id[quoted_len]= '\0';
+  my_b_write(head, (uchar*) quoted_id, quoted_len);
 
   if (is_null)
   {
@@ -7896,20 +7871,12 @@
         */
         my_b_printf(head, ":=???%s\n", print_event_info->delimiter);
       else
-      {
-	QUOTED_IDENTIFIER(quoted_charset_name,
-			  512,
-			  '`',
-			  &my_charset_bin,
-			  cs->name,
-			  strlen(cs->name));
-        my_b_printf(head, ":=_%s %s COLLATE %s%s\n",
-                    cs->csname, hex_str, quoted_charset_name.c_ptr(),
+        my_b_printf(head, ":=_%s %s COLLATE `%s`%s\n",
+                    cs->csname, hex_str, cs->name,
                     print_event_info->delimiter);
-      }
-      my_afree(hex_str);
+      my_free(hex_str);
+    }
       break;
-    }
     case ROW_RESULT:
     default:
       DBUG_ASSERT(1);
@@ -8294,7 +8261,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Create_file_log_event::pack_info(THD *thd, Protocol *protocol)
+int Create_file_log_event::pack_info(Protocol *protocol)
 {
   char buf[NAME_LEN*2 + 30 + 21*2], *pos;
   pos= strmov(buf, "db=");
@@ -8500,7 +8467,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Append_block_log_event::pack_info(THD *thd, Protocol *protocol)
+int Append_block_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
   size_t length;
@@ -8660,7 +8627,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Delete_file_log_event::pack_info(THD *thd, Protocol *protocol)
+int Delete_file_log_event::pack_info(Protocol *protocol)
 {
   char buf[64];
   size_t length;
@@ -8764,7 +8731,7 @@
 */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Execute_load_log_event::pack_info(THD *thd, Protocol *protocol)
+int Execute_load_log_event::pack_info(Protocol *protocol)
 {
   char buf[64];
   size_t length;
@@ -9037,26 +9004,36 @@
 
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Execute_load_query_log_event::pack_info(THD *thd, Protocol *protocol)
+int Execute_load_query_log_event::pack_info(Protocol *protocol)
 {
-  char buf_mem[1024];
-  char file_id_buf[22];
-  String buf(buf_mem, sizeof(buf_mem), system_charset_info);
-  buf.real_alloc(9 + db_len + q_len + 10 + 21);
+  char *buf, *pos;
+  if (!(buf= (char*) my_malloc(9 + (db_len * 2) + 2 + q_len + 10 + 21,
+                               MYF(MY_WME))))
+    return 1;
+  pos= buf;
   if (db && db_len)
   {
-    if (buf.append("use ") ||
-        append_identifier(thd, &buf, db, db_len) ||
-        buf.append("; "))
-      return 1;
-  }
-  if (query && q_len && buf.append(query, q_len))
-    return 1;
-  int10_to_str((long) file_id, file_id_buf, 10);
-  if (buf.append(" ;file_id=") ||
-      buf.append(file_id_buf))
-    return 1;
-  protocol->store(buf.ptr(), buf.length(), &my_charset_bin);
+    /*
+      Statically allocates room to store '\0' and an identifier
+      that may have NAME_LEN * 2 due to quoting and there are
+      two quoting characters that wrap them.
+    */
+    char quoted_db[1 + NAME_LEN * 2 + 2];// quoted length of the identifier
+    size_t size= 0;
+    size= my_strmov_quoted_identifier(this->thd, quoted_db, db, 0);
+    pos= strmov(buf, "use ");
+    memcpy(pos, quoted_db, size);
+    pos= strmov(pos + size, "; ");
+  }
+  if (query && q_len)
+  {
+    memcpy(pos, query, q_len);
+    pos+= q_len;
+  }
+  pos= strmov(pos, " ;file_id=");
+  pos= int10_to_str((long) file_id, pos, 10);
+  protocol->store(buf, pos-buf, &my_charset_bin);
+  my_free(buf);
   return 0;
 }
 
@@ -11661,7 +11638,7 @@
 #endif
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Rows_log_event::pack_info(THD *thd, Protocol *protocol)
+int Rows_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
   char const *const flagstr=
@@ -12390,7 +12367,7 @@
  */
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Table_map_log_event::pack_info(THD *thd, Protocol *protocol)
+int Table_map_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
   size_t bytes= my_snprintf(buf, sizeof(buf),
@@ -12411,21 +12388,9 @@
   if (!print_event_info->short_form)
   {
     print_header(&print_event_info->head_cache, print_event_info, TRUE);
-    QUOTED_IDENTIFIER(db_nam,
-		      512,
-		      '`',
-		      &my_charset_bin,
-		      m_dbnam,
-		      strlen(m_dbnam));
-    QUOTED_IDENTIFIER(tbl_nam,
-		      512,
-		      '`',
-		      &my_charset_bin,
-		      m_tblnam,
-		      strlen(m_tblnam));
     my_b_printf(&print_event_info->head_cache,
-                "\tTable_map: %s.%s mapped to number %llu\n",
-                db_nam.c_ptr(), tbl_nam.c_ptr(), m_table_id.id());
+                "\tTable_map: `%s`.`%s` mapped to number %llu\n",
+                m_dbnam, m_tblnam, m_table_id.id());
     print_base64(&print_event_info->body_cache, print_event_info, TRUE);
   }
 }
@@ -13231,7 +13196,7 @@
 
 
 #ifndef MYSQL_CLIENT
-int Incident_log_event::pack_info(THD *thd, Protocol *protocol)
+int Incident_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
   size_t bytes;
@@ -13326,7 +13291,7 @@
 
 #ifndef MYSQL_CLIENT
 /* Pack info for its unrecognized ignorable event */
-int Ignorable_log_event::pack_info(THD *, Protocol *protocol)
+int Ignorable_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
   size_t bytes;
@@ -13385,7 +13350,7 @@
 }
 
 #ifndef MYSQL_CLIENT
-int Rows_query_log_event::pack_info(THD *, Protocol *protocol)
+int Rows_query_log_event::pack_info(Protocol *protocol)
 {
   char *buf;
   size_t bytes;
@@ -13527,7 +13492,7 @@
 #endif
 
 #ifndef MYSQL_CLIENT
-int Gtid_log_event::pack_info(THD *, Protocol *protocol)
+int Gtid_log_event::pack_info(Protocol *protocol)
 {
   char buffer[MAX_SET_STRING_LENGTH + 1];
   size_t len= to_string(buffer);
@@ -13674,7 +13639,7 @@
 #endif
 
 #ifndef MYSQL_CLIENT
-int Previous_gtids_log_event::pack_info(THD *, Protocol *protocol)
+int Previous_gtids_log_event::pack_info(Protocol *protocol)
 {
   size_t length= 0;
   global_sid_lock->rdlock();

=== modified file 'sql/log_event.h'
--- sql/log_event.h	2014-06-04 14:48:06 +0000
+++ sql/log_event.h	2014-07-31 14:56:03 +0000
@@ -1222,8 +1222,7 @@
   */
   static void init_show_field_list(List<Item>* field_list);
 #ifdef HAVE_REPLICATION
-  int net_send(THD *thd, Protocol *protocol, const char* log_name,
-               my_off_t pos);
+  int net_send(Protocol *protocol, const char* log_name, my_off_t pos);
 
   /**
     Stores a string representation of this event in the Protocol.
@@ -1232,7 +1231,7 @@
     @retval 0 success
     @retval nonzero error
   */
-  virtual int pack_info(THD *thd, Protocol *protocol);
+  virtual int pack_info(Protocol *protocol);
 
 #endif /* HAVE_REPLICATION */
   virtual const char* get_db()
@@ -2174,7 +2173,7 @@
   virtual uchar mts_number_dbs() { return mts_accessed_dbs; }
 
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print_query_header(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info);
@@ -2460,11 +2459,9 @@
                      const Format_description_log_event* description_event);
 
 public:
-#ifndef MYSQL_CLIENT
-  void print_query(THD *thd, bool need_db, const char *cs, String *buf,
-                   my_off_t *fn_start, my_off_t *fn_end,
-                   const char *qualify_db);
-#endif
+  uint get_query_buffer_length();
+  void print_query(bool need_db, const char *cs, char *buf, char **end,
+                   char **fn_start, char **fn_end);
   ulong thread_id;
   ulong slave_proxy_id;
   uint32 table_name_len;
@@ -2525,7 +2522,7 @@
                   Name_resolution_context *context);
   const char* get_db() { return db; }
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -2624,7 +2621,7 @@
 #ifdef MYSQL_SERVER
   Start_log_event_v3();
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   Start_log_event_v3() {}
@@ -2796,7 +2793,7 @@
     :Log_event(thd_arg, 0, cache_type_arg, logging_type_arg),
     val(val_arg), type(type_arg) { }
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -2874,7 +2871,7 @@
     :Log_event(thd_arg, 0, cache_type_arg, logging_type_arg),
     seed1(seed1_arg), seed2(seed2_arg) { }
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -2923,7 +2920,7 @@
   xid(x)
   { }
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -2986,7 +2983,7 @@
     { 
       is_null= !val;
     }
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
 #endif
@@ -3128,7 +3125,7 @@
 		   uint ident_len_arg,
 		   ulonglong pos_arg, uint flags);
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -3189,7 +3186,7 @@
 			uchar* block_arg, uint block_len_arg,
 			bool using_trans);
 #ifdef HAVE_REPLICATION
-  int pack_info(THD *thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -3261,7 +3258,7 @@
   Append_block_log_event(THD* thd, const char* db_arg, uchar* block_arg,
 			 uint block_len_arg, bool using_trans);
 #ifdef HAVE_REPLICATION
-  int pack_info(THD* thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
   virtual int get_create_or_append() const;
 #endif /* HAVE_REPLICATION */
 #else
@@ -3302,7 +3299,7 @@
 #ifdef MYSQL_SERVER
   Delete_file_log_event(THD* thd, const char* db_arg, bool using_trans);
 #ifdef HAVE_REPLICATION
-  int pack_info(THD* thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -3343,7 +3340,7 @@
 #ifdef MYSQL_SERVER
   Execute_load_log_event(THD* thd, const char* db_arg, bool using_trans);
 #ifdef HAVE_REPLICATION
-  int pack_info(THD* thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -3453,7 +3450,7 @@
                                bool using_trans, bool immediate,
                                bool suppress_use, int errcode);
 #ifdef HAVE_REPLICATION
-  int pack_info(THD* thd, Protocol* protocol);
+  int pack_info(Protocol* protocol);
 #endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
@@ -3934,7 +3931,7 @@
 #endif
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int pack_info(THD* thd, Protocol *protocol);
+  virtual int pack_info(Protocol *protocol);
 #endif
 
 #ifdef MYSQL_CLIENT
@@ -4057,7 +4054,7 @@
   virtual Log_event_type get_general_type_code() = 0; /* General rows op type, no version */
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int pack_info(THD* thd, Protocol *protocol);
+  virtual int pack_info(Protocol *protocol);
 #endif
 
 #ifdef MYSQL_CLIENT
@@ -4718,7 +4715,7 @@
 #endif
 
 #ifdef MYSQL_SERVER
-  int pack_info(THD*, Protocol*);
+  int pack_info(Protocol*);
 #endif
 
   Incident_log_event(const char *buf, uint event_len,
@@ -4790,7 +4787,7 @@
   virtual ~Ignorable_log_event();
 
 #ifndef MYSQL_CLIENT
-  virtual int pack_info(THD*, Protocol*);
+  int pack_info(Protocol*);
 #endif
 
 #ifdef MYSQL_CLIENT
@@ -4821,7 +4818,7 @@
 #endif
 
 #ifndef MYSQL_CLIENT
-  virtual int pack_info(THD*, Protocol*);
+  int pack_info(Protocol*);
 #endif
 
   Rows_query_log_event(const char *buf, uint event_len,
@@ -4924,7 +4921,7 @@
 #endif
 
 #ifndef MYSQL_CLIENT
-  virtual int pack_info(THD*, Protocol*);
+  int pack_info(Protocol*);
 #endif
 
   Gtid_log_event(const char *buffer, uint event_len,
@@ -5062,7 +5059,7 @@
 #endif
 
 #ifndef MYSQL_CLIENT
-  virtual int pack_info(THD*, Protocol*);
+  int pack_info(Protocol*);
 #endif
 
   Previous_gtids_log_event(const char *buffer, uint event_len,

=== modified file 'sql/log_event_old.cc'
--- sql/log_event_old.cc	2014-03-17 10:59:40 +0000
+++ sql/log_event_old.cc	2014-07-31 14:56:03 +0000
@@ -1922,7 +1922,7 @@
 
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
-int Old_rows_log_event::pack_info(THD *thd, Protocol *protocol)
+int Old_rows_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
   char const *const flagstr=

=== modified file 'sql/log_event_old.h'
--- sql/log_event_old.h	2014-04-25 10:55:01 +0000
+++ sql/log_event_old.h	2014-07-31 14:56:03 +0000
@@ -110,7 +110,7 @@
   flag_set get_flags(flag_set flags_arg) const { return m_flags & flags_arg; }
 
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
-  virtual int pack_info(THD *thd, Protocol *protocol);
+  virtual int pack_info(Protocol *protocol);
 #endif
 
 #ifdef MYSQL_CLIENT

=== modified file 'sql/sql_base.cc'
--- sql/sql_base.cc	2014-06-04 14:48:06 +0000
+++ sql/sql_base.cc	2014-07-31 14:56:03 +0000
@@ -3933,44 +3933,28 @@
     entry->file->implicit_emptied= 0;
     if (mysql_bin_log.is_open())
     {
-      char query_buf[2*FN_REFLEN + 21];
-      String query(query_buf, sizeof(query_buf), system_charset_info);
-      query.length(0);
-      if (query.ptr())
-      {
-        /* this DELETE FROM is needed even with row-based binlogging */
-        query.append("DELETE FROM ");
-        append_identifier(thd, &query, share->db.str, share->db.length);
-        query.append(".");
-        append_identifier(thd, &query, share->table_name.str,
-                          share->table_name.length);
-        int errcode= query_error_code(thd, TRUE);
-        if (thd->binlog_query(THD::STMT_QUERY_TYPE,
-                              query.ptr(), query.length(),
-                              FALSE, FALSE, FALSE, errcode))
-          return FALSE;
-      }
-      else
+      bool error= false;
+      String temp_buf;
+      error= temp_buf.append("DELETE FROM ");
+      append_identifier(thd, &temp_buf, share->db.str, strlen(share->db.str));
+      error= temp_buf.append(".");
+      append_identifier(thd, &temp_buf, share->table_name.str,
+                        strlen(share->table_name.str));
+      int errcode= query_error_code(thd, TRUE);
+      if (thd->binlog_query(THD::STMT_QUERY_TYPE,
+                            temp_buf.c_ptr_safe(), temp_buf.length(),
+                            FALSE, TRUE, FALSE, errcode))
+        return TRUE;
+      if (error)
       {
         /*
           As replication is maybe going to be corrupted, we need to warn the
           DBA on top of warning the client (which will automatically be done
           because of MYF(MY_WME) in my_malloc() above).
         */
-	char q_db_c[512];
-	char q_table_name_c[512];
-	String q_db(q_db_c, sizeof(q_db_c), system_charset_info);
-	String q_table_name(q_table_name_c, sizeof(q_table_name), system_charset_info);
-	q_db.length(0);
-	q_table_name.length(0);
-	append_identifier(thd, &q_db, share->db.str, share->db.length);
-	append_identifier(thd,
-			  &q_table_name,
-			  share->table_name.str,
-			  share->table_name.length);
         sql_print_error("When opening HEAP table, could not allocate memory "
-                        "to write 'DELETE FROM %s.%s' to the binary log",
-                        q_db.c_ptr(), q_table_name.c_ptr());
+                        "to write 'DELETE FROM `%s`.`%s`' to the binary log",
+                        share->db.str, share->table_name.str);
         delete entry->triggers;
         return TRUE;
       }

=== modified file 'sql/sql_db.cc'
--- sql/sql_db.cc	2014-03-03 17:51:33 +0000
+++ sql/sql_db.cc	2014-07-31 14:56:03 +0000
@@ -541,6 +541,7 @@
                      bool silent)
 {
   char	 path[FN_REFLEN+16];
+  char	 tmp_query[FN_REFLEN+16];
   long result= 1;
   int error= 0;
   MY_STAT stat_info;
@@ -626,10 +627,23 @@
   {
     char *query;
     uint query_length;
+    char db_name_quoted[2 * FN_REFLEN + sizeof("create database ") + 2];
+    int id_len= 0;
 
-    query=        thd->query();
-    query_length= thd->query_length();
-    DBUG_ASSERT(query);
+    if (!thd->query())                          // Only in replication
+    {
+      id_len= my_strmov_quoted_identifier(thd, (char *) db_name_quoted, db,
+                                          0);
+      db_name_quoted[id_len]= '\0';
+      query= tmp_query;
+      query_length= (uint) (strxmov(tmp_query,"create database ",
+                                    db_name_quoted, NullS) - tmp_query);
+    }
+    else
+    {
+      query=        thd->query();
+      query_length= thd->query_length();
+    }
 
     ha_binlog_log_query(thd, 0, LOGCOM_CREATE_DB,
                         query, query_length,
@@ -881,11 +895,23 @@
   {
     const char *query;
     ulong query_length;
-
-    query= thd->query();
-    query_length= thd->query_length();
-    DBUG_ASSERT(query);
-
+    // quoted db name + wraping quote
+    char buffer_temp [2 * FN_REFLEN + 2];
+    int id_len= 0;
+    if (!thd->query())
+    {
+      /* The client used the old obsolete mysql_drop_db() call */
+      query= path;
+      id_len= my_strmov_quoted_identifier(thd, buffer_temp, db, strlen(db));
+      buffer_temp[id_len] ='\0';
+      query_length= (uint) (strxmov(path, "DROP DATABASE ", buffer_temp, "",
+                                     NullS) - path);
+    }
+    else
+    {
+      query= thd->query();
+      query_length= thd->query_length();
+    }
     if (mysql_bin_log.is_open())
     {
       int errcode= query_error_code(thd, TRUE);
@@ -916,8 +942,9 @@
   else if (mysql_bin_log.is_open() && !silent)
   {
     char *query, *query_pos, *query_end, *query_data_start;
+    char temp_identifier[ 2 * FN_REFLEN + 2];
     TABLE_LIST *tbl;
-    uint db_len;
+    uint db_len, id_length=0;
 
     if (!(query= (char*) thd->alloc(MAX_DROP_TABLE_Q_LEN)))
       goto exit; /* not much else we can do */
@@ -939,16 +966,8 @@
       if (exists)
         continue;
 
-      char quoted_name_c[FN_REFLEN+3];
-      String quoted_name(quoted_name_c,
-			 sizeof(quoted_name_c),
-			 system_charset_info);
-      quoted_name.length(0);
-      quoted_name.append_identifier(tbl->table_name,
-				    strlen(tbl->table_name),
-				    system_charset_info,
-				    '`');
-      tbl_name_len= quoted_name.length() + 1; /* +1 for the comma */
+      /* 3 for the quotes and the comma*/
+      tbl_name_len= strlen(tbl->table_name) + 3;
       if (query_pos + tbl_name_len + 1 >= query_end)
       {
         /*
@@ -962,8 +981,10 @@
         }
         query_pos= query_data_start;
       }
-
-      query_pos= strmov(query_pos, quoted_name.c_ptr());
+      id_length= my_strmov_quoted_identifier(thd, (char *)temp_identifier,
+                                      tbl->table_name, 0);
+      temp_identifier[id_length]= '\0';
+      query_pos= strmov(query_pos,(char *)&temp_identifier);
       *query_pos++ = ',';
     }
 

=== modified file 'sql/sql_load.cc'
--- sql/sql_load.cc	2014-06-04 14:48:06 +0000
+++ sql/sql_load.cc	2014-07-31 14:56:03 +0000
@@ -686,21 +686,20 @@
                                                bool transactional_table,
                                                int errcode)
 {
-  char                *load_data_query;
-  my_off_t            fname_start,
-                      fname_end;
+  char                *load_data_query,
+                      *end,
+                      *fname_start,
+                      *fname_end,
+                      *p= NULL;
+  size_t               pl= 0;
   List<Item>           fv;
-  Item                *item, *val;
+  Item                *item;
+  String              *str;
+  String               pfield, pfields;
   int                  n;
-  const char          *tbl;
+  const char          *tbl= table_name_arg;
   const char          *tdb= (thd->db != NULL ? thd->db : db_arg);
   String              string_buf;
-  const char          *qualify_db= NULL;
-  char                command_buffer[1024];
-  String              query_str(command_buffer, sizeof(command_buffer),
-                              system_charset_info);
-
-  query_str.length(0);
   if (!thd->db || strcmp(db_arg, thd->db))
   {
     /*
@@ -711,7 +710,6 @@
     string_buf.set_charset(system_charset_info);
     append_identifier(thd, &string_buf, db_arg, strlen(db_arg));
     string_buf.append(".");
-    qualify_db= db_arg;
   }
   append_identifier(thd, &string_buf, table_name_arg,
                     strlen(table_name_arg));
@@ -724,8 +722,6 @@
   */
   if (thd->lex->local_file)
     lle.set_fname_outside_temp_buf(ex->file_name, strlen(ex->file_name));
-  lle.print_query(thd, FALSE, (const char *) ex->cs?ex->cs->csname:NULL,
-                  &query_str, &fname_start, &fname_end, qualify_db);
 
   /*
     prepare fields-list and SET if needed; print_query won't do that for us.
@@ -734,51 +730,66 @@
   {
     List_iterator<Item>  li(thd->lex->field_list);
 
-    query_str.append(" (");
+    pfields.append(" (");
     n= 0;
 
     while ((item= li++))
     {
       if (n++)
-        query_str.append(", ");
+        pfields.append(", ");
       if (item->type() == Item::FIELD_ITEM)
-        append_identifier(thd, &query_str, item->item_name.ptr(),
+        append_identifier(thd, &pfields, item->item_name.ptr(),
                           strlen(item->item_name.ptr()));
       else
-      {
-        /* Actually Item_user_var_as_out_param despite claiming STRING_ITEM. */
-        DBUG_ASSERT(item->type() == Item::STRING_ITEM);
-        ((Item_user_var_as_out_param *)item)->print_for_load(thd, &query_str);
-      }
+        item->print(&pfields, QT_ORDINARY);
     }
-    query_str.append(")");
+    pfields.append(")");
   }
 
   if (!thd->lex->update_list.is_empty())
   {
     List_iterator<Item> lu(thd->lex->update_list);
-    List_iterator<Item> lv(thd->lex->value_list);
+    List_iterator<String> ls(thd->lex->load_set_str_list);
 
-    query_str.append(" SET ");
+    pfields.append(" SET ");
     n= 0;
 
     while ((item= lu++))
     {
-      val= lv++;
+      str= ls++;
       if (n++)
-        query_str.append(", ");
-      append_identifier(thd, &query_str, item->item_name.ptr(),
+        pfields.append(", ");
+      append_identifier(thd, &pfields, item->item_name.ptr(),
                         strlen(item->item_name.ptr()));
-      query_str.append(val->item_name.ptr());
+      // Extract exact Item value
+      str->copy();
+      pfields.append(str->ptr());
+      str->free();
     }
+    /*
+      Clear the SET string list once the SET command is reconstructed
+      as we donot require the list anymore.
+    */
+    thd->lex->load_set_str_list.empty();
   }
 
-  if (!(load_data_query= (char *)thd->strmake(query_str.ptr(), query_str.length())))
+  p= pfields.c_ptr_safe();
+  pl= strlen(p);
+
+  if (!(load_data_query= (char *)thd->alloc(lle.get_query_buffer_length() + 1 + pl)))
     return TRUE;
 
+  lle.print_query(FALSE, ex->cs ? ex->cs->csname : NULL,
+                  load_data_query, &end,
+                  &fname_start, &fname_end);
+
+  strcpy(end, p);
+  end += pl;
+
   Execute_load_query_log_event
-    e(thd, load_data_query, query_str.length(),
-      static_cast<uint>(fname_start - 1), static_cast<uint>(fname_end),
+    e(thd, load_data_query, end-load_data_query,
+      static_cast<uint>(fname_start - load_data_query - 1),
+      static_cast<uint>(fname_end - load_data_query),
       (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE :
       (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR),
       transactional_table, FALSE, FALSE, errcode);

=== modified file 'sql/sql_select.cc'
--- sql/sql_select.cc	2014-06-04 14:48:06 +0000
+++ sql/sql_select.cc	2014-07-31 14:56:03 +0000
@@ -78,7 +78,6 @@
   LEX *lex= thd->lex;
   register SELECT_LEX *select_lex = &lex->select_lex;
   DBUG_ENTER("handle_select");
- 
   MYSQL_SELECT_START(thd->query());
 
   if (lex->proc_analyse && lex->sql_command != SQLCOM_SELECT)

=== modified file 'sql/sql_show.cc'
--- sql/sql_show.cc	2014-07-23 05:17:52 +0000
+++ sql/sql_show.cc	2014-07-31 14:56:03 +0000
@@ -1118,17 +1118,49 @@
   packet                target string
   name                  the identifier to be appended
   name_length           length of the appending identifier
-
-  RETURN VALUES
-    true                Error
-    false               Ok
 */
 
-bool
+void
 append_identifier(THD *thd, String *packet, const char *name, uint length)
 {
-  int q= get_quote_char_for_identifier(thd, name, length);
-  return packet->append_identifier(name, length, system_charset_info, q);
+  const char *name_end;
+  char quote_char;
+  int q;
+  q= thd ? get_quote_char_for_identifier(thd, name, length) : '`';
+
+  if (q == EOF)
+  {
+    packet->append(name, length, packet->charset());
+    return;
+  }
+
+  /*
+    The identifier must be quoted as it includes a quote character or
+   it's a keyword
+  */
+
+  (void) packet->reserve(length*2 + 2);
+  quote_char= (char) q;
+  packet->append(&quote_char, 1, system_charset_info);
+
+  for (name_end= name+length ; name < name_end ; name+= length)
+  {
+    uchar chr= (uchar) *name;
+    length= my_mbcharlen(system_charset_info, chr);
+    /*
+      my_mbcharlen can return 0 on a wrong multibyte
+      sequence. It is possible when upgrading from 4.0,
+      and identifier contains some accented characters.
+      The manual says it does not work. So we'll just
+      change length to 1 not to hang in the endless loop.
+    */
+    if (!length)
+      length= 1;
+    if (length == 1 && chr == (uchar) quote_char)
+      packet->append(&quote_char, 1, system_charset_info);
+    packet->append(name, length, system_charset_info);
+  }
+  packet->append(&quote_char, 1, system_charset_info);
 }
 
 

=== modified file 'sql/sql_show.h'
--- sql/sql_show.h	2013-08-14 03:57:21 +0000
+++ sql/sql_show.h	2014-07-31 14:56:03 +0000
@@ -165,7 +165,7 @@
 int copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table);
 int get_quote_char_for_identifier(THD *thd, const char *name, uint length);
 
-bool append_identifier(THD *thd, String *packet, const char *name,
+void append_identifier(THD *thd, String *packet, const char *name,
 		       uint length);
 inline void append_identifier(THD *thd, String *packet, Simple_cstring str)
 {

=== modified file 'sql/sql_string.cc'
--- sql/sql_string.cc	2014-06-04 14:48:06 +0000
+++ sql/sql_string.cc	2014-07-31 14:56:03 +0000
@@ -575,49 +575,6 @@
   return FALSE;
 }
 
-bool String::append_identifier(const char *name,
-			       uint length,
-			       const CHARSET_INFO *ci,
-			       int quote_char)
-{
-  const char *name_end;
-  char q= (char)quote_char;
-  const CHARSET_INFO *lci = ci ? ci : charset();
-
-  if (quote_char == EOF)
-    return append(name, length, charset());
-
-  /*
-    The identifier must be quoted as it includes a quote character or
-   it's a keyword
-  */
-
-  (void)reserve(length*2 + 2);
-  if (append(&q, 1, lci))
-    return true;
-
-  for (name_end= name+length ; name < name_end ; name+= length)
-  {
-    uchar chr= (uchar) *name;
-    length= my_mbcharlen(lci, chr);
-    /*
-      my_mbcharlen can return 0 on a wrong multibyte
-      sequence. It is possible when upgrading from 4.0,
-      and identifier contains some accented characters.
-      The manual says it does not work. So we'll just
-      change length to 1 not to hang in the endless loop.
-    */
-    if (!length)
-      length= 1;
-    if (length == 1 && chr == (uchar) q &&
-        append(&q, 1, lci))
-      return true;
-    if (append(name, length, lci))
-      return true;
-  }
-  return append(&q, 1, lci);
-}
-
 uint32 String::numchars() const
 {
   return str_charset->cset->numchars(str_charset, Ptr, Ptr+str_length);
@@ -1085,47 +1042,39 @@
 
 
 
-/*
-  Append characters to a single-quoted string '...', escaping special
-  characters as necessary.
-  Does not add the enclosing quotes, this is left up to caller.
-*/
-void String::append_for_single_quote(const char *st, uint len)
+
+void String::print(String *str)
 {
-  const char *end= st+len;
+  char *st= (char*)Ptr, *end= st+str_length;
   for (; st < end; st++)
   {
     uchar c= *st;
     switch (c)
     {
     case '\\':
-      append(STRING_WITH_LEN("\\\\"));
+      str->append(STRING_WITH_LEN("\\\\"));
       break;
     case '\0':
-      append(STRING_WITH_LEN("\\0"));
+      str->append(STRING_WITH_LEN("\\0"));
       break;
     case '\'':
-      append(STRING_WITH_LEN("\\'"));
+      str->append(STRING_WITH_LEN("\\'"));
       break;
     case '\n':
-      append(STRING_WITH_LEN("\\n"));
+      str->append(STRING_WITH_LEN("\\n"));
       break;
     case '\r':
-      append(STRING_WITH_LEN("\\r"));
+      str->append(STRING_WITH_LEN("\\r"));
       break;
     case '\032': // Ctrl-Z
-      append(STRING_WITH_LEN("\\Z"));
+      str->append(STRING_WITH_LEN("\\Z"));
       break;
     default:
-      append(c);
+      str->append(c);
     }
   }
 }
 
-void String::print(String *str)
-{
-  str->append_for_single_quote(Ptr, str_length);
-}
 
 /*
   Exchange state of this object and argument.

=== modified file 'sql/sql_string.h'
--- sql/sql_string.h	2014-06-04 14:48:06 +0000
+++ sql/sql_string.h	2014-07-31 14:56:03 +0000
@@ -106,11 +106,6 @@
   }
 };
 
-#define QUOTED_IDENTIFIER(str_name, buf_size, q, cs, id_name, id_size) \
-	char buf_##str_name[(buf_size)]; \
-	String str_name((buf_##str_name), (buf_size), (cs)); \
-	str_name.length(0); \
-	str_name.append_identifier((id_name), (id_size), (cs), (q));
 
 class String;
 typedef struct charset_info_st CHARSET_INFO;
@@ -423,10 +418,6 @@
   bool append_with_prefill(const char *s, uint32 arg_length, 
 			   uint32 full_length, char fill_char);
   bool append_parenthesized(long nr, int radix= 10);
-  bool append_identifier(const char *name,
-			 uint length,
-			 const CHARSET_INFO *ci,
-			 int quote_char);
   int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   bool replace(uint32 offset,uint32 arg_length,const char *to,uint32 length);
@@ -529,7 +520,6 @@
     return FALSE;
   }
   void print(String *print);
-  void append_for_single_quote(const char *st, uint len);
 
   /* Swap two string objects. Efficient way to exchange data without memcpy. */
   void swap(String &s);

=== modified file 'sql/sql_truncate.cc'
--- sql/sql_truncate.cc	2014-06-04 14:48:06 +0000
+++ sql/sql_truncate.cc	2014-07-31 14:56:03 +0000
@@ -35,8 +35,7 @@
   @return TRUE on failure, FALSE otherwise.
 */
 
-static bool fk_info_append_fields(THD *thd, String *str,
-                                  List<LEX_STRING> *fields)
+static bool fk_info_append_fields(String *str, List<LEX_STRING> *fields)
 {
   bool res= FALSE;
   LEX_STRING *field;
@@ -44,7 +43,7 @@
 
   while ((field= it++))
   {
-    res|= append_identifier(thd, str, field->str, field->length);
+    append_identifier(NULL, str, field->str, field->length);
     res|= str->append(", ");
   }
 
@@ -76,24 +75,24 @@
     `db`.`tbl`, CONSTRAINT `id` FOREIGN KEY (`fk`) REFERENCES `db`.`tbl` (`fk`)
   */
 
-  res|= append_identifier(thd, &str, fk_info->foreign_db->str,
-                          fk_info->foreign_db->length);
+  append_identifier(NULL, &str, fk_info->foreign_db->str,
+                    fk_info->foreign_db->length);
   res|= str.append(".");
-  res|= append_identifier(thd, &str, fk_info->foreign_table->str,
-                          fk_info->foreign_table->length);
+  append_identifier(NULL, &str, fk_info->foreign_table->str,
+                    fk_info->foreign_table->length);
   res|= str.append(", CONSTRAINT ");
-  res|= append_identifier(thd, &str, fk_info->foreign_id->str,
-                          fk_info->foreign_id->length);
+  append_identifier(NULL, &str, fk_info->foreign_id->str,
+                    fk_info->foreign_id->length);
   res|= str.append(" FOREIGN KEY (");
-  res|= fk_info_append_fields(thd, &str, &fk_info->foreign_fields);
+  res|= fk_info_append_fields(&str, &fk_info->foreign_fields);
   res|= str.append(") REFERENCES ");
-  res|= append_identifier(thd, &str, fk_info->referenced_db->str,
-                          fk_info->referenced_db->length);
+  append_identifier(NULL, &str, fk_info->referenced_db->str,
+                    fk_info->referenced_db->length);
   res|= str.append(".");
-  res|= append_identifier(thd, &str, fk_info->referenced_table->str,
-                          fk_info->referenced_table->length);
+  append_identifier(NULL, &str, fk_info->referenced_table->str,
+                    fk_info->referenced_table->length);
   res|= str.append(" (");
-  res|= fk_info_append_fields(thd, &str, &fk_info->referenced_fields);
+  res|= fk_info_append_fields(&str, &fk_info->referenced_fields);
   res|= str.append(')');
 
   return res ? NULL : thd->strmake(str.ptr(), str.length());

=== modified file 'sql/sql_yacc.yy'
--- sql/sql_yacc.yy	2014-07-28 11:30:03 +0000
+++ sql/sql_yacc.yy	2014-07-31 14:56:03 +0000
@@ -13421,7 +13421,7 @@
                 lex->value_list.push_back($4) ||
                 lex->load_set_str_list.push_back(val))
                 MYSQL_YYABORT;
-            $4->item_name.copy_no_truncate($3, length, YYTHD->charset());
+            $4->item_name.copy($3, length, YYTHD->charset());
           }
         ;