← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/DateTime.cpp

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/DateTime.cpp
32
32
#include "SQLError.h"
33
33
#include "Log.h"
34
34
 
35
 
#ifdef ENGINE
 
35
#ifdef FALCONDB
36
36
#include "Thread.h"
37
37
#endif
38
38
 
354
354
        for (Alias *alias = aliasData; alias->alias; ++alias)
355
355
                {
356
356
                alias->timeZone = DateTime::findTimeZone (alias->name);
357
 
#ifdef ENGINE
 
357
#ifdef FALCONDB
358
358
                ASSERT (alias->timeZone);
359
359
#endif
360
360
                int slot = JString::hash (alias->alias, HASH_SIZE);
1163
1163
 
1164
1164
const TimeZone* DateTime::getDefaultTimeZone()
1165
1165
{
1166
 
#ifdef ENGINE
 
1166
#ifdef FALCONDB
1167
1167
        Thread *thread = Thread::findThread();
1168
1168
 
1169
1169
        if (thread)