Commit 66e6808e authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 2cb2374b 682baee2

client/mysqltest.c

+9 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL, 
Q_START_TIMER, Q_END_TIMER,

Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,

Q_EXIT,

Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,



Q_UNKNOWN,			       /* Unknown command.   */

Q_COMMENT,			       /* Comments, ignored. */
@@ -382,6 +383,8 @@ const char *command_names[]= 
  "disable_ps_protocol",

  "enable_ps_protocol",

  "exit",

  "disable_reconnect",

  "enable_reconnect",

  0

};
@@ -3895,6 +3898,12 @@ int main(int argc, char **argv) 
      case Q_ENABLE_PS_PROTOCOL:

        ps_protocol_enabled= ps_protocol;

        break;

      case Q_DISABLE_RECONNECT:

        cur_con->mysql.reconnect= 0;

        break;

      case Q_ENABLE_RECONNECT:

        cur_con->mysql.reconnect= 1;

        break;



      case Q_EXIT:

        abort_flag= 1;

mysql-test/r/join_outer.result

+19 −0
Original line number Diff line number Diff line
@@ -924,3 +924,22 @@ a b a b 
3	1	NULL	NULL

4	2	NULL	NULL

DROP TABLE t1,t2;

set group_concat_max_len=5;

create table t1 (a int, b varchar(20));

create table t2 (a int, c varchar(20));

insert into t1 values (1,"aaaaaaaaaa"),(2,"bbbbbbbbbb");

insert into t2 values (1,"cccccccccc"),(2,"dddddddddd");

select group_concat(t1.b,t2.c) from t1 left join t2 using(a) group by t1.a;

group_concat(t1.b,t2.c)

aaaaa

bbbbb

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(t1.b,t2.c) from t1 inner join t2 using(a) group by t1.a;

group_concat(t1.b,t2.c)

aaaaa

bbbbb

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

drop table t1, t2;

set group_concat_max_len=default;

mysql-test/r/kill.result

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ select ((@id := kill_id) - kill_id) from t1; 
((@id := kill_id) - kill_id)

0

kill @id;

select 1;

ERROR HY000: MySQL server has gone away

select ((@id := kill_id) - kill_id) from t1;

((@id := kill_id) - kill_id)

0

mysql-test/t/join_outer.test

+10 −1
Original line number Diff line number Diff line
@@ -651,4 +651,13 @@ SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE not(0+(t1.a=30 and t2.b=1)); 


DROP TABLE t1,t2;



# Bug #8681: Bad warning message when group_concat() exceeds max length

set group_concat_max_len=5;

create table t1 (a int, b varchar(20));

create table t2 (a int, c varchar(20));

insert into t1 values (1,"aaaaaaaaaa"),(2,"bbbbbbbbbb");

insert into t2 values (1,"cccccccccc"),(2,"dddddddddd");

select group_concat(t1.b,t2.c) from t1 left join t2 using(a) group by t1.a;

select group_concat(t1.b,t2.c) from t1 inner join t2 using(a) group by t1.a;

drop table t1, t2;

set group_concat_max_len=default;

mysql-test/t/kill.test

+8 −6
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ connection con2; 
select ((@id := kill_id) - kill_id) from t1; 

kill @id;



# Wait for thread to do.

--sleep 5

# verify that con1 is doning a reconnect

connection con1;

--ping

--ping



--disable_reconnect

# this statement should fail

--error 2006

select 1;

--enable_reconnect

# this should work, and we should have a new connection_id()

select ((@id := kill_id) - kill_id) from t1;

select @id != connection_id();