Commit 58e08f25 authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files

Pull some bug fixes from the main tree.

parents 9435858a 0905d040

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ static int read_and_execute(bool interactive) 
        the very beginning of a text file when

        you save the file using "Unicode UTF-8" format.

      */

      if (!line_number &&

      if (line && !line_number &&

           (uchar) line[0] == 0xEF &&

           (uchar) line[1] == 0xBB &&

           (uchar) line[2] == 0xBF)

mysql-test/r/subselect.result

+7 −0
Original line number Diff line number Diff line
@@ -4391,3 +4391,10 @@ SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1); 
s1

a

DROP TABLE t1;

CREATE TABLE t1(c int, KEY(c));

CREATE TABLE t2(a int, b int);

INSERT INTO t2 VALUES (1, 10), (2, NULL);

INSERT INTO t1 VALUES (1), (3);

SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);

a	b

DROP TABLE t1,t2;

mysql-test/suite/rpl/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ 


rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)

rpl_innodb_bug28430        : Failure on Solaris Bug #36793

rpl_server_id1             : Bug #36818 rpl_server_id1 fails expecting slave has stopped (azundris)

mysql-test/t/subselect.test

+12 −0
Original line number Diff line number Diff line
@@ -3273,3 +3273,15 @@ INSERT INTO t1 VALUES ('a'); 
SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

DROP TABLE t1;



#

# Bug #37004: NOT IN subquery with MAX over an empty set

#



CREATE TABLE t1(c int, KEY(c));

CREATE TABLE t2(a int, b int);

INSERT INTO t2 VALUES (1, 10), (2, NULL);

INSERT INTO t1 VALUES (1), (3);



SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);



DROP TABLE t1,t2;

sql/sql_select.cc

+2 −0
Original line number Diff line number Diff line
@@ -888,6 +888,7 @@ JOIN::optimize() 
      {

        DBUG_PRINT("info",("No matching min/max row"));

	zero_result_cause= "No matching min/max row";

        tables= 0;

	error=0;

	DBUG_RETURN(0);

      }
@@ -901,6 +902,7 @@ JOIN::optimize() 
      {

        DBUG_PRINT("info",("No matching min/max row"));

        zero_result_cause= "No matching min/max row";

        tables= 0;

        error=0;

        DBUG_RETURN(0);

      }