An error occurred fetching the project authors.
  1. 06 Nov, 2007 1 commit
    • unknown's avatar
      Apply snapshot innodb-5.1-ss1989 · e2513bf0
      unknown authored
      Fixes the following bugs:
      
      Bug #30706: SQL thread on slave is allowed to block client queries when slave load is high
        Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
      
      Bug #30888: Innodb table + stored procedure + row deletion = server crash
        While adding code for the low level read of the AUTOINC value from the index,
        the case for MEDIUM ints which are 3 bytes was missed triggering an
        assertion.
      
      Bug #30907: Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
        We don't rely on *first_value to be 0 when checking whether
        get_auto_increment() has been invoked for the first time in a multi-row
        INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
        inside ha_innobase::start_stmt() too.
      
      Bug #31444: "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
        ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
        trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
        DB_SUCCESS.  A timeout on LOCK TABLES would lead to an inconsistent state,
        which would cause trx_free() to print a warning.
      
      Bug #31494: innodb + 5.1 + read committed crash, assertion
        Set an error code when a deadlock occurs in semi-consistent read.
      
      
      mysql-test/r/innodb.result:
        Apply snapshot innodb-5.1-ss1989
        
        Also, a test is moved into the new innodb_autoinc_lock_mode_zero
        test, because it depends on a non-default setting for a read-only
        variable.
        
        Revision r1821:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2536.50.1  2007-08-02 12:45:56-07:00  igor@mysql.com
        
        Fixed bug#28404.
        This patch adds cost estimation for the queries with ORDER BY / GROUP BY
        and LIMIT.
        If there was a ref/range access to the table whose rows were required
        to be ordered in the result set the optimizer always employed this access
        though a scan by a different index that was compatible with the required
        order could be cheaper to produce the first L rows of the result set.
        Now for such queries the optimizer makes a choice between the cheapest
        ref/range accesses not compatible with the given order and index scans
        compatible with it.
        
        innodb.result: Adjusted results for test cases affected fy the fix for
        bug #28404.
        
        
        Revision r1781:
        Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
        The variable used in the tests below was introduced in r1735.
        
        
        Revision r1792:
        innodb.result: Revert r1655, which should have been reverted as part of r1781.
        
        
        Revision r1843:
        Add test for Bug# 21409, the actual bug was fixed in r1334.
      mysql-test/t/innodb.test:
        Apply snapshot innodb-5.1-ss1989
        
        Also, a test is moved into the new innodb_autoinc_lock_mode_zero
        test, because it depends on a non-default setting for a read-only
        variable.
        
        Revision r1781:
        Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
        The variable used in the tests below was introduced in r1735.
        
        
        Revision r1843:
        Add test for Bug# 21409, the actual bug was fixed in r1334.
      storage/innobase/buf/buf0lru.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/dict/dict0dict.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1894:
        Add debug lock checks to autoinc functions. Add lock guards around an
        invocation of dict_table_autoinc_initialize().
      storage/innobase/dict/dict0load.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1974:
        Prevent loading of tables that have unsupported features most notably
        FTS indexes.
      storage/innobase/handler/ha_innodb.cc:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1850:
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        Approved by:	Heikki
        
        
        
        Revision r1887:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2528.115.25  2007-08-27 18:18:14-06:00  tsmith@hindu.god
        
        Fix some Windows compiler warnings.
        
        dict0mem.c: Fix compiler warning with a cast.
        
        ha_innodb.cc: Change type to fix a compiler warning.
        
        
        Revision r1809:
        ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
        trx->n_mysql_tables_in_use only after row_lock_table_for_mysql()
        returns DB_SUCCESS.  A timeout on LOCK TABLES would lead to an
        inconsistent state, which would cause trx_free() to print a warning.
        
        This was later reported as Bug #31444.
        
        
        Revision r1833:
        Add /*== ... === */ decoration that was missing around some auto-inc functions.
        Add a missing comment, fix the length of a decoration.  Initialize the *value
        out parameter in ha_innobase::innobase_get_auto_increment().
        
        
        Revision r1866:
        Revert r1850 as MySQL did not approve the addition.
        
        log for r1850:
        
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        
        Revision r1846:
        Add config option innodb_use_adaptive_hash_indexes to enable/disable
        adaptive hash indexes. It is enabled by default (no change in default
        behavior).
        
        Approved by:	Marko
        
        
        Revision r1974:
        Prevent loading of tables that have unsupported features most notably
        FTS indexes.
        
        
        Revision r1829:
        Add assertion to enforce check of an implicit invariant and add comment about
        retry of autoinc read semantics. We always reread the table's autoinc counter
        after attempting to initialize it i.e., we want to guarantee that a read of
        autoinc valus that is returned to the caller is always covered by the
        AUTOINC locking mechanism.
        
        
        Revision r1787:
        Move the prototype of innobase_print_identifier() from ut0ut.c to
        ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
        #ifndef UNIV_HOTBACKUP.
        
        
        Revision r1888:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2528.115.30  2007-08-28 10:17:15-06:00  tsmith@hindu.god
        
        Fix another compiler warning on Windows in InnoDB.
        
        ha_innodb.cc:
        
        Fix compiler warning: ::get_auto_increment takes a ulonglong
        for nb_desired_values, but InnoDB's trx struct stores it as
        a ulint (unsigned long).  Probably harmless, as a single
        statement won't be asking for more than 2^32 rows.
        
        
        Revision r1987:
        Bug fix: The problem was that when write_row() attempted to update the max
        autoinc value, and if it was rolled back because of a deadlock, the 
        deadlock error (transaction rollback) was not being propagated back to MySQL.
        
        
        Revision r1889:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2560  2007-09-21 10:15:16+02:00  gkodinov@local
        
        ha_innodb.cc: fixed type conversion warnings revealed by bug 30639 
        
        
        Revision r1989:
        Suppress printing of deadlock errors while reading the autoinc value.
        DB_DEADLOCK errors are part of normal processing and excessive printing
        of these error messages could be disconcerting for users. 
        
        
        Revision r1828:
        Fix two bugs:
        
        Bug# 30907: We don't rely on *first_value to be 0 when checking whether
        get_auto_increment() has been invoked for the first time in a multi-row
        INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
        inside ha_innobase::start_stmt() too.
        
        Bug# 30888: While adding code for the low level read of the AUTOINC value
        from the index, the case for MEDIUM ints which are 3 bytes was missed
        triggering an assertion.
      storage/innobase/handler/ha_innodb.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1844:
        Remove the prototypes of some functions inside #if 0.
        The function definitions were removed in r1746.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1965:
        ibuf_insert_to_index_page(): Fix typos in diagnostic output.
      storage/innobase/include/db0err.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1974:
        Prevent loading of tables that have unsupported features most notably
        FTS indexes.
      storage/innobase/include/ha_prototypes.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1787:
        Move the prototype of innobase_print_identifier() from ut0ut.c to
        ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
        #ifndef UNIV_HOTBACKUP.
      storage/innobase/include/mach0data.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1779:
        Fix a bug that handles the case where the host specific byte order matches
        the InnoDB storage byte order, which is big-endian.
      storage/innobase/include/mach0data.ic:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1779:
        Fix a bug that handles the case where the host specific byte order matches
        the InnoDB storage byte order, which is big-endian.
      storage/innobase/include/mem0dbg.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
      storage/innobase/include/mem0mem.ic:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
        
        
        Revision r1937:
        mem_heap_free_top(): Remove a bogus Valgrind warning.
        
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/include/rem0rec.ic:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1918:
        Improve Valgrind instrumentation.
        
        rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
        
        UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
        UNIV_MEM_ASSERT_AND_FREE().
      storage/innobase/include/row0mysql.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1783:
        Correct the function comments of row_create_table_for_mysql() and
        row_drop_table_for_mysql().
      storage/innobase/include/sync0rw.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1757:
        Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
        debug assertions.
      storage/innobase/include/univ.i:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1827:
        Merge r1826 from branches/zip: UNIV_MEM_ASSERT_AND_FREE():
        Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW().
        The memory area need not be initialized.
        This mistake was made in r1815.
        
        
        Revision r1918:
        Improve Valgrind instrumentation.
        
        rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
        
        UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
        UNIV_MEM_ASSERT_AND_FREE().
        
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
        
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
        
        
        Revision r1948:
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display also __FILE__ and __LINE__
        when these Valgrind checks fail.
      storage/innobase/include/ut0ut.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1850:
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        Approved by:	Heikki
        
        
        
        Revision r1862:
        Add ut_snprintf() function. On Windows this needs to be implemented
        using auxiliary functions because there is no snprintf-variant on
        Windows that behaves exactly as specified in the standard:
        
        * Always return the number of characters that would have been printed
          if the size were unlimited (not including the final `\0').
        * Always '\0'-terminate the result
        * Do not touch the buffer if size=0, only return the number of characters
          that would have been printed. Can be used to estimate the size needed
          and to allocate it dynamically.
        
        See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
        2 ap variables are used.
        
        Approved by:	Heikki
        
        
        Revision r1866:
        Revert r1850 as MySQL did not approve the addition.
        
        log for r1850:
        
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
      storage/innobase/mem/mem0dbg.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
        
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/mem/mem0mem.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/row/row0mysql.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1786:
        row_create_table_for_mysql(), row_truncate_table_for_mysql(),
        row_drop_table_for_mysql(): Do not mention innodb_force_recovery
        when newraw is set.
        
        
        Revision r1790:
        row_drop_table_for_mysql(): Before calling
        dict_table_remove_from_cache(table) and thus freeing the memory
        allocated for the table, copy the table name.  This avoids reading
        freed memory when name == table->name.
        
        Approved by Sunny.
        
        
        Revision r1783:
        Correct the function comments of row_create_table_for_mysql() and
        row_drop_table_for_mysql().
        
        
        Revision r1894:
        Add debug lock checks to autoinc functions. Add lock guards around an
        invocation of dict_table_autoinc_initialize().
      storage/innobase/row/row0sel.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1782:
        Add comment that the variable dest should be word aligned. After discussion
        on IM with Heikki.
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
        
        
        Revision r1820:
        Use the clustered index and not the one selected by the optimizer in the plan,
        when building a previous version of the row. This bug is triggered when
        running queries via InnoDB's internal SQL parser; when InnoDB's optimizer
        selects a secondary index for the plan.
        
        
        Revision r1828:
        Fix two bugs:
        
        Bug# 30907: We don't rely on *first_value to be 0 when checking whether
        get_auto_increment() has been invoked for the first time in a multi-row
        INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
        inside ha_innobase::start_stmt() too.
        
        Bug# 30888: While adding code for the low level read of the AUTOINC value
        from the index, the case for MEDIUM ints which are 3 bytes was missed
        triggering an assertion.
        
        
        Revision r1779:
        Fix a bug that handles the case where the host specific byte order matches
        the InnoDB storage byte order, which is big-endian.
      storage/innobase/sync/sync0rw.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1757:
        Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
        debug assertions.
      storage/innobase/ut/ut0ut.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1850:
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        Approved by:	Heikki
        
        
        
        Revision r1873:
        snprintf() should always return non-negative result. According to
        Microsoft documentation about _vscprintf():
        
          If format is a null pointer, the invalid parameter handler is invoked,
          as described in Parameter Validation. If execution is allowed to
          continue, the functions return -1 and set errno to EINVAL.
        
        The UNIX variant of snprintf() segfaults if format is a NULL pointer
        (similar to strlen(NULL) for example), so it is better to conform to
        this behavior and crash our custom Windows version instead of
        returning -1. Noone would expect -1 to be returned from snprintf().
        
        Cosmetic: Add a space after typecast.
        
        Approved by:	Marko
        
        
        Revision r1862:
        Add ut_snprintf() function. On Windows this needs to be implemented
        using auxiliary functions because there is no snprintf-variant on
        Windows that behaves exactly as specified in the standard:
        
        * Always return the number of characters that would have been printed
          if the size were unlimited (not including the final `\0').
        * Always '\0'-terminate the result
        * Do not touch the buffer if size=0, only return the number of characters
          that would have been printed. Can be used to estimate the size needed
          and to allocate it dynamically.
        
        See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
        2 ap variables are used.
        
        Approved by:	Heikki
        
        
        Revision r1866:
        Revert r1850 as MySQL did not approve the addition.
        
        log for r1850:
        
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        
        Revision r1787:
        Move the prototype of innobase_print_identifier() from ut0ut.c to
        ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
        #ifndef UNIV_HOTBACKUP.
        
        
        Revision r1789:
        ut_print_namel(): Do not assume that all '/' are separators between
        database and table names.
        
        Approved by Heikki.
        
        
        Revision r1936:
        ut_print_buf(): Add a Valgrind check that the buffer is wholly defined.
      mysql-test/r/innodb-semi-consistent.result:
        Apply snapshot innodb-5.1-ss1989
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
      mysql-test/r/innodb_autoinc_lock_mode_zero.result:
        New test, using read-only setting --innodb-autoinc-lock-mode=0
      mysql-test/t/innodb-semi-consistent-master.opt:
        Apply snapshot innodb-5.1-ss1989
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
      mysql-test/t/innodb-semi-consistent.test:
        Apply snapshot innodb-5.1-ss1989
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
      mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt:
        New test, using read-only setting --innodb-autoinc-lock-mode=0
      mysql-test/t/innodb_autoinc_lock_mode_zero.test:
        New test, using read-only setting --innodb-autoinc-lock-mode=0
      e2513bf0
  2. 25 Aug, 2007 1 commit
    • unknown's avatar
      Apply InnoDB snapshot innodb-5.1-ss1726. · 6d4b3c58
      unknown authored
      Bug #16979: AUTO_INC lock in InnoDB works a table level lock
        - this is a major change in InnoDB auto-inc handling.
      Bug #27950: Duplicate entry error in auto-inc after mysqld restart
        - Init AUTOINC from delete_row().
      Bug #28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
        - Use value specified by MySQL, in update_row().
      
      
      mysql-test/r/innodb.result:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1655:
        Fix the innodb.test failure mentioned in r1654.
      storage/innobase/dict/dict0dict.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/dict/dict0mem.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/handler/ha_innodb.cc:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1718:
        Replace mysql_byte with uchar and remove the #define mysql_byte from
        ha_innodb.cc.  This cleanup was made possible as of r1550:
        
        
        Revision r1658:
        check_trx_exists(): Remove a redundant function call and assignment that
        was added by someone at MySQL.
        
        
        Revision r1656:
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
        
        
        Revision r1654:
        
        One test case in innodb.test fails because of auto-increment
        changes in r1562:1653:
        
        $diff innodb.result innodb.reject
        504c504
        < 3	test2		this will work
        ---
        > 4	test2		this will work
      storage/innobase/handler/ha_innodb.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1654:
        
        One test case in innodb.test fails because of auto-increment
        changes in r1562:1653:
        
        $diff innodb.result innodb.reject
        504c504
        < 3	test2		this will work
        ---
        > 4	test2		this will work
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1715:
        ibuf0ibuf.c: Remove the unused prototype for dict_index_print_low()
        that was inadvertently added in r832.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/include/dict0dict.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/include/dict0mem.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/include/lock0lock.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1664:
        lock_number_of_rows_locked(): Fix a typo in comment, and make the comments
        in lock0lock.c and lock0lock.h identical.  The typo was incorrectly fixed in
        r1623.
      storage/innobase/include/row0mysql.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/include/row0sel.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/include/trx0trx.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/include/ut0mem.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1713:
        Fix typo in comment.
      storage/innobase/log/log0recv.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1657:
        recv_init_crash_recovery(): remove trailing white space
      storage/innobase/row/row0mysql.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/row/row0sel.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/trx/trx0trx.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      6d4b3c58
  3. 14 Aug, 2007 1 commit
    • unknown's avatar
      Updates to allow innodb.test to be run with --embedded-server, · 3925c3fe
      unknown authored
      including a small change to build_table_filename().
      
      
      mysql-test/mysql-test-run.pl:
        Remove unused bad merge bitrot code.  This chunk of code is a repeat
        copy of an earlier chunk, and should never have been here.
      mysql-test/r/innodb.result:
        Updates to allow innodb.test to be run with --embedded-server
      mysql-test/suite/binlog/r/binlog_innodb.result:
        Updates to allow innodb.test to be run with --embedded-server
      mysql-test/suite/binlog/t/binlog_innodb.test:
        Updates to allow innodb.test to be run with --embedded-server
      mysql-test/t/innodb.test:
        Updates to allow innodb.test to be run with --embedded-server
      sql/sql_table.cc:
        build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
        it's already there.  This is done to make it easier to write tests
        which check the output of various error messages, and work with
        both the embedded server (mysql_data_home is full path, including
        trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").
      3925c3fe
  4. 02 Aug, 2007 1 commit
    • unknown's avatar
      Fixed bug#28404. · c9049374
      unknown authored
      This patch adds cost estimation for the queries with ORDER BY / GROUP BY
      and LIMIT. 
      If there was a ref/range access to the table whose rows were required
      to be ordered in the result set the optimizer always employed this access
      though a scan by a different index that was compatible with the required 
      order could be cheaper to produce the first L rows of the result set.
      Now for such queries the optimizer makes a choice between the cheapest
      ref/range accesses not compatible with the given order and index scans
      compatible with it.
      
      
      mysql-test/r/distinct.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/endspace.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/group_by.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/group_min_max.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/innodb.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/innodb_mysql.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/merge.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/order_by.result:
        Added a test case for bug #28404.
      mysql-test/r/select_found.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/r/subselect.result:
        Adjusted results for test cases affected fy the fix for bug #28404.
      mysql-test/t/distinct.test:
        Changed a test case after adding the fix for bug #28404.
      mysql-test/t/order_by.test:
        Added a test case for bug #28404.
      sql/sql_select.cc:
        Fixed bug#28404.
        This patch adds cost estimation for the queries with ORDER BY / GROUP BY
        and LIMIT. 
        Now for such queries the optimizer makes a choice between the cheapest
        ref/range accesses not compatible with the given order and index scans
        compatible with it.
        
        Modified the function test_if_skip_sort_order to make the above mentioned
        choice cost based.
      sql/sql_select.h:
        Fixed bug#28404.
        This patch adds cost estimation for the queries with ORDER BY / GROUP BY
        and LIMIT. 
        Added a new field fot the JOIN_TAB structure.
      c9049374
  5. 18 Jul, 2007 1 commit
    • unknown's avatar
      A fix and a test case for Bug#26104 Bug on foreign key class constructor. · c0277a11
      unknown authored
      Fix the typo in the constructor. Cover a semantic check that previously
      never worked with a test.
      
      
      mysql-test/r/create.result:
        Update results (Bug#26104)
      mysql-test/r/innodb.result:
        Update results.
      mysql-test/t/create.test:
        Add a test case for Bug#26104 Bug on foreign key class constructor
      mysql-test/t/innodb.test:
        Return a new error number (MySQL error instead of internal InnoDB error).
      sql/sql_class.h:
        A fix for Bug#26104 Bug on foreign key class constructor -- fix
        the typo in the constructor
      c0277a11
  6. 10 Jul, 2007 1 commit
    • unknown's avatar
      Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. · 32b5fb73
      unknown authored
      After applying the snapshots, ensure that code conforms to the final version
      of WL 3914.
      
      It is signficant that, after these changes, InnoDB does not define MYSQL_SERVER,
      and can be built as an independent storage engine plugin.
      
      Fixes:
      Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
      Bug#18828: If InnoDB runs out of undo slots, it returns misleading 'table is full'
      Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
      Bug#20352: Make ibuf_contract_for_n_pages tunable
      Bug#21101: Wrong error on exceeding max row size for InnoDB table
      Bug#21293: Deadlock detection prefers to kill long running FOR UPDATE queries
      Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
      Bug#25078: Make the replication thread to ignore innodb_thread_concurrency
      Bug#25645: Assertion failure in file srv0srv.c
      Bug#28138: indexing column prefixes produces corruption in InnoDB
      
      
      BitKeeper/deleted/.del-Makefile.am~55504c43d99979e4:
        Delete: storage/innobase/buf/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~79bb55303929b560:
        Delete: storage/innobase/dict/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~7cd88e5f9a8d7ce8:
        Delete: storage/innobase/data/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~e19a1fb29b1fe527:
        Delete: storage/innobase/btr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~4ae65b009d41d1d:
        Delete: storage/innobase/eval/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~679131a02af3f6fb:
        Delete: storage/innobase/fsp/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~6acac9ae30eabdb3:
        Delete: storage/innobase/dyn/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~a5e6b4385717fcb7:
        Delete: storage/innobase/fil/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~11d601934b49c19:
        Delete: storage/innobase/fut/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~5aab37bf3b6c430:
        Delete: storage/innobase/ibuf/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~af2d719bb6e66986:
        Delete: storage/innobase/handler/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~f0dbbc7a78648e18:
        Delete: storage/innobase/ha/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~41684e54a5b0d26a:
        Delete: storage/innobase/log/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~edd95d7290ddeff3:
        Delete: storage/innobase/lock/Makefile.am
      BitKeeper/deleted/.del-Makefile.i:
        Delete: storage/innobase/include/Makefile.i
      BitKeeper/deleted/.del-Makefile.am~2a6ccdba41b591a3:
        Delete: storage/innobase/mach/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~2bd35bda856342:
        Delete: storage/innobase/os/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~8448688c5ab92132:
        Delete: storage/innobase/mem/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~b5a7a8cfa711b6de:
        Delete: storage/innobase/mtr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~2cee8a309eb8eee2:
        Delete: storage/innobase/page/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~3d0553f8aa9c456b:
        Delete: storage/innobase/read/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~7b0c4abae6684f8c:
        Delete: storage/innobase/pars/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~d0e0dd55cbd413f0:
        Delete: storage/innobase/que/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~20a219ccf7825d65:
        Delete: storage/innobase/row/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~37bdfb2973b2442b:
        Delete: storage/innobase/rem/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~557098c4e5c01ee2:
        Delete: storage/innobase/thr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~fdfe12f48c2499af:
        Delete: storage/innobase/sync/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~feb2280a52035d8d:
        Delete: storage/innobase/srv/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~456d34c4816dbda4:
        Delete: storage/innobase/ut/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~5ec2ef0d2c35e138:
        Delete: storage/innobase/usr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~d25c456e48393313:
        Delete: storage/innobase/trx/Makefile.am
      mysql-test/r/innodb.result:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1421:
        Fix the innodb test by shifting some of the contents of the .result file.
        
        Approved by:	Marko
        
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
      mysql-test/t/innodb.test:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
      storage/innobase/btr/btr0btr.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/data/data0data.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1490:
        Add #include <ctype.h>.  Apparently, this header is no longer included by
        the common headers.  This may be related to WL#2936
        (pluggable storage engines).
      storage/innobase/data/data0type.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/dict/dict0crea.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/dict/dict0dict.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1490:
        Add #include <ctype.h>.  Apparently, this header is no longer included by
        the common headers.  This may be related to WL#2936
        (pluggable storage engines).
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
        
        
        Revision r1529:
        Revert r799, which was supposed to prevent similar cases as Bug#21638.
        In reality, the patch breaks the handling of prefix indexes of
        variable-length columns in ROW_FORMAT=COMPACT.  Reverting the patch
        is only a partial fix of Bug#28138.
        
        
        Revision r1535:
        Document that DICT_MAX_INDEX_COL_LEN must not be changed.
      storage/innobase/fsp/fsp0fsp.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1420:
        Output to the error log information about the limitations of
        UNIV_IBUF_DEBUG.
        
        innobase_start_or_create_for_mysql(): Note that crash recovery is broken
        when UNIV_IBUF_DEBUG is defined.
        
        ibuf_counts[]: Make this a two-dimensional array.  No need to allocate
        anything from the heap.  Eliminate ibuf_counts_inited, as the array
        will be zero-filled by the runtime environment.
        
        ibuf_count_check(): New function, to print out an explanation before
        assertion failure.
        
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
        
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/include/db0err.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/include/dict0dict.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/include/dict0dict.ic:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/include/dict0mem.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1535:
        Document that DICT_MAX_INDEX_COL_LEN must not be changed.
        
        
        Revision r1536:
        Change the comment to a more appropriate one. Discussed with Heikki on IM.
        
        Approved by:	Heikki
      storage/innobase/include/ha_prototypes.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1482:
        Fix Bug#25078 by always letting the replication thread on the slave
        server to enter InnoDB. This can be made further customizable by the
        user if we introduce a new config parameter. This will wait until
        config parameters can be easily added.
        
        Approved by:	Marko
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      storage/innobase/include/os0file.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1431:
        Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
        ERROR_LOCK_VIOLATION is encountered during file operation.
        This is caused by backup software, so InnoDB should retry while the backup
        software is done with the file.
        
        Approved by:	Heikki
      storage/innobase/include/rem0rec.ic:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1569:
        Fix some in:/out: comments.
        
        Approved by:	Marko
      storage/innobase/include/row0mysql.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
      storage/innobase/include/trx0trx.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1462:
        Fix typo in comment.
        
        
        Revision r1486:
        Improve the comment for trx_struct::undo_no.
        
        Suggested by:	Heikki
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1497:
        Add the number of locks acquired by a transaction to its weight when
        choosing the lightest transaction to kill when a deadlock occurs.
        This fixes Bug#21293 partially.
        
        Approved by:	Heikki
        
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      storage/innobase/include/trx0undo.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/include/ut0ut.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
      storage/innobase/lock/lock0lock.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1457:
        Fix Bug#22819, remove assertion. (http://bugs.mysql.com/bug.php?id=22819)
        
        
        Revision r1497:
        Add the number of locks acquired by a transaction to its weight when
        choosing the lightest transaction to kill when a deadlock occurs.
        This fixes Bug#21293 partially.
        
        Approved by:	Heikki
        
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/log/log0log.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1521:
        Forward port r1520 from branches/5.0
        
        Patch to allow monitor threads to stop before proceeding with normal shutdown. 
        Also have a separate time counter for tablespace monitor.
        
        reviewed by: Heikki
        
        
        Revision r1524:
        Undo bad space formatting introduced in earlier commit r1521
        
        spotted by: Marko
        
        
        Revision r1533:
        logs_empty_and_mark_files_at_shutdown(): Remove trailing whitespace that
        was added in r1521.
      storage/innobase/os/os0file.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1431:
        Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
        ERROR_LOCK_VIOLATION is encountered during file operation.
        This is caused by backup software, so InnoDB should retry while the backup
        software is done with the file.
        
        Approved by:	Heikki
      storage/innobase/rem/rem0rec.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
        
        
        Revision r1531:
        rec_get_converted_size_new(): Simplify and move a debug assertion.
        
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
        
        
        Revision r1555:
        rec_get_converted_size_new(): The total size of the infimum and supremum
        records in ROW_FORMAT=COMPACT is REC_N_NEW_EXTRA_BYTES + 8.  The
        REC_N_NEW_EXTRA_BYTES was accidentally omitted in r1546.  This function
        should never be called on those records, though.
        
        
        Revision r1569:
        Fix some in:/out: comments.
        
        Approved by:	Marko
      storage/innobase/row/row0ins.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1485:
        Minor cleanup.
        
        row_ins_check_foreign_constraint(), row_ins_scan_sec_index_for_duplicate():
        Make use of the predicates page_rec_is_infimum() and page_rec_is_supremum().
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/row/row0mysql.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
        
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/row/row0row.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1529:
        Revert r799, which was supposed to prevent similar cases as Bug#21638.
        In reality, the patch breaks the handling of prefix indexes of
        variable-length columns in ROW_FORMAT=COMPACT.  Reverting the patch
        is only a partial fix of Bug#28138.
      storage/innobase/row/row0sel.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1452:
        Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
        patch in the bug followup.
        
        Approved by:	Heikki
        
        
        
        Revision r1455:
        Reindent with tabs instead of spaces.
        
        Spotted by:	Marko
      storage/innobase/srv/srv0srv.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1424:
        Bug#20352. Added variable srv_insert_buffer_batch_size. We want to make
        this variable settable. Since the pluggable engine interface currently
        doesn't provide a usable mechanism, we will add the latter functionality
        once it's available.
        
        
        Revision r1426:
        Fix code indentation from r1424.
        
        
        Revision r1459:
        Fix typo in the comment.
        
        
        Revision r1482:
        Fix Bug#25078 by always letting the replication thread on the slave
        server to enter InnoDB. This can be made further customizable by the
        user if we introduce a new config parameter. This will wait until
        config parameters can be easily added.
        
        Approved by:	Marko
        
        
        Revision r1487:
        Fix typo in comment.
        
        Spotted by:	Marko
        
        
        Revision r1521:
        Forward port r1520 from branches/5.0
        
        Patch to allow monitor threads to stop before proceeding with normal shutdown. 
        Also have a separate time counter for tablespace monitor.
        
        reviewed by: Heikki
        
        
        Revision r1532:
        srv_lock_timeout_and_monitor_thread(): Correct the indentation that was
        broken in r1521.
        
        
        Revision r1553:
        Fix Bug#20090 as suggested in the bug followup by Heikki.
        
        Approved by:	Heikki
      storage/innobase/srv/srv0start.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1420:
        Output to the error log information about the limitations of
        UNIV_IBUF_DEBUG.
        
        innobase_start_or_create_for_mysql(): Note that crash recovery is broken
        when UNIV_IBUF_DEBUG is defined.
        
        ibuf_counts[]: Make this a two-dimensional array.  No need to allocate
        anything from the heap.  Eliminate ibuf_counts_inited, as the array
        will be zero-filled by the runtime environment.
        
        ibuf_count_check(): New function, to print out an explanation before
        assertion failure.
      storage/innobase/sync/sync0arr.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/trx/trx0rec.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/trx/trx0trx.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1491:
        Fix typo in comment.
        
        
        Revision r1497:
        Add the number of locks acquired by a transaction to its weight when
        choosing the lightest transaction to kill when a deadlock occurs.
        This fixes Bug#21293 partially.
        
        Approved by:	Heikki
        
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
        
        
        Revision r1522:
        trx0trx.c: Add missing #include "ha_prototypes.h".
      storage/innobase/trx/trx0undo.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/ut/ut0ut.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1490:
        Add #include <ctype.h>.  Apparently, this header is no longer included by
        the common headers.  This may be related to WL#2936
        (pluggable storage engines).
      mysql-test/r/innodb_trx_weight.result:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1498:
        Add a test about the behavior introduced in r1497.
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      mysql-test/include/innodb_trx_weight.inc:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
        
        
        Revision r1556:
        mysql-test/innodb_trx_weight.inc: Add username root to the "connect" statement.
        The Unix user running mysql-test-run usually does not have any privileges
        on the MySQL test database.
      mysql-test/t/innodb_trx_weight.test:
        Fixes after merging InnoDB snapshots.
        
        Revision r1498:
        Add a test about the behavior introduced in r1497.
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      sql/sql_class.cc:
        Fixes after merging InnoDB snapshots.
      storage/innobase/Makefile.am:
        Fixes after merging InnoDB snapshots.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
      storage/innobase/handler/ha_innodb.cc:
        Fixes after merging InnoDB snapshots.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
        
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
        
        
        
        Revision r1425:
        Fixed a missing function decoration that slipped into r1422.
        
        
        Revision r1434:
        Fix typo.
        
        
        Revision r1442:
        Potential fix for Bug#25645:
        
        "Move innobase_release_stat_resources(trx) outside the 'if' in
        ha_innobase::external_lock(). That would add more safety that whatever
        MySQL does at a query end, there would be no risk of a hang on the btr
        search latch."
        
        Also call innobase_release_temporary_latches() in the beginning of
        ha_innobase::close().
        
        Approved by:	Heikki
        
        
        Revision r1453:
        Bugfix: only call innobase_release_temporary_latches() in case of current_thd
        is not NULL, otherwise we get NULL pointer dereferencing.
        
        Approved by:	Heikki
        
        
        Revision r1474:
        Fix typo in comment: the exact prototype is in
        include/data0type.ic, not in data/data0type.ic
        
        
        
        Revision r1482:
        Fix Bug#25078 by always letting the replication thread on the slave
        server to enter InnoDB. This can be made further customizable by the
        user if we introduce a new config parameter. This will wait until
        config parameters can be easily added.
        
        Approved by:	Marko
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1489:
        thd_to_trx(), check_trx_exists(): Remove the handlerton parameter.  It is a
        singleton object whose address is stored into innodb_hton_ptr.
        
        
        Revision r1492:
        Convert innobase_buffer_pool_size and innobase_log_file_size types from
        longlong to long long because MYSQL_SYSVAR_LONGLONG marco expects long long
        type.
        
        Also change
        ((ulint)innobase_buffer_pool_size) / 1024
        to
        (ulint)(innobase_buffer_pool_size / 1024)
        and remove comment which is no longer true.
        
        Provided that innobase_buffer_pool_size is always 64bits these statements
        are equivalent if ulint is 64 bit (well it will screw up if
        innobase_buffer_pool_size is negative). And if ulint is 32 bit the later
        variant gives a little more chance that the value will fit.
        
        Approved by:	Heikki
        
        
        Revision r1493:
        ha_innodb.cc: Remove the declarations of some global InnoDB variables
        whose name starts with srv_.  These variables are declared in the header
        files that are covered by #include directives in ha_innodb.cc.
        
        
        Revision r1495:
        Introduce the function reset_template() for resetting some fields of
        row_prebuilt_t; currently prebuilt->read_just_key and
        prebuilt->keep_other_fields_on_keyread.
        
        
        Revision r1496:
        ha_innobase::extra(): Replace references to prebuilt->trx with
        thd_to_trx(ha_thd()), in order to avoid potential memory corruption.
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1527:
        Cleanup in ha_innodb.cc:
        
        thd_is_replication_slave_thread(), thd_has_edited_nontrans_tables():
        Remove blank line between the function comment and the function
        definition.  There should be exactly one line between the return
        type and the function comment, and this line should be one of
        '', 'static', 'UNIV_INLINE', and 'extern "C"'.
        
        
        Revision r1538:
        Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for 
        normal processing of the query by MySQL instead of generating an error.
        
        Reviewed by: Heikki
        
        
        
        Revision r1551:
        ha_innobase::innobase_read_and_init_auto_inc(): Remember and restore
        prebuilt->sql_stat_start.  In an ALTER TABLE statement in the innodb_gis
        test, an ut_ad() assertion failed, because no IX lock had been acquired
        on the table, because prebuilt->sql_stat_start was inadvertently reset
        to FALSE, by this function.  This function was called via
        ha_innobase::info() and mysql_prepare_alter_table().
      storage/innobase/plug.in:
        Fixes after merging InnoDB snapshots.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
      storage/innobase/handler/ha_innodb.h:
        Fixes after merging InnoDB snapshots.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
      32b5fb73
  7. 02 Jul, 2007 1 commit
  8. 19 Jun, 2007 1 commit
    • unknown's avatar
      Bug#28769 Test case "innodb" fails with --skip-log-bin · b269713c
      unknown authored
       - Move binlog related tests to binlog_innodb.test
       - Remove "source include/have_log_bin.inc" from innodb.test
      
      
      mysql-test/r/innodb.result:
        Move binlog related tests to binlog_innodb.test
      mysql-test/t/innodb.test:
        Move binlog related tests to binlog_innodb.test
      mysql-test/r/binlog_innodb.result:
        Move binlog related tests to binlog_innodb.test
      mysql-test/t/binlog_innodb.test:
        Move binlog related tests to binlog_innodb.test
      b269713c
  9. 04 Jun, 2007 1 commit
    • unknown's avatar
      Bug #27716 multi-update did partially and has not binlogged · be99c5d3
      unknown authored
      manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
      
      
      mysql-test/r/innodb.result:
        results changed because of some more queries are added
      mysql-test/r/multi_update.result:
        results changed
      mysql-test/r/rpl_row_basic_11bugs.result:
        results changed
      mysql-test/t/innodb.test:
        error code is diff in 5.0
      mysql-test/t/multi_update.test:
        making explicit comments and forcing execution in mixed (stmt) mode.
      mysql-test/t/rpl_row_basic_11bugs.test:
        checking how binlogging works when a query on non-ta table completed partly.
      sql/sql_update.cc:
        manual merge after authomatic one failed (semantic drift)
      be99c5d3
  10. 01 Jun, 2007 1 commit
    • unknown's avatar
      Bug #27716 multi-update did partially and has not binlogged · 6b94fc57
      unknown authored
      Implementation of mysql_multi_update did not call multi_update::send_error method in some cases 
      (see the test reported on bug page and test cases in changeset).
      
      Fixed with deploying the method, ::send_error() is refined to get binlogging code which works whenever 
      there is modified non-transactional table.
      thd->no_trans_update.stmt flag is set in to TRUE to ease testing though being the beginning of relative 
      bug#27417 fix (addresses a part of those issues).
      Eliminating two minor issues (small bugs) in multi_update methods.
      This patch for multi-update also addresses a part of the issues reported in bug#13270,bug#23333.
      
      
      mysql-test/r/innodb.result:
        result changed
      mysql-test/r/multi_update.result:
        results changed
      mysql-test/t/innodb.test:
        regression test for the bug combining transactional and non-transaction tables
      mysql-test/t/multi_update.test:
        regression tests added - erred query must be binlogged
      sql/sql_update.cc:
        making a call to multi_update::send_error when mysql_select return an error;
        deploying binlogging inside of ::send_error;
        refining multi_update::send_eof() to mark binlogging work done when its call to ::do_updates() errs
        and the query is binlogged with the error. ::send_error() will be called after all but
        do not do anything;
        thd->no_trans_update.stmt is corrected to be set to TRUE according to the existed code pattern. 
        Although this part relates to another bugs (bug#27417 etc) it is needed here for testing;
        Eliminating a separate issue in multi_update::do_updates where                
        either one of the class members trans_safe, transactional_tables was          
        set after the per-table loop whereas both should be calculated during         
        looping. 
        Eliminating a separate issue in ::send_eof() where thd->no_trans_update.all won't be set TRUE when
        amoung others there'd be at least one modified transactional table.
        Binlogging is done to satisfy to general character bug#13270,bug#23333 so that those won't have
        fixes specific for multi-update.
      6b94fc57
  11. 19 Apr, 2007 3 commits
    • unknown's avatar
      Post-merge fix of innodb.result · ef65fdb0
      unknown authored
      mysql-test/r/innodb.result:
        Move test result after incorrect merge
      ef65fdb0
    • unknown's avatar
      Applied innodb-5.1-ss1404 snapshot · 619c11cb
      unknown authored
      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.
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        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:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        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.
      storage/innobase/handler/ha_innodb.cc:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        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.
      storage/innobase/handler/ha_innodb.h:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        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.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1395:
        * 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().
        
        Approved by:	Heikki
        
        
        
        Revision r1391:
        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()
        
        Approved by:	Marko
      storage/innobase/plug.in:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1395:
        * 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().
        
        Approved by:	Heikki
      619c11cb
    • 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
  12. 22 Mar, 2007 2 commits
    • unknown's avatar
      Apply the following InnoDB snapshots: · 76de7d78
      unknown authored
      innodb-5.1-ss1318
      innodb-5.1-ss1330
      innodb-5.1-ss1332
      innodb-5.1-ss1340
      
      Fixes:
      - Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
        At low transaction isolation levels we let each consistent read set
        its own snapshot.
      
      - Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
        On Windows ut_usectime returns secs and usecs relative to the UNIX
        epoch (which is Jan, 1 1970).
      
      - Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.
      
      - Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.
      
      - Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
        The bug could be reproduced as follows:
      
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
      
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
      
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      
      
      mysql-test/r/innodb.result:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug 22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug 24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug 20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      mysql-test/t/innodb.test:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug 22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1283:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/22 18:42:52+02:00 monty@mysql.com 
          Give warnings for unused objects
          Changed error message to be compatible with old error file
          Added new error message for new DUP_ENTRY syntax
        
        mysql-test/t/innodb.test
          2007/01/22 18:42:49+02:00 monty@mysql.com +14 -14
          Changed to use new error message
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug 24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug 20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1329:
        Merge changes from MySQL AB to mysql-test directives.
        The results are not affected.
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      storage/innobase/buf/buf0buf.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/buf/buf0flu.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/buf/buf0lru.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/dict/dict0boot.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/dict/dict0crea.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/dict/dict0dict.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1316:
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.  (Bug #25927)
        
        dict_foreign_find_index(): Add paramettter check_null.
        
        dict_foreign_add_to_cache(): Do not allow ON DELETE SET NULL
        or ON UPDATE SET NULL if any of the referencing columns are declared NOT NULL.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/dict/dict0load.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug 24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug 20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/fil/fil0fil.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/fsp/fsp0fsp.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/ha/ha0ha.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/handler/ha_innodb.cc:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1204:
        Change this in ha_innobase:
        
         void*           innobase_prebuilt;
        
        to this:
        
         row_prebuilt_t* prebuilt;
        
        by introducing the typedef in ha_innodb.h, and remove all the now needless
        local variables and casts in ha_innodb.cc.
        
        Revision r1298:
        ha_innodb.cc: Remove all references to thd->ha_data[hton->slot].
        
        thd_to_trx(thd, hton): Accessor for getting the InnoDB trx object
        of a MySQL thread object and an InnoDB handlerton.
        
        
        Revision r1292:
        Remove the declarations of some global functions in ha_innodb.h and declare
        them static in ha_innodb.cc.  These functions are invoked via function
        pointers in handlerton.
        
        
        Revision r1300:
        ha_innodb.cc: Replace thd->tablespace_op with thd_tablespace_op(thd).
        Plugins must treat class THD as an opaque type.
        
        
        Revision r1198:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2372, 2006-12-31 02:29:11+01:00, kent@mysql.com +79 -0
          Many files:
            Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
            Adjusted year(s) in copyright header 
            Added GPL copyright text
        
        
        Revision r1271:
        Merge changes from MySQL AB:
        
        Rename some FIELD_TYPE_ constants to MYSQL_TYPE_.
        
        Change the scope of a type cast of two dividends.
        
        
        Revision r1299:
        ha_innodb.cc: Replace thd->in_lock_tables with thd_in_lock_tables(thd).
        Plugins must treat class THD as an opaque type.
        
        
        Revision r1201:
        Apply patch from MySQL:
        
         ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
           Added innodb_rollback_on_timeout option to restore the 4.1 
           InnoDB timeout behavior (Bug 24200)
        
        Revision r1322:
        ha_innodb.cc: Remove the unused innobase_repl_ variables.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
        
        
        Revision r1334:
        Fix for Bug# 21409. At low transaction isolation levels we let each 
        consistent read set its own snapshot
      storage/innobase/handler/ha_innodb.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1204:
        Change this in ha_innobase:
        
         void*           innobase_prebuilt;
        
        to this:
        
         row_prebuilt_t* prebuilt;
        
        by introducing the typedef in ha_innodb.h, and remove all the now needless
        local variables and casts in ha_innodb.cc.
        
        Revision r1292:
        Remove the declarations of some global functions in ha_innodb.h and declare
        them static in ha_innodb.cc.  These functions are invoked via function
        pointers in handlerton.
        
        
        Revision r1198:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2372, 2006-12-31 02:29:11+01:00, kent@mysql.com +79 -0
          Many files:
            Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
            Adjusted year(s) in copyright header 
            Added GPL copyright text
        
        
        Revision r1201:
        Apply patch from MySQL:
        
         ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
           Added innodb_rollback_on_timeout option to restore the 4.1 
           InnoDB timeout behavior (Bug 24200)
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/buf0buf.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/buf0flu.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/dict0dict.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/ha0ha.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/lock0lock.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/log0log.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/mem0mem.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1241:
        Remove the unused function mem_strdupq().
      storage/innobase/include/mem0mem.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1241:
        Remove the unused function mem_strdupq().
      storage/innobase/include/rem0rec.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1338:
        rec_offs_nth_size(): Treat n==0 as a special case.  (Bug #26835)
      storage/innobase/include/sync0rw.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/sync0sync.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
      storage/innobase/include/sync0sync.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1294:
        Fixed inline asm code, it didn't work with GCC > ver 3.x.
        
        
        Revision r1244:
        Add ut_ad() debug assertions.
        
        UT_LIST_ADD_FIRST(), UT_LIST_ADD_LAST(), UT_LIST_INSERT_AFTER():
        Assert against some trivial cases of cyclic lists.
        
        mutex_enter_func(): Assert that the current thread is not holding the mutex.
        
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/trx0sys.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/univ.i:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1285:
        Merge a change from MySQL AB:
        
        ChangeSet
          2006/10/26 15:41:47-04:00 iggy@amd64. 
          Post Merge Cleanup
        
        storage/innobase/include/univ.i
          2006/10/26 15:38:50-04:00 iggy@amd64. +9 -0
          Post Merge Cleanup
      storage/innobase/include/ut0lst.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1244:
        Add ut_ad() debug assertions.
        
        UT_LIST_ADD_FIRST(), UT_LIST_ADD_LAST(), UT_LIST_INSERT_AFTER():
        Assert against some trivial cases of cyclic lists.
        
        mutex_enter_func(): Assert that the current thread is not holding the mutex.
      storage/innobase/lock/lock0lock.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1330:
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.  (Bug #25494)
        
        
        Revision r1332:
        lock_deadlock_recursive(): When aborting the search, display a note
        regardless of start->undo_no.  Otherwise, aborted searches may show
        up as genuine deadlocks.  This mistake was made in r1330.
      storage/innobase/log/log0log.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
      storage/innobase/log/log0recv.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/mem/mem0pool.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/pars/pars0pars.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/que/que0que.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/read/read0read.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/row/row0mysql.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1201:
        Apply patch from MySQL:
        
         ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
           Added innodb_rollback_on_timeout option to restore the 4.1 
           InnoDB timeout behavior (Bug 24200)
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/row/row0vers.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/srv/srv0que.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/srv/srv0srv.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1262:
        Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
        
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/sync/sync0rw.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/sync/sync0sync.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
      storage/innobase/thr/thr0loc.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0purge.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0roll.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0rseg.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0sys.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0trx.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/trx/trx0undo.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/usr/usr0sess.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/ut/ut0ut.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1262:
        Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      76de7d78
    • unknown's avatar
      NULL MERGE this to 5.1 · 805c2d52
      unknown authored
      Apply the following InnoDB snapshots:
      innodb-5.0-ss1319
      innodb-5.0-ss1331
      innodb-5.0-ss1333
      innodb-5.0-ss1341
      
      Fixes:
      - Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
        At low transaction isolation levels we let each consistent read set
        its own snapshot.
      - Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
        On Windows ut_usectime returns secs and usecs relative to the UNIX
        epoch (which is Jan, 1 1970).
      
      - Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.
      
      - Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.
      
      - Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
        The bug could be reproduced as follows:
      
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
      
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
      
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      
      
      innobase/dict/dict0dict.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1317:
        branches/5.0: Port r1316 from trunk:
        
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.  (Bug #25927)
        
        dict_foreign_find_index(): Add paramettter check_null.
        
        dict_foreign_add_to_cache(): Do not allow ON DELETE SET NULL
        or ON UPDATE SET NULL if any of the referencing columns are declared NOT NULL.
      innobase/include/rem0rec.ic:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1339:
        branches/5.0: Merge r1338 from trunk:
        
        rec_offs_nth_size(): Treat n==0 as a special case.  (Bug #26835)
      innobase/include/sync0sync.ic:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1293:
        branches/5.0: Fixed inline asm code, it didn't work with GCC > ver 3.x.
      innobase/lock/lock0lock.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1331:
        branches/5.0: Merge r1330 from trunk:
        
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.  (Bug #25494)
        
        
        Revision r1333:
        branches/5.0: Merge r1332 from trunk:
        
        lock_deadlock_recursive(): When aborting the search, display a note
        regardless of start->undo_no.  Otherwise, aborted searches may show
        up as genuine deadlocks.  This mistake was made in r1330.
      innobase/srv/srv0srv.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1261:
        branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      innobase/ut/ut0ut.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1261:
        branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      mysql-test/r/innodb.result:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1319:
        branches/5.0: Port r1318 from trunk:
        
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1328:
        branches/5.0: mysql-test: Merge changes from MySQL AB.
        
        
        Revision r1341:
        branches/5.0: Merge r1340 from trunk:
        
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug #22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      mysql-test/t/innodb.test:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1279:
        branches/5.0: Merge changes from MySQL AB:
        
        ChangeSet
          2006/11/20 22:42:06+02:00 monty@mysql.com 
          Remove compiler warnings
          (Mostly in DBUG_PRINT() and unused arguments)
          Fixed bug in query cache when used with traceing (--with-debug)
          Fixed memory leak in mysqldump
          Removed warnings from mysqltest scripts (replaced -- with #)
        
        mysql-test/t/innodb.test
          2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
          Remove mysqltest warnings
        
        sql/ha_innodb.cc
          2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
          Fixed compiler warning
        
        
        Revision r1319:
        branches/5.0: Port r1318 from trunk:
        
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1328:
        branches/5.0: mysql-test: Merge changes from MySQL AB.
        
        
        Revision r1341:
        branches/5.0: Merge r1340 from trunk:
        
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug #22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1283:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/22 18:42:52+02:00 monty@mysql.com 
          Give warnings for unused objects
          Changed error message to be compatible with old error file
          Added new error message for new DUP_ENTRY syntax
        
        mysql-test/t/innodb.test
          2007/01/22 18:42:49+02:00 monty@mysql.com +14 -14
          Changed to use new error message
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1329:
        Merge changes from MySQL AB to mysql-test directives.
        The results are not affected.
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      sql/ha_innodb.cc:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1279:
        branches/5.0: Merge changes from MySQL AB:
        
        ChangeSet
          2006/11/20 22:42:06+02:00 monty@mysql.com 
          Remove compiler warnings
          (Mostly in DBUG_PRINT() and unused arguments)
          Fixed bug in query cache when used with traceing (--with-debug)
          Fixed memory leak in mysqldump
          Removed warnings from mysqltest scripts (replaced -- with #)
        
        mysql-test/t/innodb.test
          2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
          Remove mysqltest warnings
        
        sql/ha_innodb.cc
          2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
          Fixed compiler warning
        
        
        Revision r1280:
        branches/5.0: Merge a change from MySQL AB:
        
        ChangeSet
          2006/11/30 18:25:05+02:00 monty@mysql.com 
          Fixed portability issue in my_thr_init.c (was added in my last push)
          
          Fixed compiler warnings (detected by VC++):
          - Removed not used variables
          - Added casts
          - Fixed wrong assignments to bool
          - Fixed wrong calls with bool arguments
          - Added missing argument to store(longlong), which caused wrong store
          method to be called.
        
        sql/ha_innodb.cc
          2006/11/30 18:24:53+02:00 monty@mysql.com +0 -1
          Removed not used variable
        
        
        Revision r1260:
        branches/5.0: Fix for Bug# 21409. At low transaction isolation levels
        we let each consistent read set its own snapshot.
        
        
        Revision r1326:
        branches/5.0: Merge code from MySQL AB:
        
        ChangeSet@1.2417.3.1  2007-02-22 16:59:57+02:00  monty@mysql.fi
        
        Fixed compiler warnings (for linux and win32 and win64)
      805c2d52
  13. 19 Feb, 2007 1 commit
    • unknown's avatar
      Bug#18743: Several test cases fails if "classic" configuration in 5.0 · db36a2aa
      unknown authored
      The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
      - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
      - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
      
      
      mysql-test/r/ctype_cp932.result:
        Moved cp932-specific test case from mysql.test
      mysql-test/r/innodb.result:
        Moved ucs2-specific test cases to innodb-ucs2.test
      mysql-test/r/mysql.result:
        Move cp932-specific test cases to ctype_cp932.test
      mysql-test/r/mysqlbinlog.result:
        Moved cp932-specific test case to mysqlbinlog-cp932.test
      mysql-test/r/sp.result:
        Moved ucs2-specific test case to sp-ucs2.test
      mysql-test/t/ctype_cp932.test:
        Moved cp932-specific test case from mysql.test
      mysql-test/t/ctype_ucs2_def-master.opt:
        Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server
      mysql-test/t/ctype_ucs2_def.test:
        Added requirement for ucs2 in the server
      mysql-test/t/innodb.test:
        Moved ucs2-specific test cases to innodb-ucs2.test
      mysql-test/t/mysql.test:
        Move cp932-specific test cases to ctype_cp932.test
      mysql-test/t/mysqlbinlog.test:
        Moved cp932-specific test case to mysqlbinlog-cp932.test
      mysql-test/t/sp.test:
        Moved ucs2-specific test case to sp-ucs2.test
      sql/mysqld.cc:
        Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled:
        mysqld --default-character-set=ucs2,latin1
        The first available character set will be chosen.
      mysql-test/r/innodb-ucs2.result:
        New BitKeeper file ``mysql-test/r/innodb-ucs2.result''
      mysql-test/r/mysqlbinlog-cp932.result:
        New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result''
      mysql-test/r/sp-ucs2.result:
        New BitKeeper file ``mysql-test/r/sp-ucs2.result''
      mysql-test/t/innodb-ucs2.test:
        New BitKeeper file ``mysql-test/t/innodb-ucs2.test''
      mysql-test/t/mysqlbinlog-cp932.test:
        New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test''
      mysql-test/t/sp-ucs2.test:
        New BitKeeper file ``mysql-test/t/sp-ucs2.test''
      db36a2aa
  14. 15 Feb, 2007 1 commit
    • unknown's avatar
      Fixed bug #25971: indexes on text columns were ignored when ref accesses · 6ae94723
      unknown authored
      were evaluated.
      According to the new rules for string comparison partial indexes on text
      columns can be used in the same cases when partial indexes on varchar
      columns can be used.
      
      
      mysql-test/r/endspace.result:
        Adjusted results after the fix for bug #25971.
      mysql-test/r/innodb.result:
        Adjusted results after the fix for bug #25971.
      mysql-test/r/myisam.result:
        Adjusted results after the fix for bug #25971.
      mysql-test/r/select.result:
        Added a test case for bug #25971.
      mysql-test/r/type_blob.result:
        Adjusted results after the fix for bug #25971.
      mysql-test/t/select.test:
        Added a test case for bug #25971.
      6ae94723
  15. 24 Jan, 2007 1 commit
    • unknown's avatar
      bug #22682 Test fails --without-geometry · f469aa00
      unknown authored
      geometry dependent parts moved to proper .test files
      
      
      mysql-test/r/gis.result:
        result fixed
      mysql-test/r/innodb.result:
        result fixed
      mysql-test/r/innodb_gis.result:
        result fixed
      mysql-test/r/view.result:
        result fixed
      mysql-test/t/gis.test:
        HAVE_GEOMETRY dependent part moved here from view.test
      mysql-test/t/innodb.test:
        HAVE_GEOMETRY dependent part moved to innodb_gis.test
      BitKeeper/etc/ignore:
        Added libmysqld/sql_servers.cc to the ignore list
      mysql-test/t/innodb_gis.test:
        HAVE_GEOMETRY dependent part moved here from innodb.test
      mysql-test/t/view.test:
        HAVE_GEOMETRY dependent part moved to gis.test
      f469aa00
  16. 22 Jan, 2007 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss1186 · 8ca71550
      unknown authored
      Fixes bugs:
      - Bug #20877: InnoDB data dictionary memory footprint is too big
      - Bug #24741: existing cascade clauses disappear when adding foreign keys
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss1186
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss1186
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss1186
        
        Revision r1168:
        buf_flush_batch(): Remove the test page_count != ULINT_UNDEFINED.
        The variable is initialized to zero, and after that it is only added to.
        Maybe the one who introduced the variable srv_buf_pool_flushed overlooked
        that there is a separate return statement for returning ULINT_UNDEFINED?
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss1186
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss1186
        
        Revision r1165:
        ut_2_power_up(): Add __attribute__((const)), because otherwise this function
        is repeatedly called in buf_flush_free_margin() due to the definitions
        of BUF_READ_AHEAD_AREA and other macros starting with BUF_READ_AHEAD_.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss1186
        
        Revision r1158:
        Modify que_fork_start_command() to do only one pass over the thread list
        instead of three.
      8ca71550
  17. 09 Oct, 2006 1 commit
    • unknown's avatar
      Bug #22781: SQL_BIG_RESULT fails to influence sort plan · 45cad70f
      unknown authored
       Currently SQL_BIG_RESULT is checked only at compile time.
       However, additional optimizations may take place after
       this check that change the sort method from 'filesort'
       to sorting via index. As a result the actual plan
       executed is not the one specified by the SQL_BIG_RESULT
       hint. Similarly, there is no such test when executing
       EXPLAIN, resulting in incorrect output.
       The patch corrects the problem by testing for
       SQL_BIG_RESULT both during the explain and execution
       phases.
      
      
      mysql-test/r/bdb.result:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - updated sql_big_result testcase
      mysql-test/r/group_by.result:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - test case with MyISAM
      mysql-test/r/innodb.result:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - updated sql_big_result testcase
      mysql-test/r/innodb_mysql.result:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - test case with InnoDB
      mysql-test/r/myisam.result:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - updated sql_big_result testcase
      mysql-test/t/group_by.test:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - test case with MyISAM
      mysql-test/t/innodb_mysql.test:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - test case with InnoDB
      sql/sql_select.cc:
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         - When SQL_BIG_RESULT is specified, disable the optimization performed
        at execution/explain time that decides to use an index instead
        of filesort.
      45cad70f
  18. 14 Aug, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots. · 2606cb93
      unknown authored
      All but ss677 are against the mysql-5.1 tree only.
      
      Fixes the following bugs:
      - Bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
      - Bug #20213: DBT2 testing cause mysqld to core using Innodb
      - Bug #20493: on partition tables, select and show command casue server crash
      - Bug #21113: Duplicate printout in SHOW INNODB STATUS
      - Bug #21313: rsql_..._recover_innodb_tmp_table is redundant and broken
      - Bug #21467: Manual URL wrong in InnoDB "page corrupted" error report
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        innodb.result: Adjust Innodb_rows_inserted and Innodb_rows_updated
        to reflect the deleted statements in r420, which somehow reappeared
        in the MySQL tree.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        ha_innobase::start_stmt(): patch from Heikki:
        Do not call read_view_close_for_mysql().  (Bug #19834)
        
        Fix Bug#20213 and its duplicates: stress test crashes of InnoDB-5.1
        
        Fix Bug #20493 : we must prepare prebuilt->trx to point to the trx of this thd before using it
        
        Add update_thd() to several places in ha_innodb.cc to make sure prebuilt->trx points to the right trx object; in other functions add assertions that prebuilt->trx is for this thd; when 5.1 stabilizes, we can change these assertions to ut_ad() debug version assertions
        
        Remove redundant check_trx_exists() and ut_a() from r701,
        as suggested by Marko
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/fil/fil0fil.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug
        #21112.
        
        After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/fsp/fsp0fsp.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        ibuf_print(): Don't print redundant information. Fixes bug #21113.
        
        Remove non-varying variable ibuf->meter and related constant IBUF_THRESHOLD.
      storage/innobase/include/btr0cur.ic:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        btr_cur_get_page(): Remove buggy assertion.
      storage/innobase/include/buf0buf.ic:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/include/ibuf0ibuf.ic:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Remove non-varying variable ibuf->meter and related constant IBUF_THRESHOLD.
      storage/innobase/log/log0log.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Remove the special treatment of tables
        rsql_IDENTIFIER_recover_innodb_tmp_table, which is redundant and
        was broken with the introduction of the "safe" file name encoding of
        identifiers.  (Bug #21313)
        
        ChangeSet@1.2181.173.1  2006-08-02 17:57:06+02:00  ingo@local
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Changed back the encoded temp file prefix to #sql.
        
        After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/row/row0vers.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        row_vers_build_for_semi_consistent_read(): rec_trx_id was uninitialized
        in a comparison.  Initialize it.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/ut/ut0dbg.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        ut_dbg_assertion_failed(): Print space between timestamp and start of error
        message.
        
        After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
      2606cb93
  19. 30 Jul, 2006 1 commit
  20. 21 Jul, 2006 1 commit
    • unknown's avatar
      Fixed bug#12185: Data type aggregation may produce wrong result · 35209c68
      unknown authored
      The Item::tmp_table_field_from_field_type() function creates Field_datetime
      object instead of Field_timestamp object for timestamp field thus always
      changing data type is a tmp table is used.
      
      The Field_blob object constructor which is used in the 
      Item::tmp_table_field_from_field_type() is always setting packlength field of
      newly created blob to 4. This leads to changing fields data type for example
      from the blob to the longblob if a temporary table is used.
      
      The Item::make_string_field() function always converts Field_string objects 
      to Field_varstring objects. This leads to changing data type from the 
      char/binary to varchar/varbinary.
      
      Added appropriate Field_timestamp object constructor for using in the 
      Item::tmp_table_field_from_field_type() function.
      
      Added Field_blob object constructor which sets pack length according to
      max_length argument.
      
      The Item::tmp_table_field_from_field_type() function now creates
      Field_timestamp object for a timestamp field.
      
      The Item_type_holder::display_length() now returns correct NULL length NULL
      length. 
      
      The Item::make_string_field() function now doesn't change Field_string to
      Field_varstring in the case of Item_type_holder. 
      
      The Item::tmp_table_field_from_field_type() function now uses the Field_blob
      constructor which sets packlength according to max_length.
      
      
      mysql-test/t/union.test:
        Added test case for bug#12185: Data type aggregation may produce wrong result
        Corrected test case after fix for bug#12185
      mysql-test/t/innodb.test:
        Corrected test case after fix for bug#12185
      mysql-test/r/union.result:
        Added test case for bug#12185: Data type aggregation may produce wrong result
         Corrected test case after fix for bug#12185
      mysql-test/r/innodb.result:
        Corrected test case after fix for bug#12185
      mysql-test/r/create.result:
        Corrected the test case after fixing bug#12185
      sql/field.h:
        Fixed bug#12185: Data type aggregation may produce wrong result
        Added Field_blob object constructor which sets packlength according to
        max_length argument.
      sql/item.cc:
        Fixed bug#12185: Data type aggregation may produce wrong result
        The Item::make_string_field() function now doesn't change Field_string to
        Field_varstring in the case of Item_type_holder.
        The Item::tmp_table_field_from_field_type() function now creates
        Field_timestamp object for a timestamp field.
        The Item::tmp_table_field_from_field_type() function now uses the Field_blob
        constructor which sets packlength according to max_length.
        The Item_type_holder::display_length() now returns correct NULL length NULL
        length.
      sql/field.cc:
        Fixed bug#12185: Data type aggregation may produce wrong result
        Added appropriate Field_timestamp object constructor for using in the 
        Item::tmp_table_field_from_field_type() function.
      35209c68
  21. 01 Jun, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss594 snapshot. · 2dca2a1a
      unknown authored
       Fixed BUG#19542 "InnoDB doesn't increase the Handler_read_prev couter".
       Fixed BUG#19609 "Case sensitivity of innodb_data_file_path gives stupid error".
       Fixed BUG#19727 "InnoDB crashed server and crashed tables are ot recoverable".
       Also:
       * Remove remnants of the obsolete concept of memoryfixing tables and indexes.
       * Remove unused dict_table_LRU_trim().
       * Remove unused 'trx' parameter from dict_table_get_on_id_low(),
         dict_table_get(), dict_table_get_and_increment_handle_count().
       * Add a normal linked list implementation.
       * Add a work queue implementation.
       * Add 'level' parameter to mutex_create() and rw_lock_create().
         Remove mutex_set_level() and rw_lock_set_level().
       * Rename SYNC_LEVEL_NONE to SYNC_LEVEL_VARYING.
       * Add support for bound ids in InnoDB's parser.
       * Define UNIV_BTR_DEBUG for enabling consistency checks of
         FIL_PAGE_NEXT and FIL_PAGE_PREV when accessing sibling
         pages of B-tree indexes.
         btr_validate_level(): Check the validity of the doubly linked
         list formed by FIL_PAGE_NEXT and FIL_PAGE_PREV.
       * Adapt InnoDB to the new tablename to filename encoding in MySQL 5.1.
         ut_print_name(), ut_print_name1(): Add parameter 'table_id' for
         distinguishing names of tables from other identifiers.
         New: innobase_convert_from_table_id(), innobase_convert_from_id(),
              innobase_convert_from_filename(), innobase_get_charset.
         dict_accept(), dict_scan_id(), dict_scan_col(), dict_scan_table_name(),
         dict_skip_word(), dict_create_foreign_constraints_low(): Add
         parameter 'cs' so that isspace() can be replaced with my_isspace(),
         whose operation depends on the connection character set.
         dict_scan_id(): Convert identifier to UTF-8.
         dict_str_starts_with_keyword(): New extern function, to replace
         dict_accept() in row_search_for_mysql().
         mysql_get_identifier_quote_char(): Replaced with innobase_print_identifier().
         ha_innobase::create(): Remove the thd->convert_strin() call. Pass the
         statement to InnoDB in the connection character set and let InnoDB
         convert the identifier to UTF-8.
       * Add max_row_size to dict_table_t.
       * btr0cur.c
         btr_copy_externally_stored_field(): Only set the 'offset' variable
         when needed.
       * buf0buf.c
         buf_page_io_complete(): Write to the error log if the page number or
         the space id o the disk do not match those in memory. Also write to
         the error log if a page was read from the doublewrite buffer. The
         doublewrite buffer should be only read by the lower-level function
         fil_io() at database startup.
       * dict0dict.c
         dict_scan_table_name(): Remove fallback to differently encoded name
         when the table is not found. The encoding is handled at a higher level.
       * ha_innodb.cc
         Increment statistic counter in ha_innobase::index_prev() (bug 19542).
         Add innobase_convert_string wrapper function and a new file
         ha_prototypes.h.
         innobase_print_identifier(): Remove TODO comment before calling
         get_quote_char_for_identifier(). That function apparently assumes
         the identifier to be encoded in UTF-8.
       * ibuf0ibuf.c|h
         ibuf_count_get(), ibuf_counts[], ibuf_count_inited(): Define these
         only #ifdef UNIV_IBUF_DEBUG. Previously, when compiled without
         UNIV_IBUF_DEBUG, invoking ibuf_count_get() would crash InnoDB.
         The function is only being called #ifdef UNIV_IBUF_DEBUG.
       * innodb.result
         Adjust the results for changes in the foreign key error messages.
       * mem0mem.c|h
         New: mem_heap_dup(), mem_heap_printf(), mem_heap_cat().
       * os0file.c
         Check the page trailers also after writing to disk. This improves
         chances of diagnosing bug 18886.
         os_file_check_page_trailers(): New function for checking that the
         two copies of the LSN stamped on the page match.
         os_aio_simulated_handle(): Call os_file_check_page_trailers()
         before and after os_file_write().
       * row0mysql.c
         Move trx_commit_for_mysql(trx) calls before calls to
         row_mysql_unlock_data_dictionary(trx) (bug 19727).
       * row0sel.c
         row_fetch_print(): Handle SQL NULL values without crashing.
         row_sel_store_mysql_rec(): Remove useless call to rec_get_nth_field
         when handling an externally stored column.
         Fetch externally stored fields when using InnoDB's internal SQL
         parser.
         Optimize BLOB selects by using prebuilt->blob_heap directly instead
         of first reading BLOB data to a temporary heap and then copying it
         to prebuilt->blob_heap.
       * srv0srv.c
         srv_master_thread(): Remove unreachable code.
       * srv0start.c
         srv_parse_data_file_paths_and_sizes(): Accept lower-case 'm' and
         'g' as abbreviations of megabyte and gigabyte (bug 19609).
         srv_parse_megabytes(): New fuction.
       * ut0dbg.c|h
         Implement InnoDB assertions (ut_a and ut_error) with abort() when
         the code is compiled with GCC 3 or later on other platforms than
         Windows or Netware. Also disable the variable ut_dbg_stop_threads
         and the function ut_dbg_stop_thread() i this case, unless
         UNIV_SYC_DEBUG is defined. This should allow the compiler to
         generate more compact code for assertions.
       * ut0list.c|h
         Add ib_list_create_heap().
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss594 snapshot.
      mysql-test/t/innodb.test:
        Copy the comment from the beginning of the file
         to the end because MySQL developers continue
         adding test cases to this file.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/CMakeLists.txt:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0pcur.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0sea.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0mem.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/fil/fil0fil.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ha/hash0hash.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/data0type.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/dict0dict.ic:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/dict0mem.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/fil0fil.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/fsp0fsp.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ibuf0ibuf.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/mem0mem.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/pars0sym.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/pars0types.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/rem0rec.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/row0purge.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/row0undo.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/srv0srv.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/sync0rw.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/sync0sync.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0dbg.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/log/log0log.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/mem/mem0dbg.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/mem/mem0pool.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/os/os0thread.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/pars0sym.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0purge.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0row.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/srv/srv0srv.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/sync/sync0arr.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/thr/thr0loc.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0purge.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0rec.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0roll.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0rseg.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0sys.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/Makefile.am:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0dbg.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0ut.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ha_prototypes.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0list.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0list.ic:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0wqueue.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0list.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0wqueue.c:
        Applied innodb-5.1-ss594 snapshot.
      2dca2a1a
  22. 26 May, 2006 1 commit
    • unknown's avatar
      BUG#15868 InnoDB thread thrashing · 81467f2b
      unknown authored
      Restoring default innodb_thread_concurrency to 8
      This default now matches 5.0
      
      
      mysql-test/r/innodb.result:
        BUG#15868 InnoDB thread thrashing
        Restoring default innodb_thread_concurrency to 8
      sql/mysqld.cc:
        BUG#15868 InnoDB thread thrashing
        Restoring default innodb_thread_concurrency to 8
      81467f2b
  23. 05 May, 2006 1 commit
    • unknown's avatar
      Don't use row level logging on optimize or repair table. · 3995b06b
      unknown authored
      (Fixes core dump in rpl_failed_optimize.test)
      Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      
      
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
        Added extra test + drop of table at end of test
      mysql-test/lib/mtr_report.pl:
        Fail if mysqld asserts or prints stack
      mysql-test/mysql-test-run.sh:
        Fail if mysqld asserts or prints stack
      mysql-test/r/exampledb.result:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/r/innodb.result:
        Extra test to see that we can do an optimize table on an active transaction
      mysql-test/r/rpl_failed_optimize.result:
        Added extra test + drop of table at end of test
      mysql-test/t/exampledb.test:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/t/innodb.test:
        Extra test to see that we can do an optimize table on an active transaction
      sql/handler.cc:
        Don't use row level logging on optimize or repair table.
      sql/log.cc:
        Simplify code (no logic changes)
      sql/mysql_priv.h:
        Added prototype
      sql/sql_base.cc:
        Better name for define
      sql/sql_class.cc:
        Indentation fix
      sql/sql_parse.cc:
        Make end_active_trans() global
      sql/sql_table.cc:
        Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      3995b06b
  24. 24 Apr, 2006 1 commit
    • unknown's avatar
      Manual merge fix. · aa19a8f2
      unknown authored
      mysql-test/r/innodb.result:
        Corrected from manual merge.  I know the numbers are right (it's a 
        7,7-seeded fibbonaci sequence), but I don't know how I missed the latter 
        line.
      aa19a8f2
  25. 23 Apr, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss475 snapshot. · ca9b46f7
      unknown authored
      * Fix BUG#15650: "DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for binlog"
      * Fix BUG#17134: "Partitions: uncommitted changes are visible"
      * Fix BUG#17992: "Partitions: InnoDB, somehow rotten table after UPDATE"
        row0ins.c: MySQL's partitioned table code does not set preduilt->sql_stat_start right
        if it does an insert in the same statement after doing a search first in the same
        partition table. We now write trx id always to the buffer, not just when flag
        sql_stat_start is on. This will waste CPU time very sightly.
      * Fix BUG#18077: "InnoDB uses full explicit table locks in stored FUNCTION"
      * Fix BUG#18238: "When locks exhaust the buffer pool, InnoDB does not roll back the trx"
      * Fix BUG#18252" "Disk space leak in updates of InnoDB BLOB rows in 5.0 and 5.1"
      * Fix BUG#18283: "When InnoDB returns error 'lock table full', MySQL can write to binlog too much"
      * Fix BUG#18350: "Use consistent read in CREATE ... SELECT ... if innodb_locks_unsafe_for_binlog"
      * Fix BUG#18384: "InnoDB memory leak on duplicate key errors in 5.0 if row has many columns"
      * Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID"
        Refuse tables that use reserved column names.
      * InnoDB's SQL parser:
        - Add support for UNSIGNED types, EXIT keyword, quoted identifiers, user-function callbacks
          for processing results of FETCH statements, bound literals, DATA_VARCHAR for bound literals.
        - Allow bound literals of type non-INTEGER to be of length 0.
        - Add make_flex.sh and update lexer/parser generation documentation.
        - Add comment clarifying the difference between 'alias' and 'indirection' fields in sym_node_t.
        - Remove never reached duplicate code in pars_set_dfield_type().
        - Rewrite pars_info datatypes and APIs, add a few helper functions.
        - Since the functions definitions in pars_info_t are accessed after pars_sql() returns
          in the query graph execution stage, we can't free pars_info_t in pars_sql(). Instead,
          make pars_sql() transfer ownership of pars_info_t to the created query graph, and
          make que_graph_free() free it if needed.
        - Allow access to system columns like DB_ROW_ID.
      * Use bound literals in row_truncate_table_for_mysql, row_drop_table_for_mysql,
        row_discard_tablespace_for_mysql, and row_rename_table_for_mysql.
      * Setting an isolation level of the transaction to read committed weakens the locks for
        this session similarly like the option innodb_locks_unsafe_for binlog. This patch removes
        alnost all gap locking (used in next-key locking) and makes MySQL to release the row locks
        on the rows which does not belong to result set. Additionally, nonlocking selects on
        INSERT INTO SELECT, UPDATE ... (SELECT ...), and CREATE ... SELECT ... use a nonlocking
        consistent read. If a binlog is used, then binlog format should be set to row based
        binloging to make the execution of the complex SQL statements.
      * Disable the statistic variables btr_search_n_hash_fail and n_hash_succ, n_hash_fail,
        n_patt_succ, and n_searches of btr_search_t in builds without #ifdef UNIV_SEARCH_PERF_STAT.
      * Make innodb.test faster. Group all consistent read test cases to a one test case and
        wait their lock timeout after all have been send to the server. Decrease amount of rows
        inserted in a certain test - this has no effect on the effectiveness of the test and
        reduces the running time by ~10 sec. Remove temporary work-arounds from innodb.result
        now that ALTER TABLE DROP FOREIGN KEY works once again.
      * Make innodb_unsafe_binlog.test faster. Grout all consistent read test cases to a one
        test case amd wait their lock timeout after all have been sent to the server. Remove
        unnecessary option --loose_innodb_lock_wait_timeout.
      * Print dictionary memory size in SHOW INNODB STATUS.
      * Fix memory leaks in row_create_table_for_mysql() in rare corner cases.
      * Remove code related to clustered tables. They were never implemented, and the
        implementation would be challenging with ROW_FORMAT=COMPACT. Remove the table types
        DICT_TABLE_CLUSTER_MEMBER and DICT_TABLE_CLUSTER and all related tests and functions.
        dict_table_t: Remove mix_id, mix_len, mix_id_len, mix_id_buf, and cluster_name.
        plan_t: Remove mixed_index.
        dict_create_sys_tables_tuple(): Set MIX_ID=0, MIX_LEN=0, CLUSTER_NAME=NULL when
        inserting into SYS_TABLES.
        dict_tree_check_search_tuple(): Enclose in #ifdef UNIV_DEBUG.
      * Move calling of thr_local_free() from trx_free_for_mysql() to
        innobase_close_connection().
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/r/innodb_unsafe_binlog.result:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb-master.opt:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb_unsafe_binlog-master.opt:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb_unsafe_binlog.test:
        Applied innodb-5.1-ss475 snapshot.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss475 snapshot.
         Do not use inlined functions in ha_innodb.cc.
         Remove assertion ut_error which crashes the mysqld server
         if it prints a warning about the adaptive latch.
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0pcur.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0sea.c:
        Applied innodb-5.1-ss475 snapshot.
         Fix compilation problem with non-C99 compilers.
      storage/innobase/buf/buf0lru.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/cmakelists.txt:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/configure.in:
        Applied innodb-5.1-ss475 snapshot.
         Add disabled-by-default logic to switch GCC to a strict C89-mode.
         Add -Werror-implicit-function_declaration to CFLAGS when using gcc.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss475 snapshot.
         dtype_print(): Recognize DATA_FIXBINARY and DATA_BLOB types.
         Print known flags from prtype. Use a switch statement instead
         of else-if chain.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss475 snapshot.
         Use bound literals in all SQL statements instead of elaborately
         constructing correctly allocated and quoted strings to pass the
         data in ASCII form.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/dict/dict0mem.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/eval/eval0proc.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/btr0cur.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/btr0cur.ic:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/btr0sea.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/buf0lru.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/dict0dict.ic:
        Applied innodb-5.1-ss475 snapshot.
         Remove too strict assertions from some dict_table_t
         accessor functions.
      storage/innobase/include/dict0mem.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/eval0proc.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/hash0hash.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/lock0lock.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/mem0mem.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/page0page.ic:
        Applied innodb-5.1-ss475 snapshot.
         Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
      storage/innobase/include/pars0grm.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/pars0sym.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/pars0types.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/que0que.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/row0mysql.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/row0sel.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/row0upd.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/trx0trx.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss475 snapshot.
         Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
         When using GCC, use __inline__ instead of inline.
      storage/innobase/include/ut0mem.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/mem/mem0dbg.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/os/os0sync.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/make_bison.sh:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0grm.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0grm.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0grm.y:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0opt.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0sym.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss475 snapshot.
         Remove a memory leak when trying to insert a duplicate record to a
         clustered inedx comprising more than about 90 columns (Bug#18384).
         row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at
         func_exit if needed.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss475 snapshot.
         row_mysql_is_system_table(): Use strncmp, not memcmp, since we
         don't know how long the input string is.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss475 snapshot.
         Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
         row_sel_field_store_in_mysql_format(): Turn the assertions on
         mbminlen, mbmaxlen, and templ->type into debug assertions.
         fetch_step(): Print a more usefull error message when the cursor is closed.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss475 snapshot.
         row_upd_index_replace_new_col_vals_index_pos(): Add a parameter
         order_only for limiting the replacement to the ordering fields
         of the index.
      storage/innobase/srv/srv0srv.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/sync/sync0arr.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ut/Makefile.am:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ut/ut0mem.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/ut0vec.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/ut0vec.ic:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/make_flex.sh:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ut/ut0vec.c:
        Applied innodb-5.1-ss475 snapshot.
      ca9b46f7
  26. 20 Apr, 2006 2 commits
    • unknown's avatar
      Restoring changes erroneously removed by applying · 43690501
      unknown authored
       the innodb-5.0-ss476 snapshot.
      
      
      43690501
    • unknown's avatar
      Applied innodb-5.0-ss476 snapshot. · 7ee05d7c
      unknown authored
       Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
       Also, fix memory leaks in row_create_table_for_mysql() in rare
       corner cases.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/dict/dict0load.c:
        Applied innodb-5.0-ss476 snapshot.
         dict_load_table(): Refuse to load tables with other TYPE
         than DICT_TABLE_ORDINARY.
      innobase/dict/dict0mem.c:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/include/dict0dict.h:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column name (Bug#18934).
      innobase/include/dict0mem.h:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/include/univ.i:
        Applied innodb-5.0-ss476 snapshot.
      innobase/log/log0recv.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/row/row0mysql.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      mysql-test/r/innodb.result:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Other changes are to be restored by the next cset).
      mysql-test/t/innodb.test:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Removed test case for Bug#14360 is to be restored by the next cset).
      7ee05d7c
  27. 17 Apr, 2006 2 commits
  28. 14 Apr, 2006 1 commit
  29. 13 Apr, 2006 1 commit
  30. 12 Apr, 2006 1 commit
    • unknown's avatar
      bug #15860 (SPATIAL keys in INNODB) · f01b0ac2
      unknown authored
      mysql-test/r/innodb.result:
        result added
      mysql-test/t/innodb.test:
        testcase
      sql/ha_myisam.cc:
        HA_CAN_RTREEKEYS added to ha_myisam
      sql/handler.h:
        HA_CAN_RTREEKEYS defined
      sql/share/errmsg.txt:
        error message added
      sql/sql_table.cc:
        check that the handler allows SPATIAL keys
      f01b0ac2
  31. 11 Apr, 2006 1 commit
    • unknown's avatar
      Fix for bug #14360: Date Between Interval Broken. · 1ef73963
      unknown authored
                                         
      
      
      mysql-test/r/innodb.result:
        Fix for bug #14360: Date Between Interval Broken.                               
          - test case.
      mysql-test/t/innodb.test:
        Fix for bug #14360: Date Between Interval Broken.                               
          - test case.
      sql/item_timefunc.cc:
        Fix for bug #14360: Date Between Interval Broken.                               
          - Item_date_add_interval::eq() introduced.
      sql/item_timefunc.h:
        Fix for bug #14360: Date Between Interval Broken.                               
          - Item_date_add_interval::eq() introduced.
      1ef73963
  32. 10 Apr, 2006 1 commit
  33. 30 Mar, 2006 1 commit
    • unknown's avatar
      Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE · 5569a87e
      unknown authored
      InnoDB requires a full table rebuild for foreign key changes.
      It was not possible in compare_tables() to detect such changes.
      
      On Heikkis proposal I added a new flag to the syntax parser
      where foreign key definition changes are done. I test for
      this flag in compare_tables() now.
      
      
      mysql-test/r/innodb.result:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Fixed an old test result.
        Added the new test result.
      mysql-test/t/innodb.test:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Added the new test case.
      sql/sql_lex.h:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Added a flag for foreign key definition changes.
      sql/sql_table.cc:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Check for foreign key definition changes in 
        compare_tables(). If present, a table rebuild is required.
      sql/sql_yacc.yy:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Marked foreign key definitions with the new flag.
        This flag is tested in ALTER TABLE only. It is
        ignored otherwise.
      5569a87e
  34. 10 Mar, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss269 snapshot. · 050f14ac
      unknown authored
        Fixed BUGS:
        #3300: "UPDATE statement with no index column in where condition locks
          all rows"
          Implement semi-consistent read to reduce lock conflicts at the cost
          of breaking serializability.
          ha_innobase::unlock_row(): reset the "did semi consistent read" flag
          ha_innobase::was_semi_consistent_read(),
          ha_innobase::try_semi_consistent_read(): new methods
          row_prebuilt_t, row_create_prebuilt(): add field row_read_type for
          keeping track of semi-consistent reads
          row_vers_build_for_semi_consistent_read(),
          row_sel_build_committed_vers_for_mysql(): new functions
          row_search_for_mysql(): implement semi-consistent reads
      
        #9802: "Foreign key checks disallow alter table".
          Added test cases.
      
        #12456: "Cursor shows incorrect data - DML does not affect,
          probably caching"
          This patch implements a high-granularity read view to be used with
          cursors. In this high-granularity consistent read view modifications 
          done by the creating transaction after the cursor is created or 
         future transactions are not visible. But those modifications that 
         transaction did before the cursor was created are visible.
      
        #12701: "Support >4GB buffer pool and log files on 64-bit Windows"
          Do not call os_file_create_tmpfile() at runtime. Instead, create all
          tempfiles at startup and guard access to them with mutexes.
      
        #13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs".
          When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between
          foreign key references are compatible.
      
        #14189: "VARBINARY and BINARY variables: trailing space ignored with InnoDB"
          innobase_init(): Assert that
          DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
          dtype_get_pad_char(): Do not pad VARBINARY or BINARY columns.
          row_ins_cascade_calc_update_vec(): Refuse ON UPDATE CASCADE when trying
          to change the length of a VARBINARY column that refers to or is referenced
          by a BINARY column. BINARY columns are no longer padded on comparison,
          and thus they cannot be padded on storage either.
      
        #14747: "Race condition can cause btr_search_drop_page_hash_index() to crash"
          Note that buf_block_t::index should be protected by btr_search_latch
          or an s-latch or x-latch on the index page.
          btr_search_drop_page_hash_index(): Read block->index while holding
          btr_search_latch and use the cached value in the loop.  Remove some
          redundant assertions.
      
        #15108: "mysqld crashes when innodb_log_file_size is set > 4G"
      
        #15308: "Problem of Order with Enum Column in Primary Key"
      
        #15550: "mysqld crashes in printing a FOREIGN KEY error in InnoDB"
          row_ins_foreign_report_add_err(): When printing the parent record,
          use the index in the parent table rather than the index in the child table.
      
        #15653: "Slow inserts to InnoDB if many thousands of .ibd files"
          Keep track on unflushed modifications to file spaces.  When there are tens
          of thousands of file spaces, flushing all files in fil_flush_file_spaces()
          would be very slow.
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      
        #15991: "innodb-file-per-table + symlink database + rename = cr"
         os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
         to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
         This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link
         to a different file system.
      
        #16157: "InnoDB crashes when main location settings are empty"
          This patch is from Heikki.
      
        #16298: "InnoDB segfaults in INSERTs in upgrade of 4.0 -> 5.0 tables
          with VARCHAR BINARY"
          dict_load_columns(): Set the charset-collation code
          DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
          that lack a charset-collation code, i.e., the tables were created
          with an older version of MySQL/InnoDB than 4.1.2.
      
        #16229: "MySQL/InnoDB uses full explicit table locks in trigger processing"
          Take a InnoDB table lock only if user has explicitly requested a table
          lock. Added some additional comments to store_lock() and external_lock().
      
        #16387: "InnoDB crash when dropping a foreign key <table>_ibfk_0"
          Do not mistake TABLENAME_ibfk_0 for auto-generated id.
          dict_table_get_highest_foreign_id(): Ignore foreign constraint
          identifiers starting with the pattern TABLENAME_ibfk_0.
      
        #16582: "InnoDB: Error in an adaptive hash index pointer to page"
          Account for a race condition when dropping the adaptive hash index
          for a B-tree page.
          btr_search_drop_page_hash_index(): Retry the operation if a hash index
          with different parameters was built meanwhile.  Add diagnostics for the
          case that hash node pointers to the page remain.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      
        #16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR
          section"
          Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW
          INNODB STATUS output.
          dict_foreign_error_report(): Always print a newline after invoking
          dict_print_info_on_foreign_key_in_create_format().
      
        #16827: "Better InnoDB error message if ibdata files omitted from my.cnf"
      
        #17126: "CHECK TABLE on InnoDB causes a short hang during check of adaptive
          hash"
          CHECK TABLE blocking other queries, by releasing the btr_search_latch
          periodically during the adaptive hash table validation.
      
        #17405: "Valgrind: conditional jump or move depends on unititialised values"
          buf_block_init(): Reset magic_n, buf_fix_count and io_fix to avoid
          testing uninitialized variables.
      
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss269 snapshot.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss269 snapshot.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss269 snapshot.
      sql/ha_innodb.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0pcur.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0sea.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0lru.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0rea.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/data/data0data.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0boot.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0mem.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dyn/dyn0dyn.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/eval/eval0eval.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/eval/eval0proc.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/fil/fil0fil.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/fsp/fsp0fsp.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/fut/fut0lst.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ha/ha0ha.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ha/hash0hash.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0btr.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0btr.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0cur.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0cur.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0pcur.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0pcur.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0sea.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0sea.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0buf.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0buf.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0flu.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0flu.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0lru.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0data.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0data.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0type.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0type.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/db0err.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0boot.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0boot.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0crea.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0dict.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0load.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0mem.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dyn0dyn.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dyn0dyn.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0eval.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0eval.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0proc.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0proc.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/fil0fil.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/fsp0fsp.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/fut0lst.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ha0ha.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/hash0hash.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/hash0hash.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ibuf0ibuf.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ibuf0ibuf.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/lock0lock.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/lock0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/log0log.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/log0log.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/log0recv.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mach0data.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mach0data.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0dbg.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0dbg.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0mem.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0mem.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0pool.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mtr0log.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mtr0mtr.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mtr0mtr.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0file.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0proc.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0sync.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0sync.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0thread.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0cur.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0cur.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0page.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0page.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0grm.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0opt.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0sym.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/que0que.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/que0que.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/que0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/read0read.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/read0read.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0cmp.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0cmp.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0rec.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0rec.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0ins.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0mysql.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0purge.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0row.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0row.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0sel.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0sel.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0uins.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0umod.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0undo.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0upd.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0upd.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0vers.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/srv0srv.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/srv0start.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0arr.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0rw.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0rw.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0sync.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0sync.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0purge.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0purge.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0rec.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0roll.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0rseg.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0rseg.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0sys.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0sys.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0trx.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0trx.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0undo.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0undo.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0xa.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/usr0sess.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/usr0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0byte.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0byte.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0dbg.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0lst.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0mem.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0mem.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0rnd.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0rnd.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0sort.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0ut.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/log/log0log.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mach/mach0data.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mem/mem0dbg.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mem/mem0pool.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mtr/mtr0log.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mtr/mtr0mtr.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0proc.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0sync.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0thread.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/page/page0cur.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/page/page0page.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0grm.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0grm.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0grm.y:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0opt.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0sym.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/read/read0read.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/rem/rem0cmp.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/rem/rem0rec.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0purge.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0row.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0uins.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0umod.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0undo.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0vers.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/srv/srv0que.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/srv/srv0srv.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/sync/sync0arr.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/thr/thr0loc.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0purge.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0rec.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0roll.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0rseg.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0sys.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0undo.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/usr/usr0sess.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0byte.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0dbg.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0mem.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0rnd.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0ut.c:
        Applied innodb-5.1-ss269 snapshot.
      mysql-test/r/innodb_unsafe_binlog.result:
        New BitKeeper file ``mysql-test/r/innodb_unsafe_binlog.result''
      mysql-test/t/innodb_unsafe_binlog-master.opt:
        New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog-master.opt''
      mysql-test/t/innodb_unsafe_binlog.test:
        New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog.test''
      storage/innobase/pars/make_bison.sh:
        New BitKeeper file ``storage/innobase/pars/make_bison.sh''
      050f14ac
  35. 24 Feb, 2006 1 commit
    • unknown's avatar
      Fixes to embedded server to be able to run tests with it · 0afb6ff6
      unknown authored
      (Needed for "list of pushes" web page and autopush)
      
      
      include/mysql.h:
        Fix to embedded server to be able to run tests on it
      libmysql/libmysql.c:
        Fix to embedded server to be able to run tests on it
      libmysqld/emb_qcache.cc:
        Fix to embedded server to be able to run tests on it
      libmysqld/embedded_priv.h:
        Fix to embedded server to be able to run tests on it
      libmysqld/lib_sql.cc:
        Fix to embedded server to be able to run tests on it
      libmysqld/libmysqld.c:
        Fix to embedded server to be able to run tests on it
      mysql-test/mysql-test-run.sh:
        Fix to embedded server to be able to run tests on it
      mysql-test/r/binlog.result:
        Updated test for embedded server
      mysql-test/r/ctype_cp932.result:
        Updated test for embedded server
      mysql-test/r/innodb.result:
        Updated test for embedded server
      mysql-test/r/mysqltest.result:
        Updated test for embedded server
      mysql-test/r/query_cache.result:
        Updated test for embedded server
      mysql-test/r/query_cache_notembedded.result:
        Updated test for embedded server
      mysql-test/r/sp-error.result:
        Updated test for embedded server
      mysql-test/r/sp.result:
        Updated test for embedded server
      mysql-test/r/subselect.result:
        Updated test for embedded server
      mysql-test/r/view.result:
        Updated test for embedded server
      mysql-test/r/view_grant.result:
        Updated test for embedded server
      mysql-test/t/backup.test:
        Updated test for embedded server
      mysql-test/t/binlog.test:
        Updated test for embedded server
      mysql-test/t/blackhole.test:
        Updated test for embedded server
      mysql-test/t/compress.test:
        Updated test for embedded server
      mysql-test/t/ctype_cp932.test:
        Updated test for embedded server
      mysql-test/t/delayed.test:
        Updated test for embedded server
      mysql-test/t/handler.test:
        Updated test for embedded server
      mysql-test/t/innodb.test:
        Updated test for embedded server
      mysql-test/t/mysql.test:
        Updated test for embedded server
      mysql-test/t/mysql_client_test.test:
        Updated test for embedded server
      mysql-test/t/mysqltest.test:
        Updated test for embedded server
      mysql-test/t/query_cache.test:
        Updated test for embedded server
      mysql-test/t/query_cache_notembedded.test:
        Updated test for embedded server
      mysql-test/t/read_only.test:
        Updated test for embedded server
      mysql-test/t/skip_grants.test:
        Updated test for embedded server
      mysql-test/t/sp-destruct.test:
        Updated test for embedded server
      mysql-test/t/sp-error.test:
        Updated test for embedded server
      mysql-test/t/sp-threads.test:
        Updated test for embedded server
      mysql-test/t/sp.test:
        Updated test for embedded server
      mysql-test/t/subselect.test:
        Updated test for embedded server
      mysql-test/t/temp_table.test:
        Updated test for embedded server
      mysql-test/t/view.test:
        Updated test for embedded server
      mysql-test/t/view_grant.test:
        Updated test for embedded server
      mysql-test/t/wait_timeout.test:
        Updated test for embedded server
      mysys/mf_dirname.c:
        Review fix: Don't access data outside of array
      mysys/my_bitmap.c:
        Remove compiler warnings
      scripts/mysql_fix_privilege_tables.sql:
        Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script
      sql-common/client.c:
        Updated test for embedded server
      sql/item.cc:
        Remove DBUG_PRINT statement that can cause crashes when running with --debug
      sql/mysqld.cc:
        Fix to embedded server to be able to run tests on it
      sql/protocol.cc:
        Fix to embedded server to be able to run tests on it
        (Trivial reconstruction of code)
      sql/protocol.h:
        Fix to embedded server to be able to run tests on it
      sql/sql_base.cc:
        Better comment
      sql/sql_class.cc:
        Fix to embedded server to be able to run tests on it
      sql/sql_class.h:
        Fix to embedded server to be able to run tests on it
      sql/sql_cursor.cc:
        Fix to embedded server to be able to run tests on it
      sql/sql_parse.cc:
        Fix to embedded server to be able to run tests on it
        Don't crash for disabled commands when using embedded server
      sql/sql_prepare.cc:
        Fix to embedded server to be able to run tests on it
      mysql-test/r/ctype_cp932_notembedded.result:
        New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result''
      mysql-test/r/innodb_notembedded.result:
        New BitKeeper file ``mysql-test/r/innodb_notembedded.result''
      mysql-test/r/sp.result.orig:
        New BitKeeper file ``mysql-test/r/sp.result.orig''
      mysql-test/r/sp_notembedded.result:
        New BitKeeper file ``mysql-test/r/sp_notembedded.result''
      mysql-test/r/subselect_notembedded.result:
        New BitKeeper file ``mysql-test/r/subselect_notembedded.result''
      mysql-test/t/ctype_cp932_notembedded.test:
        New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test''
      mysql-test/t/innodb_notembedded.test:
        New BitKeeper file ``mysql-test/t/innodb_notembedded.test''
      mysql-test/t/sp.test.orig:
        New BitKeeper file ``mysql-test/t/sp.test.orig''
      mysql-test/t/sp_notembedded.test:
        New BitKeeper file ``mysql-test/t/sp_notembedded.test''
      mysql-test/t/subselect_notembedded.test:
        New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
      0afb6ff6