diff options
| author | unknown <eric@mysql.com> | 2005-11-21 07:05:14 -0800 |
|---|---|---|
| committer | unknown <eric@mysql.com> | 2005-11-21 07:05:14 -0800 |
| commit | f3b4b446c6c371ff5e581848bdc1b1df9481eb02 (patch) | |
| tree | 17a0006669d6dac004d4cf860ec522173e189693 | |
| parent | e8b14c4dbbe9be8a80e3a8eb68a36f441b1dde6d (diff) | |
| parent | 41924c641318928962c682e042286ec93d59186d (diff) | |
| download | mariadb-git-f3b4b446c6c371ff5e581848bdc1b1df9481eb02.tar.gz | |
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/eric/fed-err-mysql-5.0
| -rw-r--r-- | sql/ha_federated.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index d6d6b5980f6..c3ab5f11952 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -2615,7 +2615,7 @@ int ha_federated::stash_remote_error() { DBUG_ENTER("ha_federated::stash_remote_error()"); remote_error_number= mysql_errno(mysql); - my_snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE, + my_snprintf(remote_error_buf, sizeof(remote_error_buf), "%s", mysql_error(mysql)); DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM); } @@ -2630,7 +2630,7 @@ bool ha_federated::get_error_message(int error, String* buf) buf->append("Error on remote system: "); buf->qs_append(remote_error_number); buf->append(": "); - buf->append(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE); + buf->append(remote_error_buf); remote_error_number= 0; remote_error_buf[0]= '\0'; |