bzr push into mysql-trunk branch (marko.makela:3818 to 3819)

[marko.makela]

 3819 Marko Mäkelä	2012-02-01
      Fix two compiler warnings on Windows.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/univ.i
 3818 Ole John Aske	2012-02-01
      Fix for bug#13528826  TEST_IF_CHEAPER_ORDERING(): CALCULATES INCORRECT 'SELECT_LIMIT
      
      An incorrect 'adjusted select_limit' was returned from test_if_cheaper_ordering()
      if no excplicit limit-clause was specified in the query.
      
      This fix detect when a limit-clause was not specified, and returns the
      full 'table_records' when no limit-clause was used.
      
      Furthermore, this fix caused the testcase for bug #12838420 
      to change beyond what was required as a testcase for that bug.
            
      Fixed that by forcing correct query plan for testcase by
      introducing 'USE INDEX' and 'STRAIGHT_JOIN'.
     @ mysql-test/include/icp_tests.inc
        Slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/include/order_by.inc
        New testcase for this bug
     @ mysql-test/r/innodb_icp.result
        Result should report the full number of records in table wo/ any limit clause.
        Also slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/r/innodb_icp_all.result
        Result should report the full number of records in table wo/ any limit clause.
        Also slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/r/innodb_icp_none.result
        Result should report the full number of records in table wo/ any limit clause.
        Also slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/r/join_cache_nojb.result
        Result should report the full number of records in table wo/ any limit clause.
     @ mysql-test/r/myisam_icp.result
        Slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/r/myisam_icp_all.result
        Slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/r/myisam_icp_none.result
        Slightly changed syntax of testcase in order to force required query plan
        for this testcase.
     @ mysql-test/r/order_by_all.result
        Accept result for new testcase
     @ mysql-test/r/order_by_icp_mrr.result
        Accept result for new testcase
     @ mysql-test/r/order_by_none.result
        Accept result for new testcase

    modified:
      mysql-test/include/icp_tests.inc
      mysql-test/include/order_by.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/join_cache_nojb.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      sql/sql_select.cc
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.cc'
--- a/storage/innobase/ibuf/ibuf0ibuf.cc	revid:ole.john.aske@strippeduuf5
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc	revid:marko.makela@stripped
@@ -2423,7 +2423,8 @@ ibuf_get_merge_page_nos_func(
 			smallest possible secondary index leaf page
 			(and that only after DROP INDEX). */
 			ut_ad(rec_page_no
-			      > IBUF_TREE_ROOT_PAGE_NO - (rec_space_id != 0));
+			      > (ulint) IBUF_TREE_ROOT_PAGE_NO
+			      - (rec_space_id != 0));
 		}
 
 #ifdef UNIV_IBUF_DEBUG

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:ole.john.aske@stripped5913-jcu4yec3to4huuf5
+++ b/storage/innobase/include/univ.i	revid:marko.makela@stripped2mjyt4o
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -155,7 +155,7 @@ be excluded from instrumentation. */
 #endif /* HAVE_PSI_INTERFACE */
 
 #ifdef __WIN__
-# define YY_NO_UNISTD_H
+# define YY_NO_UNISTD_H 1
 #endif /* __WIN__ */
 
 /*			DEBUG VERSION CONTROL

No bundle (reason: useless for push emails).