1. 27 Mar, 2007 7 commits
    • marko's avatar
      innobase_commit(): Correct the comments and formatting that were broken when · 278c29e5
      marko authored
      innodb_commit_concurrency was implemented.
      278c29e5
    • marko's avatar
      Remove ha_innobase::last_query_id and references to thd->query_id. · 4f1615b7
      marko authored
      MySQL calls external_lock at the beginning and end of a statement
      when it is not calling start_stmt or commit or rollback.  Thus,
      statement boundaries can be (and are already) detected without
      monitoring thd->query_id.
      
      The function innobase_commit() seemingly lacks the call to
      innobase_release_stat_resources(), which should be called at
      the end of every SQL statement.  The call was replaced by
      equivalent statements by Vadim Tkachenko when he implemented
      innodb_commit_concurrency in MySQL 5.0:
      
      http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
      4f1615b7
    • marko's avatar
      Add static qualifiers to some symbols in ha_innodb.cc that are not · 0f505f92
      marko authored
      referenced from other modules.
      0f505f92
    • marko's avatar
      Merge a change from MySQL AB: · 28f6d0de
      marko authored
      ChangeSet
        2007/03/20 10:22:15-04:00 iggy@recycle.(none) 
        Post Merge Fix.
      
      storage/innobase/CMakeLists.txt
        2007/03/20 10:22:13-04:00 iggy@recycle.(none) +2 -2
        Post Merge Fix.
      28f6d0de
    • marko's avatar
      Merge a change from MySQL AB: · 0991e5bb
      marko authored
      ChangeSet
        2007/02/14 22:06:41-08:00 igor@olga.mysql.com 
        Fixed bug #25971: indexes on text columns were ignored when ref accesses
        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/innodb.result
        2007/02/14 22:06:39-08:00 igor@olga.mysql.com +1 -1
        Adjusted results after the fix for bug #25971.
      0991e5bb
    • marko's avatar
      Merge a change from MySQL AB: · 79dea753
      marko authored
      ChangeSet
        2007/02/15 15:39:03+01:00 guilhem@gbichot3.local 
        Fix for BUG#25507 "multi-row insert delayed + auto increment causes
        duplicate key entries on slave" (two concurrrent connections doing
        multi-row INSERT DELAYED to insert into an auto_increment column,
        caused replication slave to stop with "duplicate key error" (and
        binlog was wrong)), and BUG#26116 "If multi-row INSERT
        DELAYED has errors, statement-based binlogging breaks" (the binlog
        was not accounting for all rows inserted, or slave could stop).
        The fix is that: if (statement-based) binlogging is on, a multi-row
        INSERT DELAYED is silently converted to a non-delayed INSERT.
        Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
        so it is tested only in the changeset for 5.1. However, BUG#26116
        is tested here, and the fix for BUG#25507 is the same code change.
      
      mysql-test/r/innodb-replace.result
        2007/02/15 15:39:01+01:00 guilhem@gbichot3.local +2 -2
        result update
      
      mysql-test/t/innodb-replace.test
        2007/02/15 15:39:01+01:00 guilhem@gbichot3.local +2 -2
        now that multi-row delayed inserts are converted to normal inserts
        if the statement-based binlog is enabled,
        no error is issued even if this engine does not support INSERT DELAYED,
        as the insert does not go through the INSERT DELAYED code.
        To preserve the goal of this test, we change the statements to single-
        row inserts.
      79dea753
    • marko's avatar
      Port r1372 from branches/5.0: Merge a change from MySQL AB, and remove · 4b64ce64
      marko authored
      the innodb_gis test case.
      
      ChangeSet
        2007/02/19 13:57:06+03:00 kaa@polly.local
        Bug#18743: Several test cases fails if "classic" configuration in 5.0
        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/t/innodb.test
        2007/02/19 13:57:02+03:00 kaa@polly.local +0 -222
        Moved ucs2-specific test cases to innodb-ucs2.test
      4b64ce64
  2. 26 Mar, 2007 1 commit
    • marko's avatar
      Merge a change from MySQL AB: · e15454c5
      marko authored
      ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
      Bug #26598: Create variable to allow turning off of statistic gathering
      on metadata commands
      
      Add innodb_stats_on_metadata option, which enables gathering
      index statistics when processing metadata commands such as
      SHOW TABLE STATUS.  Default behavior of the server does not
      change (this option is enabled by default).
      e15454c5
  3. 25 Mar, 2007 1 commit
  4. 21 Mar, 2007 1 commit
    • marko's avatar
      Minor cleanup. · b054fc69
      marko authored
      innobase_query_caching_of_table_permitted(): Make static.
      
      ha_innobase::register_query_cache_table(): Move the function
      definition from ha_innodb.h to ha_innodb.cc.  Add comments.
      b054fc69
  5. 19 Mar, 2007 1 commit
  6. 15 Mar, 2007 2 commits
  7. 14 Mar, 2007 1 commit
  8. 08 Mar, 2007 3 commits
  9. 05 Mar, 2007 3 commits
    • marko's avatar
      innodb.test, innodb.result: Add test case for Bug #26835. · e03bb598
      marko authored
      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.
      e03bb598
    • marko's avatar
      32f5958e
    • sunny's avatar
      Fix for Bug# 21409. At low transaction isolation levels we let each · b76aeffe
      sunny authored
      consistent read set its own snapshot
      b76aeffe
  10. 02 Mar, 2007 3 commits
  11. 01 Mar, 2007 5 commits
  12. 15 Feb, 2007 2 commits
  13. 14 Feb, 2007 1 commit
  14. 12 Feb, 2007 2 commits
  15. 07 Feb, 2007 3 commits
    • marko's avatar
      Merge a change from MySQL AB: · 704d74d5
      marko authored
      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
      704d74d5
    • marko's avatar
      Merge changes from MySQL AB: · 880cc4a9
      marko authored
      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
      880cc4a9
    • marko's avatar
      Merge changes from MySQL AB: · 95ad47ac
      marko authored
      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
      95ad47ac
  16. 02 Feb, 2007 2 commits
    • marko's avatar
      Merge changes from MySQL AB: · e622cb93
      marko authored
      Rename some FIELD_TYPE_ constants to MYSQL_TYPE_.
      
      Change the scope of a type cast of two dividends.
      e622cb93
    • marko's avatar
      Rename hash_create to hash0_create by a #define. This fixes a · cd462019
      marko authored
      symbol collision when building PHP with IMAP and MySQL (Bug #13859).
      The bug was originally fixed by MySQL in a more obtrusive way, by
      replacing all occurrences of hash_create with hash0_create.  This
      change was applied to the MySQL tree as follows:
      
      ChangeSet@1.1616.2924.6, 2007-01-11 12:31:52+01:00, kent@mysql.com +9 -0
        Many files:
          Reverted change for bug#13859, applied smaller patch from Marko
      cd462019
  17. 24 Jan, 2007 1 commit
  18. 22 Jan, 2007 1 commit