database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

MDEV-5314 - Compiling fails on OSX using clang

Browse Source 
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++.
This commit is contained in:
Sergey Vojtovich
2014-02-19 14:05:15 +04:00
parent fd1437dfe5
commit d12c7adf71
133 changed files with 600 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_time.cc
View File

@@ -106,9 +106,9 @@ uint calc_week(MYSQL_TIME *l_time, uint week_behaviour, uint *year)
uint days;
ulong daynr=calc_daynr(l_time->year,l_time->month,l_time->day);
ulong first_daynr=calc_daynr(l_time->year,1,1);
bool monday_first= test(week_behaviour & WEEK_MONDAY_FIRST);
bool week_year= test(week_behaviour & WEEK_YEAR);
bool first_weekday= test(week_behaviour & WEEK_FIRST_WEEKDAY);
bool monday_first= MY_TEST(week_behaviour & WEEK_MONDAY_FIRST);
bool week_year= MY_TEST(week_behaviour & WEEK_YEAR);
bool first_weekday= MY_TEST(week_behaviour & WEEK_FIRST_WEEKDAY);
uint weekday=calc_weekday(first_daynr, !monday_first);
*year=l_time->year;