Commit 0ef988ad authored by unknown's avatar unknown
Browse files

Post-merge fixes 


client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 5ed7e973 f32088a9

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -758,6 +758,15 @@ 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;

max(f1) is null

0

select sql_buffer_result max(f1)+1 from t1;

max(f1)+1

3

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

+0 −1
Original line number Diff line number Diff line
@@ -579,7 +579,6 @@ 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

+10 −0
Original line number Diff line number Diff line
@@ -575,6 +575,16 @@ 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');

#

# 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;



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

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

mysql-test/t/olap.test

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP; 


DROP TABLE t1;



#

# Bug #12885(1): derived table specified by a subquery with

#                ROLLUP over expressions on not nullable group by attributes 

#

sql/item_cmpfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ class Item_func_isnull :public Item_bool_func 
    else

    {

      args[0]->update_used_tables();

      if (!(used_tables_cache=args[0]->used_tables()))

      if ((const_item_cache= !(used_tables_cache= args[0]->used_tables())))

      {

	/* Remember if the value is always NULL or never NULL */

	cached_value= (longlong) args[0]->is_null();