bzr push into mysql-trunk branch (evgeny.potemkin:3371 to 3372)

[Evgeny Potemkin]

 3372 Evgeny Potemkin	2011-08-16 [merge]
      Auto-merge: WL5274 => mysql->trunk.

    modified:
      mysql-test/r/derived.result
      mysql-test/r/explain.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/heap.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/row.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_none.result
      mysql-test/r/view.result
      mysql-test/suite/funcs_1/datadict/datadict_priv.inc
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/opt_trace/r/charset.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/opt_trace/r/security_no_prot.result
      mysql-test/suite/opt_trace/r/security_ps_prot.result
      mysql-test/t/derived.test
      mysql-test/t/heap.test
      mysql-test/t/join.test
      sql/authors.h
      sql/field.h
      sql/handler.cc
      sql/item_cmpfunc.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/key.h
      sql/opt_explain.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_sum.cc
      sql/records.cc
      sql/records.h
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cursor.cc
      sql/sql_derived.cc
      sql/sql_derived.h
      sql/sql_insert.cc
      sql/sql_join_cache.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.h
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/structs.h
      sql/table.cc
      sql/table.h
      storage/heap/hp_hash.c
      unittest/gunit/sql_list-t.cc
 3371 Rohit Kalhans	2011-08-16
      BUG#12761358: SLAVE_LAST_HEARTBEAT RETURNS EPOCH DATE EVEN WHEN SLAVE NOT ENABLED 

    modified:
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/t/rpl_heartbeat.test
      sql/mysqld.cc

Diff too large for email (10473 lines, the limit is 10000).
No bundle (reason: useless for push emails).