diff options
| author | unknown <mats@romeo.(none)> | 2007-04-20 10:55:50 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-04-20 10:55:50 +0200 |
| commit | 36cd88dc28ef6a59fc54265c5155955f1aaabbbe (patch) | |
| tree | e3c80d62d99144a6e130966316db33fcf47905f2 /sql/slave.cc | |
| parent | dadde7fb866f0d25599e471907d2d7c0256af8ec (diff) | |
| parent | 8bc4d1828989af457864483e11186bc172d677bf (diff) | |
| download | mariadb-git-36cd88dc28ef6a59fc54265c5155955f1aaabbbe.tar.gz | |
Merge romeo.(none):/home/bk/merge-mysql-5.0
into romeo.(none):/home/bk/merge-mysql-5.1
client/mysql.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
configure.in:
Merging 5.0 into 5.1
sql/slave.cc:
Merging 5.0 into 5.1
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f689f663c6b..f1b9ea8476b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1634,6 +1634,7 @@ int check_expected_error(THD* thd, RELAY_LOG_INFO const *rli, switch (expected_error) { case ER_NET_READ_ERROR: case ER_NET_ERROR_ON_WRITE: + case ER_QUERY_INTERRUPTED: case ER_SERVER_SHUTDOWN: case ER_NEW_ABORTING_CONNECTION: DBUG_RETURN(1); |