diff options
| author | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-07-25 17:24:59 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-07-25 17:24:59 -0700 |
| commit | 99dc9bdb4ff14a8f115d1512926a832a5b874841 (patch) | |
| tree | b5c54eabbb05b934f1bb1c83a800ef9e2beab7e0 /storage | |
| parent | c6a0b22419e107992a1c8724b902439aa2755dc0 (diff) | |
| parent | 85af6ba9e387b30ecb4eec53fd88918c50845e02 (diff) | |
| download | mariadb-git-99dc9bdb4ff14a8f115d1512926a832a5b874841.tar.gz | |
Merge xiphis.org:/anubis/antony/work/p2-bug25679.3
into xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1
storage/federated/ha_federated.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federated/ha_federated.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index f371ecb5bd7..ded0ce88484 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2831,6 +2831,7 @@ error: my_error(error_code, MYF(0), error_buffer); } else + if (remote_error_number != -1 /* error already reported */) { error_code= remote_error_number; my_error(error_code, MYF(0), ER(error_code)); |