• calvin's avatar
    branches/zip: Merge revisions 2584:2956 from branches/6.0, · 70764cd3
    calvin authored
    except c2932.
    
    Bug#37232 and bug#31183 were fixed in the 6.0 branch only.
    They should be fixed in the plugin too, specially MySQL 6.0
    is discontinued at this point.
    
        ------------------------------------------------------------------------
        r2604 | inaam | 2008-08-21 09:37:06 -0500 (Thu, 21 Aug 2008) | 8 lines
    
        branches/6.0     bug#37232
    
        Relax locking behaviour for REPLACE INTO t SELECT ... FROM t1.
        Now SELECT on t1 is performed as a consistent read when the isolation
        level is set to READ COMMITTED.
    
        Reviewed by: Heikki
        ------------------------------------------------------------------------
        r2605 | inaam | 2008-08-21 09:59:33 -0500 (Thu, 21 Aug 2008) | 7 lines
    
        branches/6.0
    
        Added a comment to clarify why distinct calls to read MySQL binary
        log file name and log position do not entail any race condition.
    
        Suggested by: Heikki
        ------------------------------------------------------------------------
        r2956 | inaam | 2008-11-04 04:47:30 -0600 (Tue, 04 Nov 2008) | 11 lines
    
        branches/6.0  bug#31183
    
        If the system tablespace runs out of space because 'autoextend' is
        not specified with innodb_data_file_path there was no error message
        printed to the error log. The client would get 'table full' error.
        This patch prints an appropriate error message to the error log.
    
        rb://43
    
        Approved by: Marko
        ------------------------------------------------------------------------
    70764cd3
ha_innodb.cc 295 KB