Skip to content

M
mariadb
Commit f3d26cb1 authored by Sergey Vojtovich's avatar Sergey Vojtovich
Browse files
Options

Adjusted test results after recent changes.

parent b7f9c894
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
mysql-test/r/named_pipe.result
View file @ f3d26cb1
...@@ -508,7 +508,7 @@ insert into tmp select * from t3; ...@@ -508,7 +508,7 @@ insert into tmp select * from t3;
insert into t3 select * from tmp; insert into t3 select * from tmp;
alter table t3 add t2nr int not null auto_increment primary key first; alter table t3 add t2nr int not null auto_increment primary key first;
drop table tmp; drop table tmp;
SET SQL_BIG_TABLES=1; SET BIG_TABLES=1;
select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
namn namn
Abraham Abraham Abraham Abraham
...@@ -521,7 +521,7 @@ ammonium ammonium ...@@ -521,7 +521,7 @@ ammonium ammonium
analyzable analyzable analyzable analyzable
animals animals animals animals
animized animized animized animized
SET SQL_BIG_TABLES=0; SET BIG_TABLES=0;
select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
concat(fld3," ",fld3) concat(fld3," ",fld3)
Abraham Abraham Abraham Abraham
...@@ -558,7 +558,7 @@ attendants 1 ...@@ -558,7 +558,7 @@ attendants 1
bedlam 1 bedlam 1
bedpost 1 bedpost 1
boasted 1 boasted 1
SET SQL_BIG_TABLES=1; SET BIG_TABLES=1;
select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
fld3 count(*) fld3 count(*)
affixed 1 affixed 1
...@@ -571,7 +571,7 @@ attendants 1 ...@@ -571,7 +571,7 @@ attendants 1
bedlam 1 bedlam 1
bedpost 1 bedpost 1
boasted 1 boasted 1
SET SQL_BIG_TABLES=0; SET BIG_TABLES=0;
select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
fld3 repeat("a",length(fld3)) count(*) fld3 repeat("a",length(fld3)) count(*)
circus aaaaaa 1 circus aaaaaa 1
......
mysql-test/r/shm.result
View file @ f3d26cb1
...@@ -508,7 +508,7 @@ insert into tmp select * from t3; ...@@ -508,7 +508,7 @@ insert into tmp select * from t3;
insert into t3 select * from tmp; insert into t3 select * from tmp;
alter table t3 add t2nr int not null auto_increment primary key first; alter table t3 add t2nr int not null auto_increment primary key first;
drop table tmp; drop table tmp;
SET SQL_BIG_TABLES=1; SET BIG_TABLES=1;
select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10;
namn namn
Abraham Abraham Abraham Abraham
...@@ -521,7 +521,7 @@ ammonium ammonium ...@@ -521,7 +521,7 @@ ammonium ammonium
analyzable analyzable analyzable analyzable
animals animals animals animals
animized animized animized animized
SET SQL_BIG_TABLES=0; SET BIG_TABLES=0;
select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10;
concat(fld3," ",fld3) concat(fld3," ",fld3)
Abraham Abraham Abraham Abraham
...@@ -558,7 +558,7 @@ attendants 1 ...@@ -558,7 +558,7 @@ attendants 1
bedlam 1 bedlam 1
bedpost 1 bedpost 1
boasted 1 boasted 1
SET SQL_BIG_TABLES=1; SET BIG_TABLES=1;
select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10;
fld3 count(*) fld3 count(*)
affixed 1 affixed 1
...@@ -571,7 +571,7 @@ attendants 1 ...@@ -571,7 +571,7 @@ attendants 1
bedlam 1 bedlam 1
bedpost 1 bedpost 1
boasted 1 boasted 1
SET SQL_BIG_TABLES=0; SET BIG_TABLES=0;
select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10;
fld3 repeat("a",length(fld3)) count(*) fld3 repeat("a",length(fld3)) count(*)
circus aaaaaa 1 circus aaaaaa 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7