diff options
author | Michael Widenius <monty@askmonty.org> | 2012-09-22 15:30:24 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-09-22 15:30:24 +0300 |
commit | 3e83c4e8f90851040be921443b52144a2862444a (patch) | |
tree | f76ee35018c73f2034e0e6e42c89c038f920f495 /include | |
parent | 513923868545338c00390f35f63b92efd55f50bb (diff) | |
parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
download | mariadb-git-3e83c4e8f90851040be921443b52144a2862444a.tar.gz |
Automatic merge
Diffstat (limited to 'include')
-rw-r--r-- | include/CMakeLists.txt | 1 | ||||
-rw-r--r-- | include/handler_state.h | 21 | ||||
-rw-r--r-- | include/lf.h | 2 | ||||
-rw-r--r-- | include/my_sys.h | 1 |
4 files changed, 24 insertions, 1 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index a90238dbd42..95850da382b 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -51,6 +51,7 @@ SET(HEADERS m_ctype.h my_attribute.h my_compiler.h + handler_state.h ) INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) diff --git a/include/handler_state.h b/include/handler_state.h new file mode 100644 index 00000000000..65604a672fb --- /dev/null +++ b/include/handler_state.h @@ -0,0 +1,21 @@ +/* + Map handler error message to sql states. Note that this list MUST be in + increasing order! + See sql_state.c for usage +*/ + +{ HA_ERR_KEY_NOT_FOUND, "02000", "" }, +{ HA_ERR_FOUND_DUPP_KEY, "23000", "" }, +{ HA_ERR_WRONG_COMMAND, "0A000", "" }, +{ HA_ERR_UNSUPPORTED, "0A000", "" }, +{ HA_WRONG_CREATE_OPTION, "0A000", "" }, +{ HA_ERR_FOUND_DUPP_UNIQUE, "23000", "" }, +{ HA_ERR_UNKNOWN_CHARSET, "0A000", "" }, +{ HA_ERR_READ_ONLY_TRANSACTION, "25000", "" }, +{ HA_ERR_LOCK_DEADLOCK, "40001", "" }, +{ HA_ERR_NO_REFERENCED_ROW, "23000", "" }, +{ HA_ERR_ROW_IS_REFERENCED, "23000", "" }, +{ HA_ERR_TABLE_EXIST, "42S01", "" }, +{ HA_ERR_FOREIGN_DUPLICATE_KEY, "23000", "" }, +{ HA_ERR_TABLE_READONLY, "25000", "" }, +{ HA_ERR_AUTOINC_ERANGE, "22003", "" }, diff --git a/include/lf.h b/include/lf.h index cdd24c07502..07769d10943 100644 --- a/include/lf.h +++ b/include/lf.h @@ -95,7 +95,7 @@ nolock_wrap(lf_dynarray_iterate, int, */ #define LF_PINBOX_PINS 4 -#define LF_PURGATORY_SIZE 10 +#define LF_PURGATORY_SIZE 100 typedef void lf_pinbox_free_func(void *, void *, void*); diff --git a/include/my_sys.h b/include/my_sys.h index 4e993f92d1b..1d666cb4a60 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -85,6 +85,7 @@ typedef struct my_aio_result { #define MY_THREADSAFE 2048 /* my_seek(): lock fd mutex */ #define MY_SYNC 4096 /* my_copy(): sync dst file */ #define MY_SYNC_DIR 32768 /* my_create/delete/rename: sync directory */ +#define MY_SYNC_FILESIZE 65536 /* my_sync(): safe sync when file is extended */ #define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ |