diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-06 21:15:05 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-06 21:15:05 +0200 |
| commit | 3b0f8e896ae96395401f5177986c06d96c8f66d0 (patch) | |
| tree | b01c89759dacf84a203fb568b2be9505aebf9a96 /include | |
| parent | f67abe26fbadc52a14621a627c999e563b38bc8f (diff) | |
| parent | ae4323e0d9fcbbca12b65f811cadb993b816d636 (diff) | |
| download | mariadb-git-3b0f8e896ae96395401f5177986c06d96c8f66d0.tar.gz | |
merge fix
libmysql/libmysql.c:
Auto merged
libmysql/password.c:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/password.c:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/errmsg.h | 9 | ||||
| -rw-r--r-- | include/my_base.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 703395a3742..5f462565e33 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -28,7 +28,7 @@ extern const char *client_errors[]; /* Error messages */ #define CR_MIN_ERROR 2000 /* For easier client code */ #define CR_MAX_ERROR 2999 -#if defined(OS2) && defined( MYSQL_SERVER) +#if defined(OS2) && defined(MYSQL_SERVER) #define CER(X) client_errors[(X)-CR_MIN_ERROR] #else #define ER(X) client_errors[(X)-CR_MIN_ERROR] @@ -51,8 +51,8 @@ extern const char *client_errors[]; /* Error messages */ #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_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 @@ -62,9 +62,9 @@ extern const char *client_errors[]; /* Error messages */ #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_INVALID_CONN_HANDLE 2027 #define CR_NULL_POINTER 2028 #define CR_NO_PREPARE_STMT 2029 #define CR_NOT_ALL_PARAMS_BOUND 2030 @@ -85,3 +85,4 @@ extern const char *client_errors[]; /* Error messages */ #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 diff --git a/include/my_base.h b/include/my_base.h index b4e39952f22..ccca3f74ec4 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -110,7 +110,8 @@ enum ha_extra_function { HA_EXTRA_BULK_INSERT_BEGIN, HA_EXTRA_BULK_INSERT_FLUSH, /* Flush one index */ HA_EXTRA_BULK_INSERT_END, - HA_EXTRA_PREPARE_FOR_DELETE + HA_EXTRA_PREPARE_FOR_DELETE, + HA_EXTRA_PREPARE_FOR_UPDATE /* Remove read cache if problems */ }; /* The following is parameter to ha_panic() */ |