bzr push into mysql-next-mr branch (alexander.nozdrin:3323 to 3324)

[Alexander Nozdrin]

 3324 Alexander Nozdrin	2010-11-12 [merge]
      Auto-merge from mysql-next-mr-bugfixing.

    removed:
      mysql-test/suite/ibmdb2i/
      mysql-test/suite/ibmdb2i/include/
      mysql-test/suite/ibmdb2i/include/have_i54.inc
      mysql-test/suite/ibmdb2i/include/have_i61.inc
      mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
      mysql-test/suite/ibmdb2i/r/
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result
      mysql-test/suite/ibmdb2i/t/
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test
      storage/ibmdb2i/
      storage/ibmdb2i/CMakeLists.txt
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_blobCollection.cc
      storage/ibmdb2i/db2i_blobCollection.h
      storage/ibmdb2i/db2i_charsetSupport.cc
      storage/ibmdb2i/db2i_charsetSupport.h
      storage/ibmdb2i/db2i_collationSupport.cc
      storage/ibmdb2i/db2i_collationSupport.h
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/db2i_conversion.cc
      storage/ibmdb2i/db2i_errors.cc
      storage/ibmdb2i/db2i_errors.h
      storage/ibmdb2i/db2i_file.cc
      storage/ibmdb2i/db2i_file.h
      storage/ibmdb2i/db2i_global.h
      storage/ibmdb2i/db2i_iconv.h
      storage/ibmdb2i/db2i_ileBridge.cc
      storage/ibmdb2i/db2i_ileBridge.h
      storage/ibmdb2i/db2i_ioBuffers.cc
      storage/ibmdb2i/db2i_ioBuffers.h
      storage/ibmdb2i/db2i_misc.h
      storage/ibmdb2i/db2i_myconv.cc
      storage/ibmdb2i/db2i_myconv.h
      storage/ibmdb2i/db2i_rir.cc
      storage/ibmdb2i/db2i_safeString.h
      storage/ibmdb2i/db2i_sqlStatementStream.cc
      storage/ibmdb2i/db2i_sqlStatementStream.h
      storage/ibmdb2i/db2i_validatedPointer.h
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/ibmdb2i/ha_ibmdb2i.h
      storage/ibmdb2i/plug.in
    modified:
      mysql-test/include/icp_tests.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/null_key_all.result
      mysql-test/r/null_key_icp.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/select_all.result
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none_jcl6.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
      mysql-test/t/innodb_icp.test
      mysql-test/t/innodb_icp_all.test
      mysql-test/t/innodb_mrr.test
      mysql-test/t/innodb_mrr_all.test
      mysql-test/t/innodb_mrr_icp.test
      sql/handler.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/sql_select.cc
      storage/myisam/ha_myisam.cc
 3323 Alexander Nozdrin	2010-11-11 [merge]
      Empty merge from mysql-trunk-stage.


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