Commit 7d512b15 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into lmy004.:/work/mysql-5.0-bug12651
parents be71e4e9 d44ed347

mysql-test/r/group_by.result

+7 −7
Original line number Diff line number Diff line
@@ -751,13 +751,6 @@ COUNT(DISTINCT(t1.id)) comment 
1	NULL

1	a problem

DROP TABLE t1, t2;

create table t1 (f1 date);

insert into t1 values('2005-06-06');

insert into t1 values('2005-06-06');

select date(left(f1+0,8)) from t1 group by 1;

date(left(f1+0,8))

2005-06-06

drop table t1;

create table t1(f1 varchar(5) key);

insert into t1 values (1),(2);

select sql_buffer_result max(f1) is null from t1;
@@ -767,6 +760,13 @@ select sql_buffer_result max(f1)+1 from t1; 
max(f1)+1

3

drop table t1;

create table t1 (f1 date);

insert into t1 values('2005-06-06');

insert into t1 values('2005-06-06');

select date(left(f1+0,8)) from t1 group by 1;

date(left(f1+0,8))

2005-06-06

drop table t1;

CREATE TABLE t1 (n int);

INSERT INTO t1 VALUES (1);

SELECT n+1 AS n FROM t1 GROUP BY n;

mysql-test/r/olap.result

+1 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ a LENGTH(a) COUNT(*) 
1	1	1

2	1	1

NULL	NULL	2

DROP TABLE t1;

CREATE TABLE t1(id int, type char(1));

INSERT INTO t1 VALUES

(1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

mysql-test/t/group_by.test

+16 −6
Original line number Diff line number Diff line
@@ -575,6 +575,12 @@ CREATE TABLE t1 (id varchar(20) NOT NULL); 
INSERT INTO t1 VALUES ('trans1'), ('trans2');

CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL);

INSERT INTO t2 VALUES ('trans1', 'a problem');



SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment

  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;



DROP TABLE t1, t2;



#

# BUG#12695: Item_func_isnull::update_used_tables

# did not update const_item_cache
@@ -585,12 +591,6 @@ select sql_buffer_result max(f1) is null from t1; 
select sql_buffer_result max(f1)+1 from t1;

drop table t1;



SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment

  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;



DROP TABLE t1, t2;





#

# Bug #12266 GROUP BY expression on DATE column produces result with

#            reduced length
@@ -612,6 +612,16 @@ SELECT n+1 AS n FROM t1 GROUP BY n; 
--enable_ps_protocol

DROP TABLE t1;



#

# BUG#12695: Item_func_isnull::update_used_tables

# did not update const_item_cache

#

create table t1(f1 varchar(5) key);

insert into t1 values (1),(2);

select sql_buffer_result max(f1) is null from t1;

select sql_buffer_result max(f1)+1 from t1;

drop table t1;



# End of 4.1 tests



#

sql/handler.cc

+13 −5
Original line number Diff line number Diff line
@@ -570,6 +570,8 @@ int ha_prepare(THD *thd) 
    {

      int err;

      statistic_increment(thd->status_var.ha_prepare_count,&LOCK_status);

      if ((*ht)->prepare)

      {

        if ((err= (*(*ht)->prepare)(thd, all)))

        {

          my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
@@ -578,6 +580,12 @@ int ha_prepare(THD *thd) 
          break;

        }

      }

      else

      {

        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,

                            ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA), (*ht)->name);

      }

    }

  }

#endif /* USING_TRANSACTIONS */

  DBUG_RETURN(error);