diff options
| author | kent@mysql.com <> | 2005-06-02 04:45:09 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-06-02 04:45:09 +0200 |
| commit | f0fcc54b0c0425164543a409eb8512b80f8b652f (patch) | |
| tree | 1fb96b5e5d55824db936588c839863aff026d624 /sql/tztime.cc | |
| parent | b884660a8366ce689efe3f6f135afb753a499fe7 (diff) | |
| parent | f889f0884cd4d7ddc69a84a00083af0f0a0422f2 (diff) | |
| download | mariadb-git-f0fcc54b0c0425164543a409eb8512b80f8b652f.tar.gz | |
Merge
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 11cdf64de29..a52b9701e8e 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -20,18 +20,20 @@ (We will refer to this code as to elsie-code further.) */ -#ifdef USE_PRAGMA_IMPLEMENTATION -#pragma implementation // gcc: Class implementation -#endif - /* We should not include mysql_priv.h in mysql_tzinfo_to_sql utility since it creates unsolved link dependencies on some platforms. */ + +#include <my_global.h> + +#ifdef USE_PRAGMA_IMPLEMENTATION +#pragma implementation // gcc: Class implementation +#endif + #if !defined(TZINFO2SQL) && !defined(TESTTIME) #include "mysql_priv.h" #else -#include <my_global.h> #include <my_time.h> #include "tztime.h" #include <my_sys.h> |