diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-24 18:47:24 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-24 18:47:24 +0400 |
| commit | 853f4ba37b8434576bdb7d0b13d81573eaaa8742 (patch) | |
| tree | ea858040f1f8c243bc43c5fa35e277b854ade209 /sql/mysqld.cc | |
| parent | e6b9fb32a7923169b4dffcf3e9ba4c5700428137 (diff) | |
| parent | 4794f463b6e4b14eea3656df14753ab23611afaf (diff) | |
| download | mariadb-git-853f4ba37b8434576bdb7d0b13d81573eaaa8742.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a82e0fd6ea2..b2505a99a0d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4128,6 +4128,7 @@ void decrement_handler_count() #endif /* defined(__NT__) || defined(HAVE_SMEM) */ +#ifndef EMBEDDED_LIBRARY #ifndef DBUG_OFF /* Debugging helper function to keep the locale database @@ -4166,7 +4167,6 @@ static void test_lc_time_sz() #endif//DBUG_OFF -#ifndef EMBEDDED_LIBRARY #ifdef __WIN__ int win_main(int argc, char **argv) #else |