Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-05-27 23:21:03+02:00, kent@stripped +6 -0
sql_parse.cc, config-win.h, config-netware.h:
Don't try determine stack direction at configure time
compiler_flag.m4:
Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
misc.m4, configure.in:
Use fourth argument to AC_TRY_RUN, to be used in cross compilation
Don't try determine stack direction at configure time
config/ac-macros/compiler_flag.m4@stripped, 2007-05-27 23:16:56+02:00, kent@stripped +1 -1
Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
config/ac-macros/misc.m4@stripped, 2007-05-27 23:16:58+02:00, kent@stripped +3 -24
Use fourth argument to AC_TRY_RUN, to be used in cross compilation
Don't try determine stack direction at configure time
configure.in@stripped, 2007-05-27 23:16:09+02:00, kent@stripped +4 -3
Use fourth argument to AC_TRY_RUN, to be used in cross compilation
Don't try determine stack direction at configure time
include/config-netware.h@stripped, 2007-05-27 23:16:58+02:00, kent@stripped +0 -3
Don't try determine stack direction at configure time
include/config-win.h@stripped, 2007-05-27 23:17:09+02:00, kent@stripped +0 -2
Don't try determine stack direction at configure time
sql/sql_parse.cc@stripped, 2007-05-27 23:17:14+02:00, kent@stripped +3 -6
Don't try determine stack direction at configure time
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: kent-amd64.(none)
# Root: /home/kent/bk/mysql-5.1-cross
--- 1.466/configure.in 2007-05-27 23:21:09 +02:00
+++ 1.467/configure.in 2007-05-27 23:21:09 +02:00
@@ -264,7 +264,10 @@
AC_MSG_RESULT("ptr")],
[AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
AC_MSG_RESULT("garbage")])
- ])
+ ],
+ # Cross compile, assume POSIX
+ [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
+ AC_MSG_RESULT("int (we assume)")])
;;
esac
@@ -1784,8 +1787,6 @@
#---END:
# Figure out what type of struct rlimit to use with setrlimit
MYSQL_TYPE_STRUCT_RLIMIT
-# Find where the stack goes
-MYSQL_STACK_DIRECTION
# We want to skip alloca on irix unconditionally. It may work on some version..
MYSQL_FUNC_ALLOCA
# Do struct timespec have members tv_sec or ts_sec
--- 1.99/include/config-win.h 2007-05-27 23:21:09 +02:00
+++ 1.100/include/config-win.h 2007-05-27 23:21:09 +02:00
@@ -250,8 +250,6 @@
#endif
-#define STACK_DIRECTION -1
-
/* Optimized store functions for Intel x86 */
#ifndef _WIN64
--- 1.668/sql/sql_parse.cc 2007-05-27 23:21:09 +02:00
+++ 1.669/sql/sql_parse.cc 2007-05-27 23:21:09 +02:00
@@ -4996,17 +4996,14 @@
Check stack size; Send error if there isn't enough stack to continue
****************************************************************************/
-#if STACK_DIRECTION < 0
-#define used_stack(A,B) (long) (A - B)
-#else
-#define used_stack(A,B) (long) (B - A)
-#endif
+#ifndef EMBEDDED_LIBRARY
+
+#define used_stack(A,B) (long)(A > B ? A - B : B - A)
#ifndef DBUG_OFF
long max_stack_used;
#endif
-#ifndef EMBEDDED_LIBRARY
/*
Note: The 'buf' parameter is necessary, even if it is unused here.
- fix_fields functions has a "dummy" buffer large enough for the
--- 1.4/config/ac-macros/compiler_flag.m4 2007-05-27 23:21:09 +02:00
+++ 1.5/config/ac-macros/compiler_flag.m4 2007-05-27 23:21:09 +02:00
@@ -7,7 +7,7 @@
AC_CACHE_VAL(mysql_cv_option_$2,
[
CFLAGS="[$]OLD_CFLAGS $1"
- AC_TRY_RUN([int main(){exit(0);}],mysql_cv_option_$2=yes,mysql_cv_option_$2=no,mysql_cv_option_$2=no)
+ AC_TRY_LINK([int main(){exit(0);}],mysql_cv_option_$2=yes,mysql_cv_option_$2=no,mysql_cv_option_$2=no)
])
CFLAGS="[$]OLD_CFLAGS"
--- 1.17/config/ac-macros/misc.m4 2007-05-27 23:21:09 +02:00
+++ 1.18/config/ac-macros/misc.m4 2007-05-27 23:21:09 +02:00
@@ -450,29 +450,6 @@
fi
])dnl
-AC_DEFUN([MYSQL_STACK_DIRECTION],
- [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
- [AC_TRY_RUN([#include <stdlib.h>
- int find_stack_direction ()
- {
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
- }
- int main ()
- {
- exit (find_stack_direction() < 0);
- }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
- ac_cv_c_stack_direction=0)])
- AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
-])dnl
-
AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
[
AC_MSG_CHECKING(if conversion of longlong to float works)
@@ -488,7 +465,9 @@
fprintf(file,"%g\n",f);
fclose(file);
return (0);
-}], ac_cv_conv_longlong_to_float=`cat conftestval`, ac_cv_conv_longlong_to_float=0, ifelse([$2], , , ac_cv_conv_longlong_to_float=$2))])dnl
+}], ac_cv_conv_longlong_to_float=`cat conftestval`,
+ ac_cv_conv_longlong_to_float=0,
+ ac_cv_conv_longlong_to_float="yes")])dnl # Cross compiling, assume can convert
if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes"
then
ac_cv_conv_longlong_to_float=yes
--- 1.23/include/config-netware.h 2007-05-27 23:21:09 +02:00
+++ 1.24/include/config-netware.h 2007-05-27 23:21:09 +02:00
@@ -112,9 +112,6 @@
/* 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
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2512) | kent | 27 May |
