• unknown's avatar
    Apply innodb-5.0-ss1405 snapshot · 726d27ee
    unknown authored
    NULL MERGE: this ChangeSet will be null merged into mysql-5.1
    
    Fixes:
    
    - Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
      Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
      this flag immediately after open(2)ing. This way an error caused by
      O_DIRECT not being supported can easily be ignored.
    - Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
    - Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
      Report the current value of the AUTO_INCREMENT counter to MySQL.
    
    
    innobase/configure.in:
      Apply innodb-5.0-ss1405 snapshot
      
      Revision r1396:
      branches/5.0: Merge r1395 from trunk:
      
      * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
      to set this flag immediately after open(2)ing. This way an error caused by
      O_DIRECT not being supported can easily be ignored.
      
      * Add support for skipping the OS caching on Solaris by calling directio()
      instead of fcntl().
    innobase/os/os0file.c:
      Apply innodb-5.0-ss1405 snapshot
      
      Revision r1394:
      branches/5.0: Merge r1391 from trunk:
      
      Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
      into a generic function which is called from both os_file_handle_error() and
      os_file_handle_error_no_exit()
      
      
      Revision r1396:
      branches/5.0: Merge r1395 from trunk:
      
      * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
      to set this flag immediately after open(2)ing. This way an error caused by
      O_DIRECT not being supported can easily be ignored.
      
      * Add support for skipping the OS caching on Solaris by calling directio()
      instead of fcntl().
    mysql-test/r/innodb.result:
      Apply innodb-5.0-ss1405 snapshot
      
      Revision r1405:
      branches/5.0: Merge r1404 from trunk:
      
      Report the current value of the AUTO_INCREMENT counter to MySQL.
      (Bug #23313, Bug #21404)
      
      ha_innobase::update_create_info(): New function, to report
      the auto_increment_value.
    mysql-test/t/innodb.test:
      Apply innodb-5.0-ss1405 snapshot
      
      Revision r1405:
      branches/5.0: Merge r1404 from trunk:
      
      Report the current value of the AUTO_INCREMENT counter to MySQL.
      (Bug #23313, Bug #21404)
      
      ha_innobase::update_create_info(): New function, to report
      the auto_increment_value.
    sql/ha_innodb.cc:
      Apply innodb-5.0-ss1405 snapshot
      
      Revision r1405:
      branches/5.0: Merge r1404 from trunk:
      
      Report the current value of the AUTO_INCREMENT counter to MySQL.
      (Bug #23313, Bug #21404)
      
      ha_innobase::update_create_info(): New function, to report
      the auto_increment_value.
    sql/ha_innodb.h:
      Apply innodb-5.0-ss1405 snapshot
      
      Revision r1405:
      branches/5.0: Merge r1404 from trunk:
      
      Report the current value of the AUTO_INCREMENT counter to MySQL.
      (Bug #23313, Bug #21404)
      
      ha_innobase::update_create_info(): New function, to report
      the auto_increment_value.
    726d27ee
ha_innodb.cc 214 KB