mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 13:45:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Rohit Kalhans 2012-09-23 15:51:23 +05:30
commit 2d4b31da9b
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/ha_ndbcluster_binlog.cc
View file

@ -1335,7 +1335,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;

5
sql/log_event.cc
View file

@ -4361,7 +4361,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;
@ -4374,7 +4374,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, "; ");
} }