diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/my_global.h | 14 | ||||
| -rw-r--r-- | include/my_sys.h | 4 | ||||
| -rw-r--r-- | include/mysqld_error.h | 73 |
5 files changed, 52 insertions, 43 deletions
diff --git a/include/config-win.h b/include/config-win.h index c4e9588666e..6b40a0f2ed3 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -253,7 +253,6 @@ inline double ulonglong2double(ulonglong value) #define HAVE_PERROR #define HAVE_VFPRINT -#define HAVE_CHSIZE /* System has chsize() function */ #define HAVE_RENAME /* Have rename() as function */ #define HAVE_BINARY_STREAMS /* Have "b" flag in streams */ #define HAVE_LONG_JMP /* Have long jump function */ diff --git a/include/my_base.h b/include/my_base.h index 8c5496cc2e0..972a02e65cd 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -257,7 +257,8 @@ enum ha_base_keytype { #define HA_ERR_CANNOT_ADD_FOREIGN 150 /* Cannot add a foreign key constr. */ #define HA_ERR_NO_REFERENCED_ROW 151 /* Cannot add a child row */ #define HA_ERR_ROW_IS_REFERENCED 152 /* Cannot delete a parent row */ -#define HA_ERR_NON_UNIQUE_BLOCK_SIZE 153 /* Non unique key block size */ +#define HA_ERR_NO_SAVEPOINT 153 /* No savepoint with that name */ +#define HA_ERR_NON_UNIQUE_BLOCK_SIZE 154 /* Non unique key block size */ /* Other constants */ diff --git a/include/my_global.h b/include/my_global.h index 9de8e310d79..98f666548a5 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -43,6 +43,10 @@ #define HAVE_ERRNO_AS_DEFINE #endif /* __CYGWIN__ */ +#if defined(i386) && !defined(__i386__) +#define __i386__ +#endif + /* Macros to make switching between C and C++ mode easier */ #ifdef __cplusplus #define C_MODE_START extern "C" { @@ -283,7 +287,9 @@ C_MODE_END #endif #ifdef HAVE_ATOMIC_ADD #define __SMP__ +#ifndef CONFIG_SMP #define CONFIG_SMP +#endif #include <asm/atomic.h> #endif #include <errno.h> /* Recommended by debian */ @@ -660,7 +666,6 @@ typedef long my_ptrdiff_t; typedef long long my_ptrdiff_t; #endif - #define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1)) #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) /* Size to make adressable obj. */ @@ -920,8 +925,11 @@ typedef union { double v; long m[2]; } doubleget_union; -#define doubleget(V,M) { ((doubleget_union *)&V)->m[0] = *((long*) M); \ - ((doubleget_union *)&V)->m[1] = *(((long*) M)+1); } +#define doubleget(V,M) \ +{ doubleget_union _tmp; \ + _tmp.m[0] = *((long*)(M)); \ + _tmp.m[1] = *(((long*) (M))+1); \ + (V) = _tmp.v; } #define doublestore(T,V) { *((long *) T) = ((doubleget_union *)&V)->m[0]; \ *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; } #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } diff --git a/include/my_sys.h b/include/my_sys.h index e4125a2e7e6..688e8bfc9e3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -135,7 +135,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define QUICK_SAFEMALLOC sf_malloc_quick=1 #define NORMAL_SAFEMALLOC sf_malloc_quick=0 extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick; -extern ulonglong safemalloc_mem_limit; +extern ulonglong sf_malloc_mem_limit; #define CALLER_INFO_PROTO , const char *sFile, uint uLine #define CALLER_INFO , __FILE__, __LINE__ @@ -240,7 +240,7 @@ extern int NEAR my_umask, /* Default creation mask */ NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ NEAR my_dont_interrupt; /* call remember_intr when set */ extern my_bool NEAR mysys_uses_curses, my_use_symdir; -extern long lCurMemory,lMaxMemory; /* from safemalloc */ +extern ulong sf_malloc_cur_memory, sf_malloc_max_memory; extern ulong my_default_record_cache_size; extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 17ededfbb52..d2240b7a28e 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -253,39 +253,40 @@ #define ER_CANT_USE_OPTION_HERE 1234 #define ER_NOT_SUPPORTED_YET 1235 #define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 -#define ER_WRONG_FK_DEF 1237 -#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1238 -#define ER_CARDINALITY_COL 1239 -#define ER_SUBSELECT_NO_1_ROW 1240 -#define ER_UNKNOWN_STMT_HANDLER 1241 -#define ER_CORRUPT_HELP_DB 1242 -#define ER_CYCLIC_REFERENCE 1243 -#define ER_AUTO_CONVERT 1244 -#define ER_ILLEGAL_REFERENCE 1245 -#define ER_DERIVED_MUST_HAVE_ALIAS 1246 -#define ER_SELECT_REDUCED 1247 -#define ER_TABLENAME_NOT_ALLOWED_HERE 1248 -#define ER_NOT_SUPPORTED_AUTH_MODE 1249 -#define ER_SPATIAL_CANT_HAVE_NULL 1250 -#define ER_COLLATION_CHARSET_MISMATCH 1251 -#define ER_SLAVE_WAS_RUNNING 1252 -#define ER_SLAVE_WAS_NOT_RUNNING 1253 -#define ER_TOO_BIG_FOR_UNCOMPRESS 1254 -#define ER_ZLIB_Z_MEM_ERROR 1255 -#define ER_ZLIB_Z_BUF_ERROR 1256 -#define ER_ZLIB_Z_DATA_ERROR 1257 -#define ER_CUT_VALUE_GROUP_CONCAT 1258 -#define ER_WARN_TOO_FEW_RECORDS 1259 -#define ER_WARN_TOO_MANY_RECORDS 1260 -#define ER_WARN_NULL_TO_NOTNULL 1261 -#define ER_WARN_DATA_OUT_OF_RANGE 1262 -#define ER_WARN_DATA_TRUNCATED 1263 -#define ER_WARN_USING_OTHER_HANDLER 1264 -#define ER_CANT_AGGREGATE_2COLLATIONS 1265 -#define ER_DROP_USER 1266 -#define ER_REVOKE_GRANTS 1267 -#define ER_CANT_AGGREGATE_3COLLATIONS 1268 -#define ER_CANT_AGGREGATE_NCOLLATIONS 1269 -#define ER_VARIABLE_IS_NOT_STRUCT 1270 -#define ER_UNKNOWN_COLLATION 1271 -#define ER_ERROR_MESSAGES 272 +#define ER_SLAVE_IGNORED_TABLE 1237 +#define ER_WRONG_FK_DEF 1238 +#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1239 +#define ER_CARDINALITY_COL 1240 +#define ER_SUBSELECT_NO_1_ROW 1241 +#define ER_UNKNOWN_STMT_HANDLER 1242 +#define ER_CORRUPT_HELP_DB 1243 +#define ER_CYCLIC_REFERENCE 1244 +#define ER_AUTO_CONVERT 1245 +#define ER_ILLEGAL_REFERENCE 1246 +#define ER_DERIVED_MUST_HAVE_ALIAS 1247 +#define ER_SELECT_REDUCED 1248 +#define ER_TABLENAME_NOT_ALLOWED_HERE 1249 +#define ER_NOT_SUPPORTED_AUTH_MODE 1250 +#define ER_SPATIAL_CANT_HAVE_NULL 1251 +#define ER_COLLATION_CHARSET_MISMATCH 1252 +#define ER_SLAVE_WAS_RUNNING 1253 +#define ER_SLAVE_WAS_NOT_RUNNING 1254 +#define ER_TOO_BIG_FOR_UNCOMPRESS 1255 +#define ER_ZLIB_Z_MEM_ERROR 1256 +#define ER_ZLIB_Z_BUF_ERROR 1257 +#define ER_ZLIB_Z_DATA_ERROR 1258 +#define ER_CUT_VALUE_GROUP_CONCAT 1259 +#define ER_WARN_TOO_FEW_RECORDS 1260 +#define ER_WARN_TOO_MANY_RECORDS 1261 +#define ER_WARN_NULL_TO_NOTNULL 1262 +#define ER_WARN_DATA_OUT_OF_RANGE 1263 +#define ER_WARN_DATA_TRUNCATED 1264 +#define ER_WARN_USING_OTHER_HANDLER 1265 +#define ER_CANT_AGGREGATE_2COLLATIONS 1266 +#define ER_DROP_USER 1267 +#define ER_REVOKE_GRANTS 1268 +#define ER_CANT_AGGREGATE_3COLLATIONS 1269 +#define ER_CANT_AGGREGATE_NCOLLATIONS 1270 +#define ER_VARIABLE_IS_NOT_STRUCT 1271 +#define ER_UNKNOWN_COLLATION 1272 +#define ER_ERROR_MESSAGES 273 |