diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-12-13 18:44:20 +0200 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-12-13 18:44:20 +0200 |
| commit | 13d7abe06ff7925e7f0770d46c18f22aef176856 (patch) | |
| tree | cd8f99755a7a861f47b673fbd9501271deb1f5ed /sql/tztime.cc | |
| parent | 530e22edbf9a284efe61f5941b3587b814ed2b4e (diff) | |
| parent | 32466b14fbc46fe5e8c542e45911f0480d6a33c0 (diff) | |
| download | mariadb-git-13d7abe06ff7925e7f0770d46c18f22aef176856.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index e73d3f237ad..3a9d9a60aed 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2443,6 +2443,7 @@ scan_tz_dir(char * name_end) int main(int argc, char **argv) { +#ifndef __NETWARE__ MY_INIT(argv[0]); if (argc != 2 && argc != 3) @@ -2501,6 +2502,10 @@ main(int argc, char **argv) free_root(&tz_storage, MYF(0)); } +#else + fprintf(stderr, "This tool has not been ported to NetWare\n"); +#endif /* __NETWARE__ */ + return 0; } |