diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-13 19:46:35 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-13 19:46:35 +0200 |
| commit | 33c8e43a4ad12564cc73d2f6dd833169e23f8140 (patch) | |
| tree | 2835157c1677134073b4db3394c95b2bf586c181 /sql/tztime.cc | |
| parent | 3cb80d328ddf0e82cd7aebc29624f243e4d9be37 (diff) | |
| parent | bc72c684505abf596b7b038205d3bd7d785e49e3 (diff) | |
| download | mariadb-git-33c8e43a4ad12564cc73d2f6dd833169e23f8140.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/dict/dict0load.c:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/innobase/include/dict0load.h:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/rem0cmp.h:
Auto merged
storage/innobase/include/srv0srv.h:
Auto merged
storage/innobase/rem/rem0cmp.c:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
Merged from 5.0
storage/ndb/test/run-test/daily-basic-tests.txt:
Merged from 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 eba2f8f4a7b..99955c21ede 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; } |