bug#14548159: upmerge from mysql-5.1 -> mysql-5.5

sql/ha_ndbcluster_binlog.cc

@@ -1335,7 +1335,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
                                             new_table_name, 0);
     quoted_table2[id_length]= '\0';
     query_length= (uint) (strxmov(tmp_buf2, "rename table ",
-                                  quoted_db1, ".", quoted_table_1, " to ",
+                                  quoted_db1, ".", quoted_table1, " to ",
                                   quoted_db2, ".", quoted_table2, NullS) - tmp_buf2);
     type_str= "rename table";
     break;

sql/log_event.cc

@@ -4374,7 +4374,8 @@ void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
 #else
     quoted_id_len= my_strmov_quoted_identifier((char *) quoted_id, db);
 #endif
-    pos+= quoted_id_len;
+    quoted_id[quoted_id_len]= '\0';
+    pos= strmov(pos, quoted_id);
     pos= strmov(pos, "; ");
   }