mirror of
https://github.com/MariaDB/server.git
synced 2025-03-07 03:33:09 +01:00

------------------------------------------------------------------------ r4008 | vasil | 2009-01-20 17:01:08 +0200 (Tue, 20 Jan 2009) | 4 lines branches/zip: Add ChangeLog entries for the bugfixes in r4004 and r4005. ------------------------------------------------------------------------ r4027 | marko | 2009-01-23 11:04:49 +0200 (Fri, 23 Jan 2009) | 1 line branches/zip: Remove some redundant #include statements. ------------------------------------------------------------------------ r4028 | marko | 2009-01-23 11:26:10 +0200 (Fri, 23 Jan 2009) | 13 lines branches/zip: Enclose some more unused code in #ifdef UNIV_LOG_ARCHIVE. This will help trim the dependencies of InnoDB Hot Backup. recv_recovery_from_checkpoint_start(): Rename to recv_recovery_from_checkpoint_start_func(), and remove the two first parameters unless UNIV_LOG_ARCHIVE is defined. Define and use the auxiliary macros TYPE_CHECKPOINT and LIMIT_LSN in the function. struct recv_sys_struct: Remove archive_group unless UNIV_LOG_ARCHIVE is defined. Do not define LOG_ARCHIVE unless UNIV_LOG_ARCHIVE is defined. ------------------------------------------------------------------------ r4029 | marko | 2009-01-23 14:07:38 +0200 (Fri, 23 Jan 2009) | 1 line branches/zip: Remove some redundant #include directives. ------------------------------------------------------------------------ r4030 | marko | 2009-01-23 15:31:36 +0200 (Fri, 23 Jan 2009) | 2 lines branches/zip: buf_page_get_gen(): Remove the unused mode BUF_GET_NOWAIT. This was noticed while investigating Issue #160. ------------------------------------------------------------------------ r4033 | marko | 2009-01-23 15:49:04 +0200 (Fri, 23 Jan 2009) | 16 lines branches/zip: Merge revisions 4005:4032 from branches/5.1: ------------------------------------------------------------------------ r4032 | marko | 2009-01-23 15:43:51 +0200 (Fri, 23 Jan 2009) | 10 lines branches/5.1: Merge r4031 from branches/5.0: btr_search_drop_page_hash_when_freed(): Check if buf_page_get_gen() returns NULL. The page may have been evicted from the buffer pool between buf_page_peek_if_search_hashed() and buf_page_get_gen(), because the buffer pool mutex will be released between these two calls. (Bug #42279, Issue #160) rb://82 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4034 | marko | 2009-01-26 16:16:39 +0200 (Mon, 26 Jan 2009) | 2 lines branches/zip: buf_page_get_gen(): Fix a "possibly uninitialized" warning that was introduced in r4030. ------------------------------------------------------------------------ r4036 | marko | 2009-01-26 22:33:20 +0200 (Mon, 26 Jan 2009) | 22 lines branches/zip: In r988, the function buf_block_align() was enclosed within UNIV_DEBUG. The two remaining callers in non-debug builds, btr_search_guess_on_hash() and btr_search_validate(), were rewritten to call buf_page_hash_get(). To implement support for a resizeable buffer pool, the function buf_block_align() had been rewritten to perform a page hash lookup in the buffer pool. The caller was also made responsible for holding the buffer pool mutex. Because the page hash lookup is expensive and it has to be done while holding the buffer pool mutex, implement buf_block_align() by pointer arithmetics again, and make btr_search_guess_on_hash() call it. Note that this will have to be adjusted if the interface to the resizeable buffer pool is actually implemented. rb://83 approved by Heikki Tuuri, to address Issue #161. As a deviation from the approved patch, this patch also makes btr_search_validate() (invoked by CHECK TABLE) check that buf_pool->page_hash is consistent with buf_block_align(). ------------------------------------------------------------------------ r4039 | vasil | 2009-01-27 08:04:17 +0200 (Tue, 27 Jan 2009) | 5 lines branches/zip: Adjust the paths in innodb_file_per_table.diff with a recent rename of the test/result files in the MySQL tree. ------------------------------------------------------------------------ r4042 | marko | 2009-01-27 10:05:24 +0200 (Tue, 27 Jan 2009) | 2 lines branches/zip: buf_LRU_invalidate_tablespace(): Fix a race condition: read zip_size while still holding block_mutex. ------------------------------------------------------------------------ r4045 | marko | 2009-01-28 00:31:17 +0200 (Wed, 28 Jan 2009) | 8 lines branches/zip: btr_search_validate(): Fix a bogus UNIV_DEBUG assertion failure that was accidentally introduced in r4036. Instead of calling buf_block_get_frame(), which asserts that the block must be buffer-fixed, access block->frame directly. That is safe, because changes of block->page.state are protected by the buffer pool mutex, which we are holding. This bug was reported by Michael. ------------------------------------------------------------------------ r4046 | marko | 2009-01-28 00:33:20 +0200 (Wed, 28 Jan 2009) | 2 lines branches/zip: Revert the change to univ.i that was accidentally committed in r4045. ------------------------------------------------------------------------ r4047 | marko | 2009-01-28 00:46:13 +0200 (Wed, 28 Jan 2009) | 6 lines branches/zip: btr_search_validate(): Fix an assertion failure that was introduced in r4036. Do not call buf_block_get_space(), buf_block_get_page_no() unless the block state is BUF_BLOCK_FILE_PAGE. This bug was reported by Michael. ------------------------------------------------------------------------ r4050 | vasil | 2009-01-28 08:21:44 +0200 (Wed, 28 Jan 2009) | 5 lines branches/zip: Adjust the paths in innodb_lock_wait_timeout.diff with a recent rename of the test/result files in the MySQL tree. ------------------------------------------------------------------------ r4051 | marko | 2009-01-28 14:35:49 +0200 (Wed, 28 Jan 2009) | 1 line branches/zip: trx0sys.ic: Remove unnecessary #include <data0type.h>. ------------------------------------------------------------------------ r4052 | marko | 2009-01-28 15:21:45 +0200 (Wed, 28 Jan 2009) | 5 lines branches/zip: Enclose some functions inside #ifdef UNIV_HOTBACKUP: ut_sprintf_timestamp_without_extra_chars(), ut_get_year_month_day(), log_reset_first_header_and_checkpoint(): These functions are only used in InnoDB Hot Backup. ------------------------------------------------------------------------ r4056 | calvin | 2009-01-29 03:06:41 +0200 (Thu, 29 Jan 2009) | 33 lines branches/zip: Merge revisions 4032:4035 from branches/5.1 All InnoDB related tests passed on Windows, except known failure in partition_innodb_semi_consistent. The inadvertent change to btr0sea.c in this commit is reverted in r4060. ------------------------------------------------------------------------ r4035 | vasil | 2009-01-26 09:26:25 -0600 (Mon, 26 Jan 2009) | 23 lines branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2646.161.4 committer: Tatiana A. Nurnberg <azundris@mysql.com> branch nick: 51-31177v2 timestamp: Mon 2009-01-12 06:32:49 +0100 message: Bug#31177: Server variables can't be set to their current values Bounds-checks and blocksize corrections were applied to user-input, but constants in the server were trusted implicitly. If these values did not actually meet the requirements, the user could not set change a variable, then set it back to the (wonky) factory default or maximum by explicitly specifying it (SET <var>=<value> vs SET <var>=DEFAULT). Now checks also apply to the server's presets. Wonky values and maxima get corrected at startup. Consequently all non-offsetted values the user sees are valid, and users can set the variable to that exact value if they so desire. ------------------------------------------------------------------------ r4060 | marko | 2009-01-29 09:39:04 +0200 (Thu, 29 Jan 2009) | 1 line branches/zip: btr0sea.c: Revert the inadvertent change made in r4056. ------------------------------------------------------------------------
312 lines
9.6 KiB
C
312 lines
9.6 KiB
C
/**********************************************************************
|
|
Various utilities
|
|
|
|
(c) 1994, 1995 Innobase Oy
|
|
|
|
Created 1/20/1994 Heikki Tuuri
|
|
***********************************************************************/
|
|
|
|
#ifndef ut0ut_h
|
|
#define ut0ut_h
|
|
|
|
#include "univ.i"
|
|
#include <time.h>
|
|
#ifndef MYSQL_SERVER
|
|
#include <ctype.h>
|
|
#endif
|
|
|
|
#define TEMP_INDEX_PREFIX '\377' /* Index name prefix in fast index
|
|
creation */
|
|
|
|
typedef time_t ib_time_t;
|
|
|
|
/*************************************************************************
|
|
Delays execution for at most max_wait_us microseconds or returns earlier
|
|
if cond becomes true; cond is evaluated every 2 ms. */
|
|
|
|
#define UT_WAIT_FOR(cond, max_wait_us) \
|
|
do { \
|
|
ullint start_us; \
|
|
start_us = ut_time_us(NULL); \
|
|
while (!(cond) \
|
|
&& ut_time_us(NULL) - start_us < (max_wait_us)) {\
|
|
\
|
|
os_thread_sleep(2000 /* 2 ms */); \
|
|
} \
|
|
} while (0)
|
|
|
|
/************************************************************
|
|
Gets the high 32 bits in a ulint. That is makes a shift >> 32,
|
|
but since there seem to be compiler bugs in both gcc and Visual C++,
|
|
we do this by a special conversion. */
|
|
UNIV_INTERN
|
|
ulint
|
|
ut_get_high32(
|
|
/*==========*/
|
|
/* out: a >> 32 */
|
|
ulint a); /* in: ulint */
|
|
/**********************************************************
|
|
Calculates the minimum of two ulints. */
|
|
UNIV_INLINE
|
|
ulint
|
|
ut_min(
|
|
/*===*/
|
|
/* out: minimum */
|
|
ulint n1, /* in: first number */
|
|
ulint n2); /* in: second number */
|
|
/**********************************************************
|
|
Calculates the maximum of two ulints. */
|
|
UNIV_INLINE
|
|
ulint
|
|
ut_max(
|
|
/*===*/
|
|
/* out: maximum */
|
|
ulint n1, /* in: first number */
|
|
ulint n2); /* in: second number */
|
|
/********************************************************************
|
|
Calculates minimum of two ulint-pairs. */
|
|
UNIV_INLINE
|
|
void
|
|
ut_pair_min(
|
|
/*========*/
|
|
ulint* a, /* out: more significant part of minimum */
|
|
ulint* b, /* out: less significant part of minimum */
|
|
ulint a1, /* in: more significant part of first pair */
|
|
ulint b1, /* in: less significant part of first pair */
|
|
ulint a2, /* in: more significant part of second pair */
|
|
ulint b2); /* in: less significant part of second pair */
|
|
/**********************************************************
|
|
Compares two ulints. */
|
|
UNIV_INLINE
|
|
int
|
|
ut_ulint_cmp(
|
|
/*=========*/
|
|
/* out: 1 if a > b, 0 if a == b, -1 if a < b */
|
|
ulint a, /* in: ulint */
|
|
ulint b); /* in: ulint */
|
|
/***********************************************************
|
|
Compares two pairs of ulints. */
|
|
UNIV_INLINE
|
|
int
|
|
ut_pair_cmp(
|
|
/*========*/
|
|
/* out: -1 if a < b, 0 if a == b,
|
|
1 if a > b */
|
|
ulint a1, /* in: more significant part of first pair */
|
|
ulint a2, /* in: less significant part of first pair */
|
|
ulint b1, /* in: more significant part of second pair */
|
|
ulint b2); /* in: less significant part of second pair */
|
|
/*****************************************************************
|
|
Determines if a number is zero or a power of two. */
|
|
#define ut_is_2pow(n) UNIV_LIKELY(!((n) & ((n) - 1)))
|
|
/*****************************************************************
|
|
Calculates fast the remainder of n/m when m is a power of two. */
|
|
#define ut_2pow_remainder(n, m) ((n) & ((m) - 1))
|
|
/*****************************************************************
|
|
Calculates the biggest multiple of m that is not bigger than n
|
|
when m is a power of two. In other words, rounds n down to m * k. */
|
|
#define ut_2pow_round(n, m) ((n) & ~((m) - 1))
|
|
#define ut_calc_align_down(n, m) ut_2pow_round(n, m)
|
|
/************************************************************
|
|
Calculates the smallest multiple of m that is not smaller than n
|
|
when m is a power of two. In other words, rounds n up to m * k. */
|
|
#define ut_calc_align(n, m) (((n) + ((m) - 1)) & ~((m) - 1))
|
|
/*****************************************************************
|
|
Calculates fast the 2-logarithm of a number, rounded upward to an
|
|
integer. */
|
|
UNIV_INLINE
|
|
ulint
|
|
ut_2_log(
|
|
/*=====*/
|
|
/* out: logarithm in the base 2, rounded upward */
|
|
ulint n); /* in: number */
|
|
/*****************************************************************
|
|
Calculates 2 to power n. */
|
|
UNIV_INLINE
|
|
ulint
|
|
ut_2_exp(
|
|
/*=====*/
|
|
/* out: 2 to power n */
|
|
ulint n); /* in: number */
|
|
/*****************************************************************
|
|
Calculates fast the number rounded up to the nearest power of 2. */
|
|
UNIV_INTERN
|
|
ulint
|
|
ut_2_power_up(
|
|
/*==========*/
|
|
/* out: first power of 2 which is >= n */
|
|
ulint n) /* in: number != 0 */
|
|
__attribute__((const));
|
|
|
|
/* Determine how many bytes (groups of 8 bits) are needed to
|
|
store the given number of bits. */
|
|
#define UT_BITS_IN_BYTES(b) (((b) + 7) / 8)
|
|
|
|
/**************************************************************
|
|
Returns system time. We do not specify the format of the time returned:
|
|
the only way to manipulate it is to use the function ut_difftime. */
|
|
UNIV_INTERN
|
|
ib_time_t
|
|
ut_time(void);
|
|
/*=========*/
|
|
/**************************************************************
|
|
Returns system time.
|
|
Upon successful completion, the value 0 is returned; otherwise the
|
|
value -1 is returned and the global variable errno is set to indicate the
|
|
error. */
|
|
UNIV_INTERN
|
|
int
|
|
ut_usectime(
|
|
/*========*/
|
|
/* out: 0 on success, -1 otherwise */
|
|
ulint* sec, /* out: seconds since the Epoch */
|
|
ulint* ms); /* out: microseconds since the Epoch+*sec */
|
|
|
|
/**************************************************************
|
|
Returns the number of microseconds since epoch. Similar to
|
|
time(3), the return value is also stored in *tloc, provided
|
|
that tloc is non-NULL. */
|
|
UNIV_INTERN
|
|
ullint
|
|
ut_time_us(
|
|
/*=======*/
|
|
/* out: us since epoch */
|
|
ullint* tloc); /* out: us since epoch, if non-NULL */
|
|
|
|
/**************************************************************
|
|
Returns the difference of two times in seconds. */
|
|
UNIV_INTERN
|
|
double
|
|
ut_difftime(
|
|
/*========*/
|
|
/* out: time2 - time1 expressed in seconds */
|
|
ib_time_t time2, /* in: time */
|
|
ib_time_t time1); /* in: time */
|
|
/**************************************************************
|
|
Prints a timestamp to a file. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_print_timestamp(
|
|
/*===============*/
|
|
FILE* file); /* in: file where to print */
|
|
/**************************************************************
|
|
Sprintfs a timestamp to a buffer, 13..14 chars plus terminating NUL. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_sprintf_timestamp(
|
|
/*=================*/
|
|
char* buf); /* in: buffer where to sprintf */
|
|
#ifdef UNIV_HOTBACKUP
|
|
/**************************************************************
|
|
Sprintfs a timestamp to a buffer with no spaces and with ':' characters
|
|
replaced by '_'. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_sprintf_timestamp_without_extra_chars(
|
|
/*=====================================*/
|
|
char* buf); /* in: buffer where to sprintf */
|
|
/**************************************************************
|
|
Returns current year, month, day. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_get_year_month_day(
|
|
/*==================*/
|
|
ulint* year, /* out: current year */
|
|
ulint* month, /* out: month */
|
|
ulint* day); /* out: day */
|
|
#endif /* UNIV_HOTBACKUP */
|
|
/*****************************************************************
|
|
Runs an idle loop on CPU. The argument gives the desired delay
|
|
in microseconds on 100 MHz Pentium + Visual C++. */
|
|
UNIV_INTERN
|
|
ulint
|
|
ut_delay(
|
|
/*=====*/
|
|
/* out: dummy value */
|
|
ulint delay); /* in: delay in microseconds on 100 MHz Pentium */
|
|
/*****************************************************************
|
|
Prints the contents of a memory buffer in hex and ascii. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_print_buf(
|
|
/*=========*/
|
|
FILE* file, /* in: file where to print */
|
|
const void* buf, /* in: memory buffer */
|
|
ulint len); /* in: length of the buffer */
|
|
|
|
/**************************************************************************
|
|
Outputs a NUL-terminated file name, quoted with apostrophes. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_print_filename(
|
|
/*==============*/
|
|
FILE* f, /* in: output stream */
|
|
const char* name); /* in: name to print */
|
|
|
|
/* Forward declaration of transaction handle */
|
|
struct trx_struct;
|
|
|
|
/**************************************************************************
|
|
Outputs a fixed-length string, quoted as an SQL identifier.
|
|
If the string contains a slash '/', the string will be
|
|
output as two identifiers separated by a period (.),
|
|
as in SQL database_name.identifier. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_print_name(
|
|
/*==========*/
|
|
FILE* f, /* in: output stream */
|
|
struct trx_struct*trx, /* in: transaction */
|
|
ibool table_id,/* in: TRUE=print a table name,
|
|
FALSE=print other identifier */
|
|
const char* name); /* in: name to print */
|
|
|
|
/**************************************************************************
|
|
Outputs a fixed-length string, quoted as an SQL identifier.
|
|
If the string contains a slash '/', the string will be
|
|
output as two identifiers separated by a period (.),
|
|
as in SQL database_name.identifier. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_print_namel(
|
|
/*===========*/
|
|
FILE* f, /* in: output stream */
|
|
struct trx_struct*trx, /* in: transaction (NULL=no quotes) */
|
|
ibool table_id,/* in: TRUE=print a table name,
|
|
FALSE=print other identifier */
|
|
const char* name, /* in: name to print */
|
|
ulint namelen);/* in: length of name */
|
|
|
|
/**************************************************************************
|
|
Catenate files. */
|
|
UNIV_INTERN
|
|
void
|
|
ut_copy_file(
|
|
/*=========*/
|
|
FILE* dest, /* in: output file */
|
|
FILE* src); /* in: input file to be appended to output */
|
|
|
|
/**************************************************************************
|
|
snprintf(). */
|
|
|
|
#ifdef __WIN__
|
|
int
|
|
ut_snprintf(
|
|
/* out: number of characters that would
|
|
have been printed if the size were
|
|
unlimited, not including the terminating
|
|
'\0'. */
|
|
char* str, /* out: string */
|
|
size_t size, /* in: str size */
|
|
const char* fmt, /* in: format */
|
|
...); /* in: format values */
|
|
#else
|
|
#define ut_snprintf snprintf
|
|
#endif /* __WIN__ */
|
|
|
|
#ifndef UNIV_NONINL
|
|
#include "ut0ut.ic"
|
|
#endif
|
|
|
|
#endif
|
|
|