Commit 69e54f84 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
parents 099e770e 6978949b

mysql-test/mysql-test-run.pl

+11 −5
Original line number Diff line number Diff line
@@ -3194,11 +3194,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");
@@ -3314,6 +3309,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/having.result

+0 −2
Original line number Diff line number Diff line
@@ -360,8 +360,6 @@ s1 count(s1) 
y	1

drop table t1;

DROP SCHEMA IF EXISTS HU;

Warnings:

Note	1008	Can't drop database 'HU'; database doesn't exist

CREATE SCHEMA HU ;

USE HU ;

CREATE TABLE STAFF

mysql-test/r/view.result

+21 −0
Original line number Diff line number Diff line
@@ -2579,3 +2579,24 @@ COUNT(*) 
2

DROP VIEW v2;

DROP TABLE t1, t2;

CREATE TABLE t1 (id int NOT NULL PRIMARY KEY,

td date DEFAULT NULL, KEY idx(td));

INSERT INTO t1 VALUES 

(1, '2005-01-01'), (2, '2005-01-02'), (3, '2005-01-02'),

(4, '2005-01-03'), (5, '2005-01-04'), (6, '2005-01-05'),

(7, '2005-01-05'), (8, '2005-01-05'), (9, '2005-01-06');

CREATE VIEW v1 AS SELECT * FROM t1;

SELECT * FROM t1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';

id	td

2	2005-01-02

3	2005-01-02

4	2005-01-03

5	2005-01-04

SELECT * FROM v1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';

id	td

2	2005-01-02

3	2005-01-02

4	2005-01-03

5	2005-01-04

DROP VIEW v1;

DROP TABLE t1;

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;

mysql-test/t/having.test

+2 −0
Original line number Diff line number Diff line
@@ -354,7 +354,9 @@ drop table t1; 
# when the server is run on Windows or with --lower-case-table-names=1

#



--disable_warnings

DROP SCHEMA IF EXISTS HU;

--enable_warnings

CREATE SCHEMA HU ;

USE HU ;