mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug#18207212 : FILE NAME IS NOT ESCAPED IN BINLOG FOR LOAD DATA INFILE STATEMENT
Problem: Load_log_event::print_query() function does not put escape character in file name for "LOAD DATA INFILE" statement. Analysis: When we have "'" in our file name for "LOAD DATA INFILE" statement, Load_log_event::print_query() function does not put escape character in our file name. This one result that when we show binary-log, we get file name without escape character. Solution: To put escape character when we have "'" in file name, for this instead of using simple memcpy() to put file-name, we will use pretty_print_str().
This commit is contained in:
@ -4384,7 +4384,7 @@ 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 +
|
||||
18 + fname_len + 2 + // "LOAD DATA INFILE 'file''"
|
||||
18 + fname_len*4 + 2 + // "LOAD DATA INFILE 'file''"
|
||||
11 + // "CONCURRENT "
|
||||
7 + // LOCAL
|
||||
9 + // " REPLACE or IGNORE "
|
||||
@ -4430,9 +4430,9 @@ void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
|
||||
|
||||
if (check_fname_outside_temp_buf())
|
||||
pos= strmov(pos, "LOCAL ");
|
||||
pos= strmov(pos, "INFILE '");
|
||||
memcpy(pos, fname, fname_len);
|
||||
pos= strmov(pos+fname_len, "' ");
|
||||
pos= strmov(pos, "INFILE ");
|
||||
pos= pretty_print_str(pos, fname, fname_len);
|
||||
pos= strmov(pos, " ");
|
||||
|
||||
if (sql_ex.opt_flags & REPLACE_FLAG)
|
||||
pos= strmov(pos, "REPLACE ");
|
||||
@ -7339,9 +7339,9 @@ void Execute_load_query_log_event::print(FILE* file,
|
||||
if (local_fname)
|
||||
{
|
||||
my_b_write(&cache, (uchar*) query, fn_pos_start);
|
||||
my_b_printf(&cache, " LOCAL INFILE \'");
|
||||
my_b_printf(&cache, "%s", local_fname);
|
||||
my_b_printf(&cache, "\'");
|
||||
my_b_printf(&cache, " LOCAL INFILE ");
|
||||
pretty_print_str(&cache, local_fname, strlen(local_fname));
|
||||
|
||||
if (dup_handling == LOAD_DUP_REPLACE)
|
||||
my_b_printf(&cache, " REPLACE");
|
||||
my_b_printf(&cache, " INTO");
|
||||
|
Reference in New Issue
Block a user