Commit 4a3d6143 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


configure.in:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
parents 379a034b 4acc08c5

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -15,3 +15,5 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 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

AM_INIT_AUTOMAKE(mysql, 5.0.29)

AM_INIT_AUTOMAKE(mysql, 5.0.30)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=29

NDB_VERSION_BUILD=30

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/abi_check

0 → 100644
+0 −0

Empty file added.

include/abi_check.ic

0 → 100644
+914 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/mysql-test-run.pl

+9 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ our $opt_fast; 
our $opt_force;

our $opt_reorder= 0;

our $opt_enable_disabled;

our $opt_mem;

our $opt_mem= $ENV{'MTR_MEM'};



our $opt_gcov;

our $opt_gcov_err;
@@ -743,7 +743,7 @@ sub command_line_setup () { 


    # Use /dev/shm as the preferred location for vardir and

    # thus implicitly also tmpdir. Add other locations to list

    my @tmpfs_locations= ("/dev/shm");

    my @tmpfs_locations= ($opt_mem, "/dev/shm");

    # One could maybe use "mount" to find tmpfs location(s)

    foreach my $fs (@tmpfs_locations)

    {
@@ -3361,6 +3361,11 @@ sub mysqld_arguments ($$$$$) { 
  if ( $opt_valgrind_mysqld )

  {

    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);



    if ( $mysql_version_id < 50100 )

    {

      mtr_add_arg($args, "%s--skip-bdb", $prefix);

    }

  }



  my $pidfile;
@@ -4643,9 +4648,9 @@ Options to control directories to use 
  vardir=DIR            The directory where files generated from the test run

                        is stored (default: ./var). Specifying a ramdisk or

                        tmpfs will speed up tests.

  mem=DIR               Run testsuite in "memory" using tmpfs if

  mem                   Run testsuite in "memory" using tmpfs if

                        available(default: /dev/shm)



                        reads path from MTR_MEM environment variable



Options to control what test suites or cases to run