Commit 596915dd authored by unknown's avatar unknown
Browse files

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
parents 19ed9c8c 0b93ed08

mysql-test/t/alias.test

+2 −1
Original line number Diff line number Diff line
@@ -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 geprft','','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;

mysql-test/t/group_by.test

+2 −1
Original line number Diff line number Diff line
@@ -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