summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/ma_dyncol.c2
-rw-r--r--mysys/mf_iocache.c2
-rw-r--r--mysys/mf_keycache.c2
-rw-r--r--mysys/my_alloc.c2
-rw-r--r--mysys/my_copy.c2
-rw-r--r--mysys/my_getwd.c6
-rw-r--r--mysys/my_malloc.c14
-rw-r--r--mysys/safemalloc.c2
-rw-r--r--mysys/tree.c2
9 files changed, 18 insertions, 16 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c
index 3c77e5f820a..7a7459673f5 100644
--- a/mysys/ma_dyncol.c
+++ b/mysys/ma_dyncol.c
@@ -117,7 +117,7 @@ my_bool mariadb_dyncol_has_names(DYNAMIC_COLUMN *str)
{
if (str->length < 1)
return FALSE;
- return test(str->str[0] & DYNCOL_FLG_NAMES);
+ return MY_TEST(str->str[0] & DYNCOL_FLG_NAMES);
}
static enum enum_dyncol_func_result
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 3fa6ec28f7d..2008a6f8860 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -179,7 +179,7 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize,
DBUG_ASSERT(seek_offset == 0);
}
else
- info->seek_not_done= test(seek_offset != pos);
+ info->seek_not_done= MY_TEST(seek_offset != pos);
}
info->disk_writes= 0;
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 1ee71e55b68..b45b631283a 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -5651,7 +5651,7 @@ int flush_partitioned_key_cache_blocks(PARTITIONED_KEY_CACHE_CB *keycache,
if ((type == FLUSH_KEEP || type == FLUSH_FORCE_WRITE) &&
!((*dirty_part_map) & ((ulonglong) 1 << i)))
continue;
- err|= test(flush_simple_key_cache_blocks(partition, file, 0, type));
+ err|= MY_TEST(flush_simple_key_cache_blocks(partition, file, 0, type));
}
*dirty_part_map= 0;
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index d61c7e171d0..fc30185eb5a 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -61,7 +61,7 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size,
mem_root->free= mem_root->used= mem_root->pre_alloc= 0;
mem_root->min_malloc= 32;
mem_root->block_size= (block_size - ALLOC_ROOT_MIN_BLOCK_SIZE) & ~1;
- if (test(my_flags & MY_THREAD_SPECIFIC))
+ if (MY_TEST(my_flags & MY_THREAD_SPECIFIC))
mem_root->block_size|= 1;
mem_root->error_handler= 0;
diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index 58cacb9639d..8af572b5518 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.c
@@ -66,7 +66,7 @@ int my_copy(const char *from, const char *to, myf MyFlags)
from_file=to_file= -1;
DBUG_ASSERT(!(MyFlags & (MY_FNABP | MY_NABP))); /* for my_read/my_write */
if (MyFlags & MY_HOLD_ORIGINAL_MODES) /* Copy stat if possible */
- new_file_stat= test(my_stat((char*) to, &new_stat_buff, MYF(0)));
+ new_file_stat= MY_TEST(my_stat((char*) to, &new_stat_buff, MYF(0)));
if ((from_file=my_open(from,O_RDONLY | O_SHARE,MyFlags)) >= 0)
{
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c
index 79ec58d3c5c..fbdcef88bda 100644
--- a/mysys/my_getwd.c
+++ b/mysys/my_getwd.c
@@ -157,12 +157,12 @@ int test_if_hard_path(register const char *dir_name)
my_bool has_path(const char *name)
{
- return test(strchr(name, FN_LIBCHAR))
+ return MY_TEST(strchr(name, FN_LIBCHAR))
#if FN_LIBCHAR != '/'
- || test(strchr(name,'/'))
+ || MY_TEST(strchr(name, '/'))
#endif
#ifdef FN_DEVCHAR
- || test(strchr(name, FN_DEVCHAR))
+ || MY_TEST(strchr(name, FN_DEVCHAR))
#endif
;
}
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 2f3a5276a59..fd65a54e5a4 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -112,9 +112,10 @@ void *my_malloc(size_t size, myf my_flags)
}
else
{
- MALLOC_STORE_SIZE(point, void*, size, test(my_flags & MY_THREAD_SPECIFIC));
+ MALLOC_STORE_SIZE(point, void*, size,
+ MY_TEST(my_flags & MY_THREAD_SPECIFIC));
update_malloc_size(size + MALLOC_PREFIX_SIZE,
- test(my_flags & MY_THREAD_SPECIFIC));
+ MY_TEST(my_flags & MY_THREAD_SPECIFIC));
DBUG_EXECUTE_IF("simulate_out_of_memory",
{
/* my_free() handles memory accounting */
@@ -158,7 +159,7 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags)
Test that the new and old area are the same, if not MY_THREAD_MOVE is
given
*/
- DBUG_ASSERT((test(my_flags & MY_THREAD_SPECIFIC) == old_flags) ||
+ DBUG_ASSERT((MY_TEST(my_flags & MY_THREAD_SPECIFIC) == old_flags) ||
(my_flags & MY_THREAD_MOVE));
if ((point= sf_realloc(MALLOC_FIX_POINTER_FOR_FREE(oldpoint),
size + MALLOC_PREFIX_SIZE, my_flags)) == NULL)
@@ -177,13 +178,14 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags)
}
else
{
- MALLOC_STORE_SIZE(point, void*, size, test(my_flags & MY_THREAD_SPECIFIC));
- if (test(my_flags & MY_THREAD_SPECIFIC) != old_flags)
+ MALLOC_STORE_SIZE(point, void*, size,
+ MY_TEST(my_flags & MY_THREAD_SPECIFIC));
+ if (MY_TEST(my_flags & MY_THREAD_SPECIFIC) != old_flags)
{
/* memory moved between system and thread specific */
update_malloc_size(-(longlong) old_size - MALLOC_PREFIX_SIZE, old_flags);
update_malloc_size((longlong) size + MALLOC_PREFIX_SIZE,
- test(my_flags & MY_THREAD_SPECIFIC));
+ MY_TEST(my_flags & MY_THREAD_SPECIFIC));
}
else
update_malloc_size((longlong)size - (longlong)old_size, old_flags);
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index f0447da42f6..5d19647c989 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -209,7 +209,7 @@ size_t sf_malloc_usable_size(void *ptr, my_bool *is_thread_specific)
{
struct st_irem *irem= (struct st_irem *)ptr - 1;
DBUG_ENTER("sf_malloc_usable_size");
- *is_thread_specific= test(irem->flags & MY_THREAD_SPECIFIC);
+ *is_thread_specific= MY_TEST(irem->flags & MY_THREAD_SPECIFIC);
DBUG_PRINT("exit", ("size: %lu flags: %lu", (ulong) irem->datasize,
(ulong)irem->flags));
DBUG_RETURN(irem->datasize);
diff --git a/mysys/tree.c b/mysys/tree.c
index fe2d3f45d57..a9fc542faf6 100644
--- a/mysys/tree.c
+++ b/mysys/tree.c
@@ -127,7 +127,7 @@ void init_tree(TREE *tree, size_t default_alloc_size, size_t memory_limit,
tree->offset_to_key=0; /* use key through pointer */
tree->size_of_element+=sizeof(void*);
}
- if (!(tree->with_delete= test(my_flags & MY_TREE_WITH_DELETE)))
+ if (!(tree->with_delete= MY_TEST(my_flags & MY_TREE_WITH_DELETE)))
{
init_alloc_root(&tree->mem_root, default_alloc_size, 0, MYF(my_flags));
tree->mem_root.min_malloc= sizeof(TREE_ELEMENT)+tree->size_of_element;
View Lorry Controller Status