database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-325 Fix WEEK() and YEARWEEK()

Browse Source 
The flags mask logic for the week function was incorrect. This patch
fixes it so that the behaviour is the same as MariaDB's
This commit is contained in:
Andrew Hutchings
2016-09-27 14:32:26 +01:00
parent 03ce5a4936
commit 5f70568d5c
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/funcexp/funchelpers.h
View File

@ -270,15 +270,10 @@ const uint32_t WEEK_NO_ZERO = 2;
const uint32_t WEEK_GT_THREE_DAYS = 4;
// Takes a MySQL WEEK() function mode setting and converts to a bitmask
// used by calc_mysql_week()
// used by calc_mysql_week() mirror of MariaDB's week_mode()
inline int16_t convert_mysql_mode_to_modeflags( int16_t mode )
{
// For some crazy reason, MySQL assigns modes 1, 3, 4, and 6 to use
// the setting for >3 days in first week which does not align to
// any particular bit. This small piece of code sets bit 2
// (WEEK_GT_THREE_DAYS) for modes 1 & 3 and disables for modes
// 5 & 7 which is exactly what we want.
if( mode & WEEK_MONDAY_FIRST )
if(!(mode & WEEK_MONDAY_FIRST))
mode ^= WEEK_GT_THREE_DAYS;
return mode;