Commit 20994fec authored by unknown's avatar unknown
Browse files

Merge 4.1->5.0 


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/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/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents cf0b4702 213fa9cb

client/mysqlimport.c

+2 −1
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ static char *add_load_option(char *ptr,const char *object, 
			     const char *statement);



static my_bool	verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0,

		replace=0,silent=0,ignore=0,opt_compress=0,opt_local_file=0,

		replace=0,silent=0,ignore=0,opt_compress=0,

                opt_low_priority= 0, tty_password= 0;

static uint     opt_local_file=0;

static MYSQL	mysql_connection;

static char	*opt_password=0, *current_user=0,

		*current_host=0, *current_db=0, *fields_terminated=0,

mysql-test/r/connect.result

+6 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

show tables;

Tables_in_mysql

columns_priv
@@ -71,3 +72,8 @@ show tables; 
Tables_in_test

delete from mysql.user where user=_binary"test";

flush privileges;

create table t1 (id integer not null auto_increment primary key);

create temporary table t2(id integer not null auto_increment primary key);

set @id := 1;

delete from t1 where id like @id;

drop table t1;

mysql-test/r/func_gconcat.result

+20 −0
Original line number Diff line number Diff line
@@ -576,3 +576,23 @@ group_concat('x') 
NULL

1

drop table t1;

CREATE TABLE t1 (id int, a varchar(9));

INSERT INTO t1 VALUES

(2, ''), (1, ''), (2, 'x'), (1, 'y'), (3, 'z'), (3, '');

SELECT GROUP_CONCAT(a) FROM t1;

GROUP_CONCAT(a)

,,x,y,z,

SELECT GROUP_CONCAT(a ORDER BY a) FROM t1;

GROUP_CONCAT(a ORDER BY a)

,,,x,y,z

SELECT GROUP_CONCAT(a) FROM t1 GROUP BY id;

GROUP_CONCAT(a)

,y

,x

z,

SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY id;

GROUP_CONCAT(a ORDER BY a)

,y

,x

,z

DROP TABLE t1;

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

+13 −0
Original line number Diff line number Diff line
@@ -555,6 +555,19 @@ IFNULL(a, 'TEST') COALESCE(b, 'TEST') 
4	TEST

TEST	TEST

DROP TABLE t1,t2;

DROP TABLE t1;

CREATE TABLE t1 (a int(11) NOT NULL);

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

SELECT * FROM (SELECT a, a + 1, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

a	a + 1	COUNT(*)

1	2	1

2	3	1

NULL	NULL	2

SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

a	LENGTH(a)	COUNT(*)

1	1	1

2	1	1

NULL	NULL	2

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

INSERT INTO t1 VALUES

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