diff options
| author | unknown <dlenev@mysql.com> | 2006-02-27 20:00:07 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2006-02-27 20:00:07 +0300 |
| commit | e54ecf09beca168cc7fba6d0a21b440be4f2783d (patch) | |
| tree | 0fde704b3ac2031c62de8957626945f2239d8343 /include/my_global.h | |
| parent | e2393aa24a02505688aabc73fa4ebf79aeff17d9 (diff) | |
| parent | 475eb3e9179fa4c1af3e0daa980dc6f30025ac28 (diff) | |
| download | mariadb-git-e54ecf09beca168cc7fba6d0a21b440be4f2783d.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
sql/sql_rename.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 82b0585757c..56aeb84d9ba 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -43,6 +43,15 @@ #define HAVE_ERRNO_AS_DEFINE #endif /* __CYGWIN__ */ +#if defined(__QNXNTO__) && !defined(FD_SETSIZE) +#define FD_SETSIZE 1024 /* Max number of file descriptor bits in + fd_set, used when calling 'select' + Must be defined before including + "sys/select.h" and "sys/time.h" + */ +#endif + + /* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */ #ifdef USE_PRAGMA_IMPLEMENTATION #define USE_PRAGMA_INTERFACE |