diff options
author | unknown <joerg@trift2.> | 2007-06-06 19:59:18 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-06-06 19:59:18 +0200 |
commit | 92a46e05794ca134c8feb7190c7c21496c3134bf (patch) | |
tree | d107f76384810baaf845921af162fd7858539c30 /include | |
parent | 10a21ed042e39c8800893dbb8ba711d54daf4896 (diff) | |
parent | d05a958056137ab0f5727a2b125a2fc02f71a4b9 (diff) | |
download | mariadb-git-92a46e05794ca134c8feb7190c7c21496c3134bf.tar.gz |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
CMakeLists.txt:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include')
-rw-r--r-- | include/config-netware.h | 3 | ||||
-rw-r--r-- | include/config-win.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/config-netware.h b/include/config-netware.h index f287699249b..f7f494b519c 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -112,9 +112,6 @@ extern "C" { /* signal by closing the sockets */ #define SIGNAL_WITH_VIO_CLOSE 1 -/* On NetWare, stack grows towards lower address*/ -#define STACK_DIRECTION -1 - /* On NetWare, we need to set stack size for threads, otherwise default 16K is used */ #define NW_THD_STACKSIZE 65536 diff --git a/include/config-win.h b/include/config-win.h index bc2ae60f137..fa5c15b0668 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -250,8 +250,6 @@ inline double ulonglong2double(ulonglong value) #endif -#define STACK_DIRECTION -1 - /* Optimized store functions for Intel x86 */ #ifndef _WIN64 |