Commit a5ecdeba authored by unknown's avatar unknown
Browse files

Merge 


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/r/type_time.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
parents 6642eb05 2de5c141

BUILD/Makefile.am

+21 −2
Original line number Diff line number Diff line
@@ -21,27 +21,46 @@ EXTRA_DIST = FINISH.sh \ 
			SETUP.sh \

			autorun.sh \

			check-cpu \

			cleanup \

			compile-alpha \

			compile-alpha-ccc \

			compile-alpha-cxx \

			compile-alpha-debug \

			compile-amd64-debug-max \

			compile-amd64-max \

			compile-darwin-mwcc \

			compile-dist \

			compile-hpux11-parisc2-aCC \

			compile-ia64-debug-max \

			compile-irix-mips64-mipspro \

			compile-pentium \

			compile-pentium-debug \

			compile-pentium-debug-max \

			compile-pentium-debug-max-no-embedded \

			compile-pentium-debug-max-no-ndb \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \

			compile-pentium-gcov \

			compile-pentium-gprof \

			compile-pentium-icc \

			compile-pentium-icc-valgrind-max \

			compile-pentium-icc-yassl \

			compile-pentium-max \

			compile-pentium-myodbc \

			compile-pentium-mysqlfs-debug \

			compile-pentium-pgcc \

			compile-pentium-valgrind-max \

			compile-pentium64-debug \

			compile-pentium64-debug-max \

			compile-pentium64-valgrind-max \

			compile-ppc \

			compile-ppc-debug \

			compile-ppc-debug-max \

			compile-ppc-debug-max-no-ndb \

			compile-ppc-max \

			compile-solaris-sparc \

			compile-solaris-sparc-debug \

			compile-irix-mips64-mipspro \

			compile-hpux11-parisc2-aCC \

			compile-solaris-sparc-forte \

			compile-solaris-sparc-purify

mysql-test/lib/mtr_stress.pl

+8 −0
Original line number Diff line number Diff line
@@ -145,6 +145,14 @@ sub run_stress_test () 
    mtr_add_arg($args, "--stress-init-file=%", $::opt_stress_init_file);

  }



  if ( !$::opt_stress_loop_count && !$::opt_stress_test_count &&

       !$::opt_stress_test_duration )

  {

    #Limit stress testing with 20 loops in case when any limit parameter 

    #was specified 

    $::opt_stress_test_count=20;

  }



  if ( $::opt_stress_loop_count )

  {

    mtr_add_arg($args, "--loop-count=%s", $::opt_stress_loop_count);

mysql-test/mysql-test-run.pl

+3 −3
Original line number Diff line number Diff line
@@ -277,9 +277,9 @@ our $opt_stress= ""; 
our $opt_stress_suite=     "main";

our $opt_stress_mode=    "random";

our $opt_stress_threads=        5;

our $opt_stress_test_count=    20;

our $opt_stress_loop_count=    "";

our $opt_stress_test_duration= "";

our $opt_stress_test_count=     0;

our $opt_stress_loop_count=     0;

our $opt_stress_test_duration=  0;

our $opt_stress_init_file=     "";

our $opt_stress_test_file=     "";

mysql-test/mysql-test-run.sh

+10 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ DO_STRESS="" 
STRESS_SUITE="main"

STRESS_MODE="random"

STRESS_THREADS=5

STRESS_TEST_COUNT=20

STRESS_TEST_COUNT=""

STRESS_LOOP_COUNT=""

STRESS_TEST_DURATION=""

STRESS_INIT_FILE=""
@@ -1917,7 +1917,7 @@ run_stress_test() 
                    --stress-basedir=$STRESS_BASEDIR \

                    --server-logs-dir=$STRESS_BASEDIR \

                    --stress-mode=$STRESS_MODE \

                    --mysqltest=$BASEDIR/client/mysqltest \

                    --mysqltest=$CLIENT_BINDIR/mysqltest \

                    --threads=$STRESS_THREADS \

                    --verbose \

                    --cleanup \
@@ -1928,6 +1928,14 @@ run_stress_test() 
    STRESS_TEST_ARGS="$STRESS_TEST_ARGS --stress-init-file=$STRESS_INIT_FILE"

  fi



  if [ -z "$STRESS_LOOP_COUNT" -a -z  "$STRESS_TEST_COUNT" -a 

       -z "$STRESS_TEST_DURATION" ] ; then 



    #Limit stress testing with 20 loops in case when any limit parameter

    #was specified

    STRESS_TEST_COUNT=20

  fi



  if [ -n "$STRESS_LOOP_COUNT" ] ; then 

    STRESS_TEST_ARGS="$STRESS_TEST_ARGS --loop-count=$STRESS_LOOP_COUNT"

  fi

mysql-test/r/type_time.result

+24 −0
Original line number Diff line number Diff line
@@ -85,3 +85,27 @@ sec_to_time(time_to_sec(t)) 
13:00:00

09:00:00

drop table t1;

SELECT CAST(235959.123456 AS TIME);

CAST(235959.123456 AS TIME)

23:59:59.123456

SELECT CAST(0.235959123456e+6 AS TIME);

CAST(0.235959123456e+6 AS TIME)

23:59:59.123456

SELECT CAST(235959123456e-6 AS TIME);

CAST(235959123456e-6 AS TIME)

23:59:59.123456

SELECT CAST(235959.1234567 AS TIME);

CAST(235959.1234567 AS TIME)

23:59:59.123456

Warnings:

Warning	1292	Truncated incorrect time value: '235959.1234567'

SELECT CAST(0.2359591234567e6 AS TIME);

CAST(0.2359591234567e6 AS TIME)

23:59:59.123456

Warnings:

Warning	1292	Truncated incorrect time value: '235959.1234567'

SELECT CAST(0.2359591234567e+30 AS TIME);

CAST(0.2359591234567e+30 AS TIME)

NULL

Warnings:

Warning	1292	Truncated incorrect time value: '2.359591234567e+29'