diff options
| author | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
| commit | 62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a (patch) | |
| tree | 4e2cfa6a6a8032773454e22aa802b2798b2935b8 /include | |
| parent | 96458f8f64641d5b974a17733af8c709b513bfe0 (diff) | |
| parent | 0944bed7fcb59fb38230a750bd820a22b3b6b476 (diff) | |
| download | mariadb-git-62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a.tar.gz | |
Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 8 | ||||
| -rw-r--r-- | include/my_global.h | 8 | ||||
| -rw-r--r-- | include/myisam.h | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 0ba8dd2cf43..d28bb25cd09 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -229,7 +229,13 @@ inline double ulonglong2double(ulonglong value) ((uint32) (uchar) (A)[0]))) #define sint4korr(A) (*((long *) (A))) #define uint2korr(A) (*((uint16 *) (A))) -#define uint3korr(A) (long) (*((unsigned long *) (A)) & 0xFFFFFF) +/* + ATTENTION ! + + Please, note, uint3korr reads 4 bytes (not 3) ! + It means, that you have to provide enough allocated space ! +*/ +#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF) #define uint4korr(A) (*((unsigned long *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ diff --git a/include/my_global.h b/include/my_global.h index 89a5363dc4b..8e2e8e0eb6a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -919,7 +919,13 @@ typedef char bool; /* Ordinary boolean values 0 1 */ (((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16)) #else -#define uint3korr(A) (long) (*((unsigned long *) (A)) & 0xFFFFFF) +/* + ATTENTION ! + + Please, note, uint3korr reads 4 bytes (not 3) ! + It means, that you have to provide enough allocated space ! +*/ +#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF) #endif #define uint4korr(A) (*((unsigned long *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ diff --git a/include/myisam.h b/include/myisam.h index 02c56115dfd..6d097770646 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -98,6 +98,7 @@ typedef struct st_mi_create_info ha_rows reloc_rows; ulonglong auto_increment; ulonglong data_file_length; + ulonglong key_file_length; uint raid_type,raid_chunks; ulong raid_chunksize; uint old_options; |