diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-07-16 16:43:46 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-07-16 16:43:46 +0300 |
| commit | 24c08f5279ff350495d7334dcecd470a3c88cefb (patch) | |
| tree | 7f0afa896553b43ed75c07da98ae83fffd17820d /storage/federatedx | |
| parent | 9f96097a05f6fb4abd25d09c85e92cdb94b486c9 (diff) | |
| download | mariadb-git-24c08f5279ff350495d7334dcecd470a3c88cefb.tar.gz | |
Fixed wrong error message from federatedx (which could lead to assert in DBUG code)
mysql-test/suite/federated/federated_server.result:
Update to new error message
mysql-test/suite/federated/federated_server.test:
Update to new error message
storage/federatedx/ha_federatedx.cc:
Return real error code, not 0, as in some cases before.
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 57bfb1148bf..435530e8caa 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -2995,7 +2995,6 @@ int ha_federatedx::rnd_pos(uchar *buf, uchar *pos) int ha_federatedx::info(uint flag) { - char error_buffer[FEDERATEDX_QUERY_BUFFER_SIZE]; uint error_code; federatedx_io *tmp_io= 0, **iop= 0; DBUG_ENTER("ha_federatedx::info"); @@ -3037,12 +3036,10 @@ int ha_federatedx::info(uint flag) error: if (iop && *iop) { - my_sprintf(error_buffer, (error_buffer, ": %d : %s", - (*iop)->error_code(), (*iop)->error_str())); - my_error(error_code, MYF(0), error_buffer); + my_printf_error((*iop)->error_code(), "Got error: %d : %s", MYF(0), + (*iop)->error_code(), (*iop)->error_str()); } - else - if (remote_error_number != -1 /* error already reported */) + else if (remote_error_number != -1 /* error already reported */) { error_code= remote_error_number; my_error(error_code, MYF(0), ER(error_code)); |