Commit 5ebed189 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
parents 0f819461 46fbf384

Build-tools/Do-compile

+7 −7
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=""; 
$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_cluster=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;

$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_without_ndbcluster=0;

$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;



GetOptions(

	"bdb",
@@ -58,7 +58,6 @@ GetOptions( 
	"with-small-disk",

	"without-embedded",

	"clearlogs",

        "without-ndbcluster",

) || usage();



usage() if ($opt_help);
@@ -252,7 +251,6 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-raid" if ($opt_raid);

  $opt_config_options.= " --with-readline" if ($opt_readline);

  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);

  $opt_config_options.= " --without-ndbcluster" if ($opt_without_ndbcluster);

  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);



  # Only enable InnoDB when requested (required to be able to
@@ -308,7 +306,7 @@ if ($opt_stage <= 3) 
  }



  $flags.= " --no-strip" if ($opt_no_strip || $opt_with_debug);

  $flags.= " --with-ndbcluster" if ($opt__with_ndbcluster);

  $flags.= " --with-ndbcluster" if ($opt_with_cluster);

  check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created");

  safe_system("mv mysql*.t*gz $pwd/$host");

  if (-f "client/.libs/mysqladmin")
@@ -347,10 +345,12 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" . 
#

if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)

{

  my $flags= "";

  $flags.= " --with-ndbcluster" if ($opt_with_cluster);

  log_timestamp();

  system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);

  safe_cd("${test_dir}/mysql-test");

  check_system("./mysql-test-run --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

  check_system("./mysql-test-run $flags --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

}



#
@@ -571,7 +571,7 @@ If user is empty then no mail is sent. 
Set name suffix (e.g. 'com' or '-max') for a distribution



--with cluster

Compile with NDB Cluster

Compile and test with NDB Cluster enabled



--with-debug

Build binaries with debug information (implies "--no-strip")

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ 
      ;;

  esac



  AM_CONDITIONAL(HAVE_NDBCLUSTER_DB, test "have_ndbcluster" = "yes")

  AM_CONDITIONAL([HAVE_NDBCLUSTER_DB], [ test "$have_ndbcluster" = "yes" ])

  AC_SUBST(ndbcluster_includes)

  AC_SUBST(ndbcluster_libs)

  AC_SUBST(ndbcluster_system_libs)

configure.in

+5 −3
Original line number Diff line number Diff line
@@ -370,12 +370,15 @@ AC_SUBST(INSTALL_SCRIPT) 


export CC CXX CFLAGS LD LDFLAGS AR



ndb_cxxflags_fix=

if test "$GXX" = "yes"

then

  # mysqld requires -fno-implicit-templates.

  # Disable exceptions as they seams to create problems with gcc and threads.

  # mysqld doesn't use run-time-type-checking, so we disable it.

  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"

  # ndb cannot be compiled with -fno-implicit-templaces

  ndb_cxxflags_fix=-fimplicit-templates



  # If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,

  # we will gets some problems when linking static programs.
@@ -2892,21 +2895,20 @@ if test X"$have_ndbcluster" = Xyes 
then

  MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"



  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"

  if test "$with_debug" = "yes"

  then

    # Medium debug.

    NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"

    CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_DEBUG_LOC)"

  elif test "$with_debug" = "full"

  then

    NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"

    CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_DEBUG_LOC)"

  else

    NDB_DEFS="-DNDEBUG"

    CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_RELEASE_LOC)"

  fi



AC_SUBST([NDB_DEFS])

AC_SUBST([ndb_cxxflags_fix])



ndb_transporter_opt_objs=""

if test X"$have_ndb_shm" = Xyes

libmysql/libmysql.c

+1 −0
Original line number Diff line number Diff line
@@ -3880,6 +3880,7 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) 
    free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));

    result->data= NULL;

    result->rows= 0;

    mysql->status= MYSQL_STATUS_READY;

    DBUG_RETURN(1);

  }

mysys/charset.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,6 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) 
    }

    cs= (cs->state & MY_CS_AVAILABLE) ? cs : NULL;

  }

  pthread_mutex_unlock(&THR_LOCK_charset);

  if (cs && !(cs->state & MY_CS_READY))

  {

    if ((cs->cset->init && cs->cset->init(cs, cs_alloc)) ||
@@ -478,6 +477,7 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) 
    else

      cs->state|= MY_CS_READY;

  }

  pthread_mutex_unlock(&THR_LOCK_charset);

  return cs;

}