diff options
| author | matthias@three.local.lan <> | 2005-06-16 17:37:04 +0200 |
|---|---|---|
| committer | matthias@three.local.lan <> | 2005-06-16 17:37:04 +0200 |
| commit | a785b84ea139406138982de472d3d42a1864c734 (patch) | |
| tree | 8329b55bbee00f16a57c8970b31d75b48fe234bc /mysql-test | |
| parent | 05579bd83ec35a29de10a1eb0f931caec4c2097b (diff) | |
| parent | 64df4e117090aa4399855f9cb19b0817b506d035 (diff) | |
| download | mariadb-git-a785b84ea139406138982de472d3d42a1864c734.tar.gz | |
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/alias.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/group_by.test | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/alias.test b/mysql-test/t/alias.test index 986af339456..646f077217d 100644 --- a/mysql-test/t/alias.test +++ b/mysql-test/t/alias.test @@ -61,8 +61,9 @@ INSERT INTO t1 VALUES (3359361,406,3359361,'Mustermann Musterfrau',7001,'2000-05 INSERT INTO t1 VALUES (3359362,406,3359362,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1509984,2145874,'+','','P',1909154,'MobilComSuper92000D1(Akquise)',NULL,NULL,'MS9ND1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); # This died because we used the field Kundentyp twice - +--disable_ps_protocol SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA','V','VA',''), 'Privat (Private Nutzung)','Privat (Private Nutzung) Sitz im Ausland','Privat (geschaeftliche Nutzung)','Privat (geschaeftliche Nutzung) Sitz im Ausland','Firma (Kapitalgesellschaft)','Firma (Kapitalgesellschaft) Sitz im Ausland','Firma (Personengesellschaft)','Firma (Personengesellschaft) Sitz im Ausland','oeff. rechtl. Koerperschaft','oeff. rechtl. Koerperschaft Sitz im Ausland','Eingetragener Verein','Eingetragener Verein Sitz im Ausland','Typ unbekannt') AS Kundentyp ,kategorie FROM t1 WHERE hdl_nr < 2000000 AND kategorie IN ('Prepaid','Mobilfunk') AND st_klasse = 'Workflow' GROUP BY kundentyp ORDER BY kategorie; +--enable_ps_protocol drop table t1; diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 606429b8dfe..b4762b847b8 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -550,10 +550,11 @@ insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2'); insert into t2 values ('aaa', 'bb1'), ('aaa', 'bb2'); # query with ambiguous column reference 'c2' +--disable_ps_protocol select t1.c1 as c2 from t1, t2 where t1.c2 = t2.c4 group by c2; - show warnings; +--enable_ps_protocol # this query has no ambiguity select t1.c1 as c2 from t1, t2 where t1.c2 = t2.c4 |