bk commit into 5.0 tree (timour:1.1944) BUG#11211

[timour]

Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1944 05/06/16 18:03:51 timour@stripped +2 -0
  Post-fix for BUG#11211
  Exclude the query that generates warning from PS tests, due to extra warning
  under PS.

  mysql-test/t/group_by.test
    1.38 05/06/16 18:03:47 timour@stripped +2 -1
    Post-fix for BUG#11211
    Exclude the query that generates warning from PS tests, due to extra warning
    under PS.

  mysql-test/t/alias.test
    1.7 05/06/16 18:03:47 timour@stripped +2 -1
    Post-fix for BUG#11211
    Exclude the query that generates warning from PS tests, due to extra warning
    under PS.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	timour
# Host:	zmei.home
# Root:	/home/timka/mysql/src/5.0-dbg

--- 1.6/mysql-test/t/alias.test	2004-05-05 17:05:20 +03:00
+++ 1.7/mysql-test/t/alias.test	2005-06-16 18:03:47 +03:00
@@ -61,8 +61,9 @@
 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;
 

--- 1.37/mysql-test/t/group_by.test	2005-06-14 19:38:05 +03:00
+++ 1.38/mysql-test/t/group_by.test	2005-06-16 18:03:47 +03:00
@@ -550,10 +550,11 @@
 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