mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +01:00
321422c86e
flaws list)
TODO:
* verify that no sequence of API calls produces SIGSEGV.
That is, verify that mysql_stmt_init -> mysql_stmt_fetch is OK,
or mysql_stmt_prepare -> mysql_stmt_fetch_column is OK and sets
meaningful error.
* remove alloc_stmt_fields call
* revise stmt->state codes and statement states.
* there are other items in prepared statements 'to fix' document.
Done:
- cleanups and comments
- revision of prepared statement error codes.
- mysql_stmt_prepare is now can always be called (that is, you can reprepare
a statement)
- new implementation of mysql_stmt_close and fetch cancellation
include/errmsg.h:
- CR_NOT_ALL_PARAMS_BOUND - this error code wasn't used until now.
Apparently it was added in advance, but then interface of
mysql_stmt_bind_param changed. Now it's not possible to bind only some
parameters - either all or none of parameters are bound.
This error code is renamed to CR_PARAMS_NOT_BOUND
- CR_FETCH_CANCELLED - error code set on server side when fetch from
MYSQL_RES or MYSQL_STMT (in blocking mode) was cancelled because of
intercepting call to mysql_stmt_close
- CR_NO_DATA - this is proposed error code to return from
mysql_stmt_fetch_column if no row was fetched (by any type of fetch).
We always can fall back to CR_COMMANDS_OUT_OF_SYNC though.
Need reviewer's opinion on this one.
include/mysql.h:
- added unbuffered_fetch_owner member to MYSQL to point to MYSQL_RES
or MYSQL_STMT which is used to fetch result at the moment.
This is to be able to set CR_FETCH_CANCELLED error without fantoms.
- added unbuffered_fetch_cancelled boolean variable to MYSQL_STMT and
MYSQL_RES structures
- rename PREP_STMT_STATE -> enum enum_mysql_stmt_state
- members of MYSQL_STMT ordered by size.
- removed members of MYSQL_STMT: current_row, result_buffered,
last_fetched_column, last_fetched_buffer, query
- renamed members of MYSQL_STMT: param_buffers -> bind_param_done,
res_buffers -> bind_result_done
- now mysql_stmt_fetch calls stmt->read_row_func to read row either from
buffer or from network.
include/sql_common.h:
declaration for flush_use_result
libmysql/client_settings.h:
stmt_close declaration removed
libmysql/errmsg.c:
Error messages for changed and added error codes.
libmysql/libmysql.c:
Many changes:
- some unused variables removed
- cleanups
- better error reporting
- some function calls commented
- alloc_stmt_fields is now called right after execute, to not read
mysql->fields of some other statement
- new implementation of mysql_stmt_fetch - this is also with cursor
fetch in mind (to implement cursor fetch I'll just need to write
special read_row function for it, so this change will be local)
- implementation of fetch cancellation, including complete rewrite of
mysql_stmt_close
- now mysql_stmt_free_result doesn't free results of other statements.
sql-common/client.c:
- implementation of flush_use_result
- implementation of fetch cancellation
- changed behaviour of mysql_close in regard to mysql_stmt_close - now
mysql_close just set stmt->mysql to 0
91 lines
3.3 KiB
C
91 lines
3.3 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 demon is in share/language/errmsg.sys */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
void init_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() */
|
|
|
|
#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
|
|
|
|
/* new 4.1 error codes */
|
|
#define CR_NULL_POINTER 2028
|
|
#define CR_NO_PREPARE_STMT 2029
|
|
#define CR_PARAMS_NOT_BOUND 2030
|
|
#define CR_DATA_TRUNCATED 2031
|
|
#define CR_NO_PARAMETERS_EXISTS 2032
|
|
#define CR_INVALID_PARAMETER_NO 2033
|
|
#define CR_INVALID_BUFFER_USE 2034
|
|
#define CR_UNSUPPORTED_PARAM_TYPE 2035
|
|
|
|
#define CR_SHARED_MEMORY_CONNECTION 2036
|
|
#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR 2037
|
|
#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR 2038
|
|
#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2039
|
|
#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR 2040
|
|
#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2041
|
|
#define CR_SHARED_MEMORY_MAP_ERROR 2042
|
|
#define CR_SHARED_MEMORY_EVENT_ERROR 2043
|
|
#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR 2044
|
|
#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2045
|
|
#define CR_CONN_UNKNOW_PROTOCOL 2046
|
|
#define CR_INVALID_CONN_HANDLE 2047
|
|
#define CR_SECURE_AUTH 2048
|
|
#define CR_FETCH_CANCELLED 2049
|
|
#define CR_NO_DATA 2050
|