diff options
| author | unknown <jimw@mysql.com> | 2005-04-04 23:03:56 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-04 23:03:56 -0700 |
| commit | 66e6808ed0b31f085eab4187fa835cb1168e8aa9 (patch) | |
| tree | 6ad8acc6094f563caca17989c7e15c8f1d599987 /mysql-test/r | |
| parent | 2cb2374b78b8bab2655a3f45d9e4f657c2250336 (diff) | |
| parent | 682baee2316f194108587ce0da4aa44ea1a481ab (diff) | |
| download | mariadb-git-66e6808ed0b31f085eab4187fa835cb1168e8aa9.tar.gz | |
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
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/join_outer.result | 19 | ||||
| -rw-r--r-- | mysql-test/r/kill.result | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 227ff655fcd..6db48cff57e 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -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; diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 2413834be4f..049281ad5d4 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -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 |