diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-07 21:53:35 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-07 21:53:35 -0700 |
| commit | 417f8c3fde9ac028bb1be4147edf67318af78f8d (patch) | |
| tree | 6b792dbc929c8c615667d2c866eb646050f003d0 | |
| parent | 1324803d765267696b4d75b5d0a2546dc2686881 (diff) | |
| parent | 4d3f79265b2dc26f085161ac70cf17a7ae2d56e8 (diff) | |
| download | mariadb-git-417f8c3fde9ac028bb1be4147edf67318af78f8d.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Auto converge
| -rw-r--r-- | .bzrignore | 4 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 | ||||
| -rw-r--r-- | sql/slave.cc | 3 | ||||
| -rw-r--r-- | sql/sql_load.cc | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index eff6aeb4967..763c926eb1b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -425,3 +425,7 @@ mysql-test/var/slave-data/mysql-bin.012 mysql-test/var/slave-data/mysql-bin.013 mysql-test/var/slave-data/mysql-bin.014 mysql-test/var/slave-data/mysql-bin.index +BitKeeper/tmp/applied.list +BitKeeper/tmp/backup.list +BitKeeper/tmp/backup.sfio +BitKeeper/tmp/sfile.list diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index fb7d3b9d9c5..95b2857507d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,5 +1,5 @@ jani@prima.mysql.com +jani@prima.mysql.fi sasha@mysql.sashanet.com sasha@work.mysql.com serg@serg.mysql.com -jani@prima.mysql.fi diff --git a/sql/slave.cc b/sql/slave.cc index ece6341ca16..b68dc8023ae 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -874,6 +874,9 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) if(mysql_load(thd, &ex, &tables, fields, handle_dup, 1, TL_WRITE)) thd->query_error = 1; + if(thd->cuted_fields) + sql_print_error("Slave: load data infile at position %d in log \ +'%s' produced %d warning(s)", glob_mi.pos, RPL_LOG_NAME, thd->cuted_fields ); net->pkt_nr = thd->net.pkt_nr; } else // we will just ask the master to send us /dev/null if we do not want to diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 7c2d77ce3fc..b73f6893225 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -241,7 +241,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, sprintf(name,ER(ER_LOAD_INFO),info.records,info.deleted, info.records-info.copied,thd->cuted_fields); send_ok(&thd->net,info.copied+info.deleted,0L,name); - mysql_update_log.write(thd,thd->query,thd->query_length); + // on the slave thd->query is never initialized + if(!thd->slave_thread) + mysql_update_log.write(thd,thd->query,thd->query_length); if (!table->file->has_transactions()) thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; |