bzr push into mysql-trunk branch (tor.didriksen:3378 to 3383)

[Tor Didriksen]

 3383 Tor Didriksen	2011-09-27 [merge]
      Merge opt-backporting => opt-team
      Text conflict in mysql-test/suite/opt_trace/r/general_no_prot_all.result
      Text conflict in mysql-test/suite/opt_trace/r/general_ps_prot_all.result

    modified:
      mysql-test/include/icp_tests.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_all.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_all.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_all.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/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      sql/handler.cc
      sql/handler.h
      sql/opt_explain.cc
      sql/opt_range.cc
      sql/opt_trace.cc
      sql/opt_trace.h
      sql/opt_trace2server.cc
      sql/sql_select.cc
      sql/sql_select.h
      storage/innobase/handler/ha_innodb.cc
      unittest/gunit/opt_trace-t.cc
 3382 Tor Didriksen	2011-09-27 [merge]
      Merge opt-backporting => opt-team
      Contents conflict in mysql-test/r/subquery_sj_none_bka_nobnl.result

    modified:
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/myisam_icp_all.result
 3381 Tor Didriksen	2011-09-27 [merge]
      NULL merge opt-backporting => opt-team

 3380 Tor Didriksen	2011-09-27 [merge]
      NULL merge opt-backporting => opt-team

 3379 Tor Didriksen	2011-09-27 [merge]
      Merge opt-backporting => opt-team
      Contents conflict in mysql-test/r/subquery_sj_all_bka_nobnl.result
      Contents conflict in mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result
      Contents conflict in mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result
      Contents conflict in mysql-test/r/subquery_sj_loosescan_bka_nobnl.result
      Contents conflict in mysql-test/r/subquery_sj_mat_bka_nobnl.result
      Contents conflict in mysql-test/r/subquery_sj_none_bka_nobnl.result

    modified:
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nobnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nobnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nobnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nobnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/sql_base.cc
      sql/sql_class.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
 3378 Jorgen Loland	2011-09-14 [merge]
      Automerge mysql-trunk -> opt-team


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