mirror of
https://github.com/MariaDB/server.git
synced 2025-11-03 14:33:32 +03:00
02c901ee5e
PREPARE", review fixes: - make the patch follow the specification of WL#4166 and remove the new error that was originally introduced. Now the client never gets an error from reprepare, unless it failed. I.e. even if the statement at hand returns a completely different result set, this is not considered a server error. The C API library, that can not handle this situation, was modified to return a client error. Added additional test coverage. include/errmsg.h: Add a new client side error: now when we automatically reprepare a statement, the new result set may contain a different number of columns. include/mysql_com.h: Add a new server status to be sent to the client if the number of columns in the result set is different. libmysql/errmsg.c: Add a new error message. libmysql/libmysql.c: Make the client library robust against a result set that contains a different number of columns from prepare time. Previously that could never happen, and we simply had an assert. That means in particular that all clients are advised to upgrade with transition to 5.1, if they are using prepared statements C API. Make mysql_stmt_store_result() and mysql_stmt_execute() robust against "broken" statement handles (those that have an error). sql/sql_parse.cc: Clear transient server status flags at start of statement more systematically. sql/share/errmsg.txt: Remove an error that is unused and is not part of any public release. sql/sql_prepare.cc: Instead of returning an error in case the number of result set columns has changed, simply update the client in server status. That will allow modern clients automatically recover from an error. tests/mysql_client_test.c: Add additional coverage to the cases when the number of result set columns changed as a result of reprepare. Cover conversion and truncation of result set columns.
103 lines
3.8 KiB
C
103 lines
3.8 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Error messages for MySQL clients */
|
|
/* (Error messages for the daemon are in sql/share/errmsg.txt) */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
void init_client_errs(void);
|
|
void finish_client_errs(void);
|
|
extern const char *client_errors[]; /* Error messages */
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define CR_MIN_ERROR 2000 /* For easier client code */
|
|
#define CR_MAX_ERROR 2999
|
|
#if !defined(ER)
|
|
#define ER(X) client_errors[(X)-CR_MIN_ERROR]
|
|
#endif
|
|
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */
|
|
|
|
/* Do not add error numbers before CR_ERROR_FIRST. */
|
|
/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */
|
|
#define CR_ERROR_FIRST 2000 /*Copy first error nr.*/
|
|
#define CR_UNKNOWN_ERROR 2000
|
|
#define CR_SOCKET_CREATE_ERROR 2001
|
|
#define CR_CONNECTION_ERROR 2002
|
|
#define CR_CONN_HOST_ERROR 2003
|
|
#define CR_IPSOCK_ERROR 2004
|
|
#define CR_UNKNOWN_HOST 2005
|
|
#define CR_SERVER_GONE_ERROR 2006
|
|
#define CR_VERSION_ERROR 2007
|
|
#define CR_OUT_OF_MEMORY 2008
|
|
#define CR_WRONG_HOST_INFO 2009
|
|
#define CR_LOCALHOST_CONNECTION 2010
|
|
#define CR_TCP_CONNECTION 2011
|
|
#define CR_SERVER_HANDSHAKE_ERR 2012
|
|
#define CR_SERVER_LOST 2013
|
|
#define CR_COMMANDS_OUT_OF_SYNC 2014
|
|
#define CR_NAMEDPIPE_CONNECTION 2015
|
|
#define CR_NAMEDPIPEWAIT_ERROR 2016
|
|
#define CR_NAMEDPIPEOPEN_ERROR 2017
|
|
#define CR_NAMEDPIPESETSTATE_ERROR 2018
|
|
#define CR_CANT_READ_CHARSET 2019
|
|
#define CR_NET_PACKET_TOO_LARGE 2020
|
|
#define CR_EMBEDDED_CONNECTION 2021
|
|
#define CR_PROBE_SLAVE_STATUS 2022
|
|
#define CR_PROBE_SLAVE_HOSTS 2023
|
|
#define CR_PROBE_SLAVE_CONNECT 2024
|
|
#define CR_PROBE_MASTER_CONNECT 2025
|
|
#define CR_SSL_CONNECTION_ERROR 2026
|
|
#define CR_MALFORMED_PACKET 2027
|
|
#define CR_WRONG_LICENSE 2028
|
|
|
|
/* new 4.1 error codes */
|
|
#define CR_NULL_POINTER 2029
|
|
#define CR_NO_PREPARE_STMT 2030
|
|
#define CR_PARAMS_NOT_BOUND 2031
|
|
#define CR_DATA_TRUNCATED 2032
|
|
#define CR_NO_PARAMETERS_EXISTS 2033
|
|
#define CR_INVALID_PARAMETER_NO 2034
|
|
#define CR_INVALID_BUFFER_USE 2035
|
|
#define CR_UNSUPPORTED_PARAM_TYPE 2036
|
|
|
|
#define CR_SHARED_MEMORY_CONNECTION 2037
|
|
#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR 2038
|
|
#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR 2039
|
|
#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2040
|
|
#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR 2041
|
|
#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2042
|
|
#define CR_SHARED_MEMORY_MAP_ERROR 2043
|
|
#define CR_SHARED_MEMORY_EVENT_ERROR 2044
|
|
#define CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR 2045
|
|
#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2046
|
|
#define CR_CONN_UNKNOW_PROTOCOL 2047
|
|
#define CR_INVALID_CONN_HANDLE 2048
|
|
#define CR_SECURE_AUTH 2049
|
|
#define CR_FETCH_CANCELED 2050
|
|
#define CR_NO_DATA 2051
|
|
#define CR_NO_STMT_METADATA 2052
|
|
#define CR_NO_RESULT_SET 2053
|
|
#define CR_NOT_IMPLEMENTED 2054
|
|
#define CR_SERVER_LOST_EXTENDED 2055
|
|
#define CR_STMT_CLOSED 2056
|
|
#define CR_NEW_STMT_METADATA 2057
|
|
#define CR_ERROR_LAST /*Copy last error nr:*/ 2057
|
|
/* Add error numbers before CR_ERROR_LAST and change it accordingly. */
|
|
|