mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
2a8556f32d
(crash on attempt to re-execute a statement with an open cursor) + post-review fixes. include/errmsg.h: Add a special error message when we attempt to mysql_stmt_fetch from a statement which has no result set. libmysql/errmsg.c: Error message text for CR_NO_RESULT_SET libmysql/libmysql.c: Move the code which frees result sets on client and closes the cursor on server, resets long data state on client and server. This makes one function out of two (mysql_stmt_reset and mysql_stmt_free_result), thus aggregating all related reset work in one place. sql-common/client.c: Fix one place where we flushed the pending result set of a statement, but didn't set unbuffered_fetch_cancelled flag. sql/share/errmsg.txt: Fix format of ER_UNKNOWN_STMT_HANDLER error message (needs to be fixed separately in 4.1). Add two new error messages for the case when we fetch from when there is no cursor and for the case when we attempt to execute a statement while there is a cursor. sql/sql_prepare.cc: Return error when we fetch while there is no open cursor and when we call execute while there is a pending cursor. Fix mysql_stmt_reset to close the open cursor if there is any. sql/sql_select.cc: free_items and free_root moved to Cursor::close(). sql/sql_select.h: A comment added. tests/mysql_client_test.c: A test case for Bug#9478, test the case of mysql_stmt_reset called for client-side cached result set and for the case with open cursor. All strcpy replaced with strmov (review request).
101 lines
3.7 KiB
C
101 lines
3.7 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 share/language/errmsg.sys) */
|
|
|
|
#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(OS2) && defined(MYSQL_SERVER)
|
|
#define CER(X) client_errors[(X)-CR_MIN_ERROR]
|
|
#elif !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_ERROR_LAST /*Copy last error nr:*/ 2053
|
|
/* Add error numbers before CR_ERROR_LAST and change it accordingly. */
|
|
|