diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-13 22:26:08 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-13 22:26:08 +0100 |
| commit | 898f6f48b79d1f2c334fb559225b2b0fade5ea93 (patch) | |
| tree | 84df8eecd942b650f172cbd67050ee8984c0d52b /storage/xtradb/mach | |
| parent | 275c0a7f96502b33f763fb9388dcc1c289e4792b (diff) | |
| parent | 2bde0c5e6d31583e5197e3b513f572a693161f62 (diff) | |
| download | mariadb-git-898f6f48b79d1f2c334fb559225b2b0fade5ea93.tar.gz | |
Merge XtraDB 8 into MariaDB.
Diffstat (limited to 'storage/xtradb/mach')
| -rw-r--r-- | storage/xtradb/mach/mach0data.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/storage/xtradb/mach/mach0data.c b/storage/xtradb/mach/mach0data.c index 5deb475318d..e030ce9aadf 100644 --- a/storage/xtradb/mach/mach0data.c +++ b/storage/xtradb/mach/mach0data.c @@ -16,7 +16,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA *****************************************************************************/ -/********************************************************************** +/******************************************************************//** +@file mach/mach0data.c Utilities for converting data from the database file to the machine format. @@ -29,17 +30,16 @@ Created 11/28/1995 Heikki Tuuri #include "mach0data.ic" #endif -/************************************************************* -Reads a ulint in a compressed form if the log record fully contains it. */ +/*********************************************************//** +Reads a ulint in a compressed form if the log record fully contains it. +@return pointer to end of the stored field, NULL if not complete */ UNIV_INTERN byte* mach_parse_compressed( /*==================*/ - /* out: pointer to end of the stored field, NULL if - not complete */ - byte* ptr, /* in: pointer to buffer from where to read */ - byte* end_ptr,/* in: pointer to end of the buffer */ - ulint* val) /* out: read value (< 2^32) */ + byte* ptr, /*!< in: pointer to buffer from where to read */ + byte* end_ptr,/*!< in: pointer to end of the buffer */ + ulint* val) /*!< out: read value (< 2^32) */ { ulint flag; @@ -93,17 +93,16 @@ mach_parse_compressed( } } -/************************************************************* -Reads a dulint in a compressed form if the log record fully contains it. */ +/*********************************************************//** +Reads a dulint in a compressed form if the log record fully contains it. +@return pointer to end of the stored field, NULL if not complete */ UNIV_INTERN byte* mach_dulint_parse_compressed( /*=========================*/ - /* out: pointer to end of the stored field, NULL if - not complete */ - byte* ptr, /* in: pointer to buffer from where to read */ - byte* end_ptr,/* in: pointer to end of the buffer */ - dulint* val) /* out: read value */ + byte* ptr, /*!< in: pointer to buffer from where to read */ + byte* end_ptr,/*!< in: pointer to end of the buffer */ + dulint* val) /*!< out: read value */ { ulint high; ulint low; |