Commit e55b495d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-bug5390
parents 35d9a7b8 fc1a194e

mysql-test/mysql-test-run.pl

+11 −5
Original line number Diff line number Diff line
@@ -2942,11 +2942,6 @@ sub run_mysqltest ($) { 


  mtr_init_args(\$args);



  if ( $opt_valgrind_mysqltest )

  {

    valgrind_arguments($args, \$exe);

  }



  mtr_add_arg($args, "--no-defaults");

  mtr_add_arg($args, "--silent");

  mtr_add_arg($args, "-v");
@@ -3062,6 +3057,17 @@ sub run_mysqltest ($) { 
  # Add arguments that should not go into the MYSQL_TEST env var

  # ----------------------------------------------------------------------



  if ( $opt_valgrind_mysqltest )

  {

    # Prefix the Valgrind options to the argument list.

    # We do this here, since we do not want to Valgrind the nested invocations

    # of mysqltest; that would mess up the stderr output causing test failure.

    my @args_saved = @$args;

    mtr_init_args(\$args);

    valgrind_arguments($args, \$exe);

    mtr_add_arg($args, "%s", $_) for @args_saved;

  }



  mtr_add_arg($args, "--test-file");

  mtr_add_arg($args, $tinfo->{'path'});

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ Variable_name Value 
innodb_sync_spin_loops	20

show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	0

innodb_thread_concurrency	8

set global innodb_thread_concurrency=1001;

show variables like "innodb_thread_concurrency";

Variable_name	Value

mysql-test/t/cast.test

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ select cast(1.0e+300 as signed int); 
CREATE TABLE t1 (f1 double);

INSERT INTO t1 SET f1 = -1.0e+30 ;

INSERT INTO t1 SET f1 = +1.0e+30 ;

# Expected result is +-1e+30, but Windows returns +-1e+030.

--replace_result 1e+030 1e+30

SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;

DROP TABLE t1;