Commit 32c535e2 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M51/mysql-5.1 

into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
parents bd27fcf8 89177e6e

BUILD/check-cpu

+1 −2
Original line number Diff line number Diff line
@@ -177,8 +177,7 @@ check_cpu () { 
  touch __test.c



  while [ "$cpu_arg" ] ; do

    # FIXME: echo -n isn't portable - see contortions autoconf goes through

    echo -n testing $cpu_arg "... " >&2

    printf "testing $cpu_arg ... " >&2

          

    # compile check

    check_cpu_cflags=`eval echo $check_cpu_args`

configure.in

+13 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.52)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

# remember to also update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)

AM_CONFIG_HEADER(config.h)
@@ -963,6 +963,8 @@ case $SYSTEM_TYPE in 
    fi

    ;;

  *darwin*)

    AC_DEFINE([DEFAULT_SKIP_THREAD_PRIORITY], [1], [default to skip thread priority])

    CPPFLAGS="-D"

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
@@ -2415,14 +2417,16 @@ thread_dirs= 


dnl This probably should be cleaned up more - for now the threaded

dnl client is just using plain-old libs.

sql_client_dirs="strings regex mysys libmysql client"

sql_client_dirs=

linked_client_targets="linked_libmysql_sources"



AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")



if test "$THREAD_SAFE_CLIENT" != "no"

if test "$THREAD_SAFE_CLIENT" = "no"

then

  sql_client_dirs="libmysql_r $sql_client_dirs"

  sql_client_dirs="strings regex mysys extra libmysql client"

else

  sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"

  linked_client_targets="$linked_client_targets linked_libmysql_r_sources"

  AC_CONFIG_FILES(libmysql_r/Makefile)

  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should the client be thread safe])
@@ -2449,13 +2453,17 @@ AC_SUBST(netware_dir) 
AC_SUBST(linked_netware_sources)

AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")



if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"

if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"

then

  AC_DEFINE([THREAD], [1],

            [Define if you want to have threaded code. This may be undef on client code])

  # Avoid _PROGRAMS names

  THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"

  AC_SUBST(THREAD_LOBJECTS)

fi



if test "$with_server" != "no"

then

  server_scripts="mysqld_safe mysql_install_db"

  sql_server_dirs="strings mysys dbug extra regex"

include/my_global.h

+36 −0
Original line number Diff line number Diff line
@@ -92,6 +92,42 @@ 
#define NETWARE_SET_SCREEN_MODE(A)

#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

  Linux kernel. Use them to indicate the likelyhood of the truthfulness

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ BASE=$BASE2 
#



if [ x"@GXX@" = x"yes" ] ; then

  gcclib=`@CC@ --print-libgcc-file`

  gcclib=`@CC@ @CFLAGS@ --print-libgcc-file`

  if [ $? -ne 0 ] ; then

    echo "Warning: Couldn't find libgcc.a!"

  else

scripts/mysql_secure_installation.sh

+20 −9
Original line number Diff line number Diff line
@@ -21,6 +21,16 @@ command=".mysql.$$" 
trap "interrupt" 2



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() {

    touch $config $command
@@ -44,7 +54,7 @@ get_root_password() { 
    status=1

    while [ $status -eq 1 ]; do

	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

	echo

	stty echo
@@ -64,10 +74,10 @@ get_root_password() { 


set_root_password() {

    stty -echo

    echo -n "New password: "

    echo $echo_n "New password: $echo_c"

    read password1

    echo

    echo -n "Re-enter new password: "

    echo $echo_n "Re-enter new password: $echo_c"

    read password2

    echo

    stty echo
@@ -172,6 +182,7 @@ cleanup() { 
# The actual script starts here



prepare

set_echo_compat



echo

echo
@@ -200,11 +211,11 @@ echo "root user without the proper authorisation." 
echo



if [ $hadpass -eq 0 ]; then

    echo -n "Set root password? [Y/n] "

    echo $echo_n "Set root password? [Y/n] $echo_c"

else

    echo "You already have a root password set, so you can safely answer 'n'."

    echo

    echo -n "Change the root password? [Y/n] "

    echo $echo_n "Change the root password? [Y/n] $echo_c"

fi



read reply
@@ -231,7 +242,7 @@ echo "go a bit smoother. You should remove them before moving into a" 
echo "production environment."

echo



echo -n "Remove anonymous users? [Y/n] "

echo $echo_n "Remove anonymous users? [Y/n] $echo_c"



read reply

if [ "$reply" = "n" ]; then
@@ -250,7 +261,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



echo -n "Disallow root login remotely? [Y/n] "

echo $echo_n "Disallow root login remotely? [Y/n] $echo_c"

read reply

if [ "$reply" = "n" ]; then

    echo " ... skipping."
@@ -269,7 +280,7 @@ echo "access. This is also intended only for testing, and should be removed" 
echo "before moving into a production environment."

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

if [ "$reply" = "n" ]; then

    echo " ... skipping."
@@ -287,7 +298,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far" 
echo "will take effect immediately."

echo



echo -n "Reload privilege tables now? [Y/n] "

echo $echo_n "Reload privilege tables now? [Y/n] $echo_c"

read reply

if [ "$reply" = "n" ]; then

    echo " ... skipping."