Commit 38c8951d authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files

Merge bk@192.168.21.1:mysql-4.1 

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
parents fbd59055 268be068

mysql-test/r/innodb_mysql.result

+21 −0
Original line number Diff line number Diff line
@@ -161,4 +161,25 @@ SELECT * FROM t1; 
c1	cnt

1a	2

DROP TABLE t1;

CREATE TABLE t1 (

a1 decimal(10,0) DEFAULT NULL,

a2 blob,

a3 time DEFAULT NULL,

a4 blob,

a5 char(175) DEFAULT NULL,

a6 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',

a7 tinyblob,

INDEX idx (a6,a7(239),a5)

) ENGINE=InnoDB;

EXPLAIN SELECT a4 FROM t1 WHERE

a6=NULL AND

a4='UNcT5pIde4I6c2SheTo4gt92OV1jgJCVkXmzyf325R1DwLURkbYHwhydANIZMbKTgdcR5xS';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables

EXPLAIN SELECT t1.a4 FROM t1, t1 t WHERE

t.a6=t.a6 AND t1.a6=NULL AND

t1.a4='UNcT5pIde4I6c2SheTo4gt92OV1jgJCVkXmzyf325R1DwLURkbYHwhydANIZMbKTgdcR5xS';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables

DROP TABLE t1;

End of 4.1 tests

mysql-test/r/ps.result

+22 −0
Original line number Diff line number Diff line
@@ -1087,4 +1087,26 @@ t2 CREATE TABLE `t2` ( 
drop database mysqltest;

deallocate prepare stmt1;

deallocate prepare stmt2;

CREATE TABLE t1(a int);

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

PREPARE st1 FROM

'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';

EXECUTE st1;

a

1

2

3

11

12

13

EXECUTE st1;

a

1

2

3

11

12

13

DEALLOCATE PREPARE st1;

DROP TABLE t1;

End of 4.1 tests.

mysql-test/t/innodb_mysql.test

+25 −0
Original line number Diff line number Diff line
@@ -191,4 +191,29 @@ INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1; 
SELECT * FROM t1;

DROP TABLE t1;



#

# Bug #28272: EXPLAIN for SELECT from an empty InnoDB table

#



CREATE TABLE t1 (

  a1 decimal(10,0) DEFAULT NULL,

  a2 blob,

  a3 time DEFAULT NULL,

  a4 blob,

  a5 char(175) DEFAULT NULL,

  a6 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',

  a7 tinyblob,

  INDEX idx (a6,a7(239),a5)

) ENGINE=InnoDB;



EXPLAIN SELECT a4 FROM t1 WHERE

a6=NULL AND

a4='UNcT5pIde4I6c2SheTo4gt92OV1jgJCVkXmzyf325R1DwLURkbYHwhydANIZMbKTgdcR5xS';



EXPLAIN SELECT t1.a4 FROM t1, t1 t WHERE

t.a6=t.a6 AND t1.a6=NULL AND

t1.a4='UNcT5pIde4I6c2SheTo4gt92OV1jgJCVkXmzyf325R1DwLURkbYHwhydANIZMbKTgdcR5xS';



DROP TABLE t1;



--echo End of 4.1 tests

mysql-test/t/ps.test

+18 −0
Original line number Diff line number Diff line
@@ -1128,4 +1128,22 @@ drop database mysqltest; 
deallocate prepare stmt1;

deallocate prepare stmt2;

#



#

# Bug #27937: crash on the second execution for prepared statement 

#             from UNION with ORDER BY an expression containing RAND()

#



CREATE TABLE t1(a int);

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



PREPARE st1 FROM

  '(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';



EXECUTE st1;

EXECUTE st1;



DEALLOCATE PREPARE st1;

DROP TABLE t1;



--echo End of 4.1 tests.

sql/sql_select.cc

+6 −0
Original line number Diff line number Diff line
@@ -634,6 +634,12 @@ JOIN::optimize() 
    DBUG_PRINT("error",("Error: make_select() failed"));

    DBUG_RETURN(1);

  }

  if (conds &&!outer_join && const_table_map != found_const_table_map && 

      (select_options & SELECT_DESCRIBE) &&

      select_lex->master_unit() == &thd->lex->unit) // upper level SELECT

  {

    conds=new Item_int((longlong) 0,1);	// Always false

  }

  if (make_join_select(this, select, conds))

  {

    zero_result_cause=