diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-07-17 01:57:55 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-07-17 01:57:55 +0300 |
| commit | f58199f6f6b4795ab5d0db65ebdde8bd4897333e (patch) | |
| tree | 8817e17ed4d7ad710531c811d1d5df2138514f47 /storage/federatedx | |
| parent | 178f18467e3b2e69fdbdce19c21041bc6fcd0e77 (diff) | |
| parent | 24c08f5279ff350495d7334dcecd470a3c88cefb (diff) | |
| download | mariadb-git-f58199f6f6b4795ab5d0db65ebdde8bd4897333e.tar.gz | |
Merge with MariaDB 5.1
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 541c7550092..54893558ffe 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)); |