bzr push into mysql-5.5-bugteam branch (marc.alff:3098 to 3099)

[Marc Alff]

 3099 Marc Alff	2010-10-26
      Fixed test result

    modified:
      mysql-test/suite/perfschema/r/schema.result
 3098 Alexander Nozdrin	2010-10-26
      Patch for Bug#55850 (Trigger warnings not cleared).
      
      The problem was that the warnings risen by a trigger were not cleared upon
      successful completion. The warnings should be cleared if the trigger completes
      successfully.
      
      The fix is to skip merging warnings into caller's Warning Info for triggers.

    modified:
      mysql-test/r/signal.result
      mysql-test/r/sp-error.result
      mysql-test/r/trigger.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/t/sp-error.test
      sql/sp_head.cc
      sql/sp_head.h
=== modified file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2010-08-12 14:08:52 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2010-10-26 17:35:02 +0000
@@ -195,6 +195,6 @@ show create table THREADS;
 Table	Create Table
 THREADS	CREATE TABLE `THREADS` (
   `THREAD_ID` int(11) NOT NULL,
-  `ID` int(11) NOT NULL,
-  `NAME` varchar(64) NOT NULL
+  `PROCESSLIST_ID` int(11) DEFAULT NULL,
+  `NAME` varchar(128) NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8

No bundle (reason: useless for push emails).