diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-11 13:09:01 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-11 13:09:01 -0700 |
| commit | 695c8120e14a0e8a35a64f294f976d75e472cbc1 (patch) | |
| tree | e4329d2ee6fbe926af0008b3053b1a100f6a373f /sql | |
| parent | 7429b2e1e830911fe73b37aa3c201e6774114c34 (diff) | |
| download | mariadb-git-695c8120e14a0e8a35a64f294f976d75e472cbc1.tar.gz | |
sql/sql_repl.cc
last fix in send_file() was wrong
sql/sql_repl.cc:
last fix in send_file() was wrong
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 27523a18481..6b7dd30424c 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -34,7 +34,7 @@ static int send_file(THD *thd) char fname[FN_REFLEN+1]; char *buf; const char *errmsg = 0; - int old_timeout,fname_len; + int old_timeout,packet_len; DBUG_ENTER("send_file"); // the client might be slow loading the data, give him wait_timeout to do @@ -51,13 +51,13 @@ static int send_file(THD *thd) // we need net_flush here because the client will not know it needs to send // us the file name until it has processed the load event entry - if (net_flush(net) || (fname_len = my_net_read(net)) == packet_error) + if (net_flush(net) || (packet_len = my_net_read(net)) == packet_error) { errmsg = "Failed reading file name"; goto err; } - *((char*)net->read_pos + 1 + fname_len) = 0; // terminate with \0 + *((char*)net->read_pos + packet_len) = 0; // terminate with \0 //for fn_format fn_format(fname, (char*)net->read_pos + 1, "", "", 4); // this is needed to make replicate-ignore-db |