diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-02-07 15:29:46 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-02-07 15:29:46 -0700 |
| commit | 0d876509340f0ba5ae67b4645137c863182ab9f4 (patch) | |
| tree | d9192c46a4eb4d83decc75bbeac94c01eba13040 /sql/sql_load.cc | |
| parent | 552656c3ba5e3604fabc656f8b7dec805febb91b (diff) | |
| download | mariadb-git-0d876509340f0ba5ae67b4645137c863182ab9f4.tar.gz | |
fixes for slave backward compat
fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE,
which is still buggy. Will push this one after the pull/merge
mysql-test/r/rpl000001.result:
fixed bug in result
sql/log_event.cc:
fixes for slave backward compat
sql/log_event.h:
fixes for slave backward compat
sql/mysql_priv.h:
fixes for slave backward compat
sql/net_serv.cc:
fixes for slave backward compat
sql/repl_failsafe.cc:
fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
fixes for slave backward compat
sql/slave.h:
fixes for slave backward compat
sql/sql_load.cc:
fixes for slave backward compat
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index abc9fa5a121..899f2e20469 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -147,12 +147,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (read_file_from_client && (thd->client_capabilities & CLIENT_LOCAL_FILES)) { - char tmp [FN_REFLEN+1],*end; - DBUG_PRINT("info",("reading local file")); - tmp[0] = (char) 251; /* NULL_LENGTH */ - end=strnmov(tmp+1,ex->file_name,sizeof(tmp)-2); - (void) my_net_write(&thd->net,tmp,(uint) (end-tmp)); - (void) net_flush(&thd->net); + (void)net_request_file(&thd->net,ex->file_name); file = -1; } else |