Commit cf76bb51 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents 6dcad7d8 84e89916

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

+28 −6
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)
@@ -678,6 +678,21 @@ else 
  AC_MSG_RESULT([no])

fi



# If we should allow init-file, skip-grant-table and bootstrap options

AC_MSG_CHECKING(If we should should enable init-file, skip-grant-table options and bootstrap)

AC_ARG_ENABLE(grant-options,

    [  --disable-grant-options Disables the use of --init-file, --skip-grant-tables and --bootstrap options],

    [ mysql_grant_options_enabled=$enableval ],

    [ mysql_grant_options_enabled=yes ]

    )

if test "$mysql_grant_options_enabled" = "yes"

then

  AC_MSG_RESULT([yes])

else

  AC_DEFINE([DISABLE_GRANT_OPTIONS], [1],

            [Disables the use of --init-file, --skip-grant-tables and --bootstrap options])

  AC_MSG_RESULT([no])

fi



MYSQL_SYS_LARGEFILE
@@ -963,6 +978,7 @@ case $SYSTEM_TYPE in 
    fi

    ;;

  *darwin*)

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

    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 +2431,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 +2467,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

mysql-test/install_test_db.sh

+8 −3
Original line number Diff line number Diff line
@@ -66,14 +66,17 @@ ldata=$fix_bin/$data 
mdata=$data/mysql

EXTRA_ARG=""



if test ! -x $execdir/mysqld

mysqld=

if test -x $execdir/mysqld

then

  mysqld=$execdir/mysqld

else

  if test ! -x $libexecdir/mysqld

  then

    echo "mysqld is missing - looked in $execdir and in $libexecdir"

    exit 1

  else

    execdir=$libexecdir

    mysqld=$libexecdir/mysqld

  fi

fi
@@ -99,7 +102,9 @@ basedir=. 
EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"

fi



mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"



mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

echo "running $mysqld_boot"



if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot

mysql-test/mysql-test-run.pl

+9 −2
Original line number Diff line number Diff line
@@ -2873,12 +2873,19 @@ sub install_db ($$) { 
    mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);

  }



  # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g.,

  # configure --disable-grant-options), mysqld will not recognize the

  # --bootstrap or --skip-grant-tables options.  The user can set

  # MYSQLD_BOOTSTRAP to the full path to a mysqld which does accept

  # --bootstrap, to accommodate this.

  my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || $exe_mysqld;



  # Log bootstrap command

  my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";

  mtr_tofile($path_bootstrap_log,

	     "$exe_mysqld " . join(" ", @$args) . "\n");

	     "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");



  if ( mtr_run($exe_mysqld, $args, $init_db_sql_tmp,

  if ( mtr_run($exe_mysqld_bootstrap, $args, $init_db_sql_tmp,

               $path_bootstrap_log, $path_bootstrap_log,

	       "", { append_log_file => 1 }) != 0 )