bzr push into mysql-trunk branch (jon.hauglid:3276 to 3277)

[Jon Olav Hauglid]

 3277 Jon Olav Hauglid	2011-07-19
      Fix broken sys_vars.all_vars test.
      
      In WL#5535 innodb_rollback_segments was renamed
      innodb_undo_segments, but the result file for sys_vars.all_vars
      was not updated. This patch fixes the problem.

    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
 3276 Sunanda Menon	2011-07-19 [merge]
      #41836: Eventum Request to enable the mysql_embedded binary

    modified:
      libmysqld/examples/CMakeLists.txt
=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2011-07-06 07:44:10 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2011-07-19 12:19:21 +0000
@@ -28,8 +28,6 @@ INNODB_MONITOR_RESET_ALL
 INNODB_MONITOR_RESET_ALL
 INNODB_PRINT_ALL_DEADLOCKS
 INNODB_PRINT_ALL_DEADLOCKS
-INNODB_ROLLBACK_SEGMENTS
-INNODB_ROLLBACK_SEGMENTS
 INNODB_STATS_METHOD
 INNODB_STATS_METHOD
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES

No bundle (reason: useless for push emails).