Fixup fromcvs/togit conversion
[minix-pkgsrc.git] / databases / mysql56-client / patches / patch-sql_sql__time.cc
blobb8a9673287e718592cec03d22289ced3b16a91cd
1 $NetBSD$
3 --- sql/sql_time.cc.orig 2013-05-05 20:56:04.000000000 +0000
4 +++ sql/sql_time.cc
5 @@ -105,9 +105,9 @@ uint calc_week(MYSQL_TIME *l_time, uint
6 uint days;
7 ulong daynr=calc_daynr(l_time->year,l_time->month,l_time->day);
8 ulong first_daynr=calc_daynr(l_time->year,1,1);
9 - bool monday_first= test(week_behaviour & WEEK_MONDAY_FIRST);
10 - bool week_year= test(week_behaviour & WEEK_YEAR);
11 - bool first_weekday= test(week_behaviour & WEEK_FIRST_WEEKDAY);
12 + bool monday_first= my_test(week_behaviour & WEEK_MONDAY_FIRST);
13 + bool week_year= my_test(week_behaviour & WEEK_YEAR);
14 + bool first_weekday= my_test(week_behaviour & WEEK_FIRST_WEEKDAY);
16 uint weekday=calc_weekday(first_daynr, !monday_first);
17 *year=l_time->year;