• Michael Widenius's avatar
    Merge with MySQL 5.1, with following additions: · edd792fe
    Michael Widenius authored
    - Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
    - Did changes in pbxt and maria storage engines becasue of changes in thd->query
    - Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
    
    Todo before joining with main 5.1 tree:
    - Join test fails (Igor to investigate)
    - mysql-test-run shows warnings from tests; Some suppression rule is not working (Kristian to investiage)
    - Run through all buildbots
    
    
    
    sql/sql_table.cc:
      Reverted code for ROW_FORMAT is used. We must set the HA_CREATE_USED_ROW_FORMAT flag in alter table
      to signal the handler that it should not change row_type in update_create_info() (as happens for SHOW CREATE).
    storage/maria/ha_maria.cc:
      Update for change in defintion of thd->query
    storage/myisam/mi_check.c:
      Simplify code
    storage/pbxt/src/discover_xt.cc:
      Update for change in defintion of thd->query
    storage/xtradb/dict/dict0dict.c:
      Update for change in defintion of thd->query
    storage/xtradb/handler/ha_innodb.cc:
      Copy some critical changes from innodb_plugin to get tests to pass
    storage/xtradb/handler/ha_innodb.h:
      Copy some critical changes from innodb_plugin to get tests to pass
    storage/xtradb/handler/handler0alter.cc:
      Copy some critical changes from innodb_plugin to get tests to pass
    edd792fe
mtr_report.pm 12.4 KB