Commit 4713caa7 authored by unknown's avatar unknown

Merge trift2.:/MySQL/M41/mysql-4.1

into  trift2.:/MySQL/M41/push-4.1

parents c81140f5 a1566a09
...@@ -167,8 +167,7 @@ check_cpu () { ...@@ -167,8 +167,7 @@ check_cpu () {
touch __test.c touch __test.c
while [ "$cpu_arg" ] ; do while [ "$cpu_arg" ] ; do
# FIXME: echo -n isn't portable - see contortions autoconf goes through printf "testing $cpu_arg ... " >&2
echo -n testing $cpu_arg "... " >&2
# compile check # compile check
check_cpu_cflags=`eval echo $check_cpu_args` check_cpu_cflags=`eval echo $check_cpu_args`
......
...@@ -2990,10 +2990,14 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware") ...@@ -2990,10 +2990,14 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'" ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"
if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no" if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
then then
AC_DEFINE([THREAD], [1], AC_DEFINE([THREAD], [1],
[Define if you want to have threaded code. This may be undef on client code]) [Define if you want to have threaded code. This may be undef on client code])
fi
if test "$with_server" != "no"
then
# Avoid _PROGRAMS names # Avoid _PROGRAMS names
THREAD_LPROGRAMS="test_thr_alarm\$(EXEEXT) test_thr_lock\$(EXEEXT)" THREAD_LPROGRAMS="test_thr_alarm\$(EXEEXT) test_thr_lock\$(EXEEXT)"
AC_SUBST(THREAD_LPROGRAMS) AC_SUBST(THREAD_LPROGRAMS)
......
...@@ -84,6 +84,42 @@ ...@@ -84,6 +84,42 @@
#define NETWARE_SET_SCREEN_MODE(A) #define NETWARE_SET_SCREEN_MODE(A)
#endif #endif
/*
The macros below are used to allow build of Universal/fat binaries of
MySQL and MySQL applications under darwin.
*/
#ifdef TARGET_FAT_BINARY
# undef SIZEOF_CHARP
# undef SIZEOF_INT
# undef SIZEOF_LONG
# undef SIZEOF_LONG_LONG
# undef SIZEOF_OFF_T
# undef SIZEOF_SHORT
#if defined(__i386__)
# undef WORDS_BIGENDIAN
# define SIZEOF_CHARP 4
# define SIZEOF_INT 4
# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
# define SIZEOF_OFF_T 8
# define SIZEOF_SHORT 2
#elif defined(__ppc__)
# define WORDS_BIGENDIAN
# define SIZEOF_CHARP 4
# define SIZEOF_INT 4
# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
# define SIZEOF_OFF_T 8
# define SIZEOF_SHORT 2
#else
# error Building FAT binary for an unknown architecture.
#endif
#endif /* TARGET_FAT_BINARY */
/* /*
The macros below are borrowed from include/linux/compiler.h in the The macros below are borrowed from include/linux/compiler.h in the
Linux kernel. Use them to indicate the likelyhood of the truthfulness Linux kernel. Use them to indicate the likelyhood of the truthfulness
......
...@@ -18,6 +18,9 @@ typedef struct hash_cell_struct hash_cell_t; ...@@ -18,6 +18,9 @@ typedef struct hash_cell_struct hash_cell_t;
typedef void* hash_node_t; typedef void* hash_node_t;
/* Fix Bug #13859: symbol collision between imap/mysql */
#define hash_create hash0_create
/***************************************************************** /*****************************************************************
Creates a hash table with >= n array cells. The actual number Creates a hash table with >= n array cells. The actual number
of cells is chosen to be a prime number slightly bigger than n. */ of cells is chosen to be a prime number slightly bigger than n. */
......
...@@ -322,7 +322,7 @@ BASE=$BASE2 ...@@ -322,7 +322,7 @@ BASE=$BASE2
# #
if [ x"@GXX@" = x"yes" ] ; then if [ x"@GXX@" = x"yes" ] ; then
gcclib=`@CC@ --print-libgcc-file` gcclib=`@CC@ @CFLAGS@ --print-libgcc-file`
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
echo "Warning: Couldn't find libgcc.a!" echo "Warning: Couldn't find libgcc.a!"
else else
......
...@@ -22,6 +22,16 @@ command=".mysql.$$" ...@@ -22,6 +22,16 @@ command=".mysql.$$"
trap "interrupt" 2 trap "interrupt" 2
rootpass="" rootpass=""
echo_n=
echo_c=
set_echo_compat() {
case `echo "testing\c"`,`echo -n testing` in
*c*,-n*) echo_n= echo_c= ;;
*c*,*) echo_n=-n echo_c= ;;
*) echo_n= echo_c='\c' ;;
esac
}
prepare() { prepare() {
touch $config $command touch $config $command
...@@ -45,7 +55,7 @@ get_root_password() { ...@@ -45,7 +55,7 @@ get_root_password() {
status=1 status=1
while [ $status -eq 1 ]; do while [ $status -eq 1 ]; do
stty -echo stty -echo
echo -n "Enter current password for root (enter for none): " echo $echo_n "Enter current password for root (enter for none): $echo_c"
read password read password
echo echo
stty echo stty echo
...@@ -65,10 +75,10 @@ get_root_password() { ...@@ -65,10 +75,10 @@ get_root_password() {
set_root_password() { set_root_password() {
stty -echo stty -echo
echo -n "New password: " echo $echo_n "New password: $echo_c"
read password1 read password1
echo echo
echo -n "Re-enter new password: " echo $echo_n "Re-enter new password: $echo_c"
read password2 read password2
echo echo
stty echo stty echo
...@@ -173,6 +183,7 @@ cleanup() { ...@@ -173,6 +183,7 @@ cleanup() {
# The actual script starts here # The actual script starts here
prepare prepare
set_echo_compat
echo echo
echo echo
...@@ -201,11 +212,11 @@ echo "root user without the proper authorisation." ...@@ -201,11 +212,11 @@ echo "root user without the proper authorisation."
echo echo
if [ $hadpass -eq 0 ]; then if [ $hadpass -eq 0 ]; then
echo -n "Set root password? [Y/n] " echo $echo_n "Set root password? [Y/n] $echo_c"
else else
echo "You already have a root password set, so you can safely answer 'n'." echo "You already have a root password set, so you can safely answer 'n'."
echo echo
echo -n "Change the root password? [Y/n] " echo $echo_n "Change the root password? [Y/n] $echo_c"
fi fi
read reply read reply
...@@ -232,7 +243,7 @@ echo "go a bit smoother. You should remove them before moving into a" ...@@ -232,7 +243,7 @@ echo "go a bit smoother. You should remove them before moving into a"
echo "production environment." echo "production environment."
echo echo
echo -n "Remove anonymous users? [Y/n] " echo $echo_n "Remove anonymous users? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
...@@ -251,7 +262,7 @@ echo "Normally, root should only be allowed to connect from 'localhost'. This" ...@@ -251,7 +262,7 @@ echo "Normally, root should only be allowed to connect from 'localhost'. This"
echo "ensures that someone cannot guess at the root password from the network." echo "ensures that someone cannot guess at the root password from the network."
echo echo
echo -n "Disallow root login remotely? [Y/n] " echo $echo_n "Disallow root login remotely? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
echo " ... skipping." echo " ... skipping."
...@@ -270,7 +281,7 @@ echo "access. This is also intended only for testing, and should be removed" ...@@ -270,7 +281,7 @@ echo "access. This is also intended only for testing, and should be removed"
echo "before moving into a production environment." echo "before moving into a production environment."
echo echo
echo -n "Remove test database and access to it? [Y/n] " echo $echo_n "Remove test database and access to it? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
echo " ... skipping." echo " ... skipping."
...@@ -288,7 +299,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far" ...@@ -288,7 +299,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far"
echo "will take effect immediately." echo "will take effect immediately."
echo echo
echo -n "Reload privilege tables now? [Y/n] " echo $echo_n "Reload privilege tables now? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
echo " ... skipping." echo " ... skipping."
......
...@@ -340,7 +340,7 @@ install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/ ...@@ -340,7 +340,7 @@ install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
# Include libgcc.a in the devel subpackage (BUG 4921) # Include libgcc.a in the devel subpackage (BUG 4921)
if expr "$CC" : ".*gcc.*" > /dev/null ; if expr "$CC" : ".*gcc.*" > /dev/null ;
then then
libgcc=`$CC --print-libgcc-file` libgcc=`$CC $CFLAGS --print-libgcc-file`
if [ -f $libgcc ] if [ -f $libgcc ]
then then
%define have_libgcc 1 %define have_libgcc 1
...@@ -726,6 +726,11 @@ fi ...@@ -726,6 +726,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture.
* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com> * Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql" - Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment