Commit 6d0574d3 authored by Rohit Kalhans's avatar Rohit Kalhans

BUG#14548159: Followup patch to fix some issues on PB2

parent 5f003eca
...@@ -1307,7 +1307,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share, ...@@ -1307,7 +1307,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
new_table_name, 0); new_table_name, 0);
quoted_table2[id_length]= '\0'; quoted_table2[id_length]= '\0';
query_length= (uint) (strxmov(tmp_buf2, "rename table ", 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); quoted_db2, ".", quoted_table2, NullS) - tmp_buf2);
type_str= "rename table"; type_str= "rename table";
break; break;
......
...@@ -4259,7 +4259,7 @@ uint Load_log_event::get_query_buffer_length() ...@@ -4259,7 +4259,7 @@ uint Load_log_event::get_query_buffer_length()
void Load_log_event::print_query(bool need_db, const char *cs, char *buf, void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
char **end, char **fn_start, char **fn_end) char **end, char **fn_start, char **fn_end)
{ {
char quoted_id[1 + NAME_LEN * 2 + 2];//quoted length char quoted_id[1 + NAME_LEN * 2 + 2];//quoted length
int quoted_id_len= 0; int quoted_id_len= 0;
char *pos= buf; char *pos= buf;
...@@ -4272,7 +4272,8 @@ void Load_log_event::print_query(bool need_db, const char *cs, char *buf, ...@@ -4272,7 +4272,8 @@ void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
#else #else
quoted_id_len= my_strmov_quoted_identifier((char *) quoted_id, db); quoted_id_len= my_strmov_quoted_identifier((char *) quoted_id, db);
#endif #endif
pos+= quoted_id_len; quoted_id[quoted_id_len]= '\0';
pos= strmov(pos, quoted_id);
pos= strmov(pos, "; "); pos= strmov(pos, "; ");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment