bzr push into mysql-trunk branch (vasil.dimov:4338 to 4339) WL#6347

[vasil.dimov]

 4339 Vasil Dimov	2012-08-27
      part of WL#6347 InnoDB: Index level compression stats
      
      Run innodb_cmp_per_index_enabled_basic.test only on 16k page sizes since
      we create a table with an option KEY_BLOCK_SIZE=8k which only works with
      16k or 8k page sizes. There is no way to run the test on 8k or 16k pages,
      but not on 4k, thus we run it only on 16k pages.

    modified:
      mysql-test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test
 4338 Aditya A	2012-08-27 [merge]
      Bug#14145950 AUTO_INCREMENT ON DOUBLE WILL FAIL ON WINDOWS
      
      Backport from mysql-5.6 the fix
      (revision-id sunny.bains@stripped)
      
        Bug#13839886 - CRASH IN INNOBASE_NEXT_AUTOINC
        
        The assertion introduce in the fix for Bug#13817703 
        is too strong, a negative  number can be greater 
        than the column max value, when the column value is
        a negative number.
        
        rb://978 Approved by Jimmy Yang.
      
      rb:1236 approved by Marko Makela

    modified:
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/t/innodb-autoinc.test
      storage/innobase/handler/ha_innodb.cc
=== modified file 'mysql-test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test	revid:aditya.a@stripped
+++ b/mysql-test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test	revid:vasil.dimov@stripped
@@ -1,4 +1,6 @@
 -- source include/have_innodb.inc
+# CREATE TABLE ... KEY_BLOCK_SIZE=8; does not work with page size = 4k
+-- source include/have_innodb_16k.inc
 
 # Check the default value
 SELECT @@global.innodb_cmp_per_index_enabled;

No bundle (reason: useless for push emails).