bzr push into mysql-trunk-merge branch (tor.didriksen:3298 to 3299)

[Tor Didriksen]

 3299 Tor Didriksen	2010-10-26
      Fixed a failing test due to WL1054

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
 3298 Tor Didriksen	2010-10-25 [merge]
      Auto-merge from 5.5-bugteam

    modified:
      sql/sql_lex.h
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-08-12 15:25:01 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-10-26 06:15:35 +0000
@@ -25,7 +25,7 @@ ERROR 1050 (42S01) at line 240: Table 's
 ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -55,7 +55,7 @@ ERROR 1050 (42S01) at line 240: Table 's
 ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -83,7 +83,7 @@ ERROR 1050 (42S01) at line 240: Table 's
 ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -111,7 +111,7 @@ ERROR 1050 (42S01) at line 240: Table 's
 ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -139,7 +139,7 @@ ERROR 1050 (42S01) at line 240: Table 's
 ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists
 ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists
 ERROR 1050 (42S01) at line 266: Table 'threads' already exists
-ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 684: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

No bundle (reason: useless for push emails).