diff options
| author | unknown <davi@mysql.com/endora.local> | 2008-02-28 14:55:46 -0300 |
|---|---|---|
| committer | unknown <davi@mysql.com/endora.local> | 2008-02-28 14:55:46 -0300 |
| commit | 33a4e7609095388099bb3048778a5b5d164d26fa (patch) | |
| tree | 403f098823cf42179ec9f51f5bd0ccab5fc77112 /include/mysql_com.h | |
| parent | 944f2599fedfaa7c9a4348a2fd505419eb59a5b6 (diff) | |
| download | mariadb-git-33a4e7609095388099bb3048778a5b5d164d26fa.tar.gz | |
Bug#34655 Compile error
Rename client_last_error to last_error and client_last_errno to last_errno
to not break connectors which use the internal net structure for error handling.
include/mysql_com.h:
Rename client_last_error to last_error, client_last_errno to last_errno.
include/mysql_h.ic:
Rename client_last_error to last_error, client_last_errno to last_errno.
libmysql/libmysql.c:
Rename client_last_error to last_error, client_last_errno to last_errno.
libmysql/manager.c:
Rename client_last_error to last_error, client_last_errno to last_errno.
libmysqld/lib_sql.cc:
Rename client_last_error to last_error, client_last_errno to last_errno.
libmysqld/libmysqld.c:
Rename client_last_error to last_error, client_last_errno to last_errno.
server-tools/instance-manager/mysql_connection.cc:
Rename client_last_error to last_error, client_last_errno to last_errno.
sql/log_event.cc:
Rename client_last_error to last_error, client_last_errno to last_errno.
sql-common/client.c:
Rename client_last_error to last_error, client_last_errno to last_errno.
sql/log_event_old.cc:
Rename client_last_error to last_error, client_last_errno to last_errno.
sql/net_serv.cc:
Rename client_last_error to last_error, client_last_errno to last_errno.
sql/repl_failsafe.cc:
Rename client_last_error to last_error, client_last_errno to last_errno.
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 7eefad44716..cea98cebc61 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -217,12 +217,12 @@ typedef struct st_net { functions and methods to maintain proper locking. */ unsigned char *query_cache_query; - unsigned int client_last_errno; + unsigned int last_errno; unsigned char error; my_bool unused2; /* Please remove with the next incompatible ABI change. */ my_bool return_errno; /** Client library error message buffer. Actually belongs to struct MYSQL. */ - char client_last_error[MYSQL_ERRMSG_SIZE]; + char last_error[MYSQL_ERRMSG_SIZE]; /** Client library sqlstate buffer. Set along with the error message. */ char sqlstate[SQLSTATE_LENGTH+1]; void *extension; |