diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-10-11 14:02:43 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-10-11 14:02:43 +0200 |
| commit | d049ec4a59002ff31b122eba6ddbb209b21abb83 (patch) | |
| tree | e9d9f80a8ffc4de4f582dbfaf759edef29559a6c /ndb/include | |
| parent | 0125c351e33116c778fa2244bb3ad2f1467a196e (diff) | |
| parent | 4fc506529cf56789307241dd0c0b348f48ef5a71 (diff) | |
| download | mariadb-git-d049ec4a59002ff31b122eba6ddbb209b21abb83.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/ndb_global.h.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index 43f90e1f8b5..122b0edc400 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -128,12 +128,8 @@ extern "C" { #include "ndb_init.h" -#ifdef SCO - #ifndef PATH_MAX #define PATH_MAX 1024 #endif -#endif /* SCO */ - #endif |