diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2014-02-19 14:05:15 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2014-02-19 14:05:15 +0400 |
| commit | d12c7adf715677b118104d4e5adf6f978c27b4ee (patch) | |
| tree | 04cdbaf4509cbe485cb992e271ab8d711a867011 /storage/maria/ma_loghandler.c | |
| parent | fd1437dfe532ed78ce2a1c8e05a989fcbf79832e (diff) | |
| download | mariadb-git-d12c7adf715677b118104d4e5adf6f978c27b4ee.tar.gz | |
MDEV-5314 - Compiling fails on OSX using clang
This is port of fix for MySQL BUG#17647863.
revno: 5572
revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
timestamp: Thu 2013-10-31 00:22:43 +0100
message:
Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM
Rename test() macro to MY_TEST() to avoid conflict with libc++.
Diffstat (limited to 'storage/maria/ma_loghandler.c')
| -rw-r--r-- | storage/maria/ma_loghandler.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index ae58be55105..39103dfcd97 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -1562,7 +1562,7 @@ static my_bool translog_close_log_file(TRANSLOG_FILE *file) } rc|= mysql_file_close(file->handler.file, MYF(MY_WME)); my_free(file); - return test(rc); + return MY_TEST(rc); } @@ -8232,9 +8232,9 @@ my_bool translog_is_file(uint file_no) { MY_STAT stat_buff; char path[FN_REFLEN]; - return (test(mysql_file_stat(key_file_translog, - translog_filename_by_fileno(file_no, path), - &stat_buff, MYF(0)))); + return (MY_TEST(mysql_file_stat(key_file_translog, + translog_filename_by_fileno(file_no, path), + &stat_buff, MYF(0)))); } @@ -8529,8 +8529,8 @@ my_bool translog_purge(TRANSLOG_ADDRESS low) { char path[FN_REFLEN], *file_name; file_name= translog_filename_by_fileno(i, path); - rc= test(mysql_file_delete(key_file_translog, - file_name, MYF(MY_WME))); + rc= MY_TEST(mysql_file_delete(key_file_translog, + file_name, MYF(MY_WME))); } } if (unlikely(rc == 1)) @@ -8592,8 +8592,8 @@ my_bool translog_purge_at_flush() char path[FN_REFLEN], *file_name; DBUG_PRINT("info", ("purge file %lu\n", (ulong) i)); file_name= translog_filename_by_fileno(i, path); - rc= test(mysql_file_delete(key_file_translog, - file_name, MYF(MY_WME))); + rc= MY_TEST(mysql_file_delete(key_file_translog, + file_name, MYF(MY_WME))); } mysql_mutex_unlock(&log_descriptor.purger_lock); |