diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
| commit | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (patch) | |
| tree | daff81c02baa6c2581d6abe3d746b8f35ee44f32 /sql/sql_load.cc | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| parent | 39df665a3332bd9bfb2529419f534a49cfac388c (diff) | |
| download | mariadb-git-cb86ce60b9bade5ae7712d8f3f74668208ee3fd2.tar.gz | |
Merge MDEV-4506: Parallel replication into 10.0-base.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 774f1b2a56d..0bd01d4ea2e 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -363,11 +363,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, MY_RETURN_REAL_PATH); } - if (thd->rli_slave) + if (thd->rgi_slave) { #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) - if (strncmp(thd->rli_slave->slave_patternload_file, name, - thd->rli_slave->slave_patternload_file_size)) + if (strncmp(thd->rgi_slave->rli->slave_patternload_file, name, + thd->rgi_slave->rli->slave_patternload_file_size)) { /* LOAD DATA INFILE in the slave SQL Thread can only read from |