1. 15 Sep, 2006 1 commit
  2. 14 Sep, 2006 2 commits
  3. 12 Sep, 2006 3 commits
    • unknown's avatar
      Merge april.(none):/home/svoj/devel/bk/mysql-5.0-engines · 8ee5d2f6
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-push
      
      
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      8ee5d2f6
    • unknown's avatar
      BUG#20256 - LOCK WRITE - MyISAM · fa1436bf
      unknown authored
      Only MyISAM tables locked with LOCK TABLES ... WRITE were affected.
      
      A query that is optimized with index_merge doesn't reflect rows
      inserted within LOCK TABLES.
      
      MyISAM doesn't flush a state within LOCK TABLES. index_merge
      optimization creates a copy of the handler, which thus gets
      outdated MyISAM state.
      
      New handler->clone() method is introduced to fix this problem.
      For non-MyISAM storage engines it allocates a handler and opens
      it with ha_open(). For MyISAM it additionally copies MyISAM state
      pointer to cloned handler.
      
      
      mysql-test/r/index_merge.result:
        A test case for bug#20256.
      mysql-test/t/index_merge.test:
        A test case for bug#20256.
      sql/ha_myisam.cc:
        clone method added to handler class.
      sql/ha_myisam.h:
        clone method added to handler class.
      sql/handler.cc:
        clone method added to handler class.
      sql/handler.h:
        clone method added to handler class.
      sql/opt_range.cc:
        Use handler clone method.
      fa1436bf
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · d340a67b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug14400
      
      
      d340a67b
  4. 07 Sep, 2006 3 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug14400 · 86ce3096
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug14400
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.1
      86ce3096
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · 203d0999
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      203d0999
    • unknown's avatar
      Bug#14400 - Query joins wrong rows from table which is subject of · 71314617
      unknown authored
                  "concurrent insert"
      Additional fix for full keys and test case.
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional fix for full keys.
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional results.
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional test case.
      71314617
  5. 30 Aug, 2006 1 commit
    • unknown's avatar
      Bug#20573 · 2233201b
      unknown authored
        "strict mode: inserts autogenerated auto_increment value bigger than max"
        Strict mode should fail if autoincrement value is out of range
      
      
      include/my_base.h:
        Add new handler error codes
      sql/ha_berkeley.cc:
        handle error in update_auto_increment()
      sql/ha_heap.cc:
        handle error in update_auto_increment()
      sql/ha_innodb.cc:
        handle error in update_auto_increment()
      sql/ha_myisam.cc:
        handle error in update_auto_increment()
      sql/ha_myisammrg.cc:
        handle error in update_auto_increment()
      sql/ha_ndbcluster.cc:
        handle error in update_auto_increment()
      sql/handler.cc:
        return error from handler::update_auto_increment()
      sql/handler.h:
        change return type of handler::update_auto_increment() to int
      sql/share/errmsg.txt:
        new error message for auto-increment
      mysql-test/include/strict_autoinc.inc:
        New BitKeeper file ``mysql-test/include/strict_autoinc.inc''
      mysql-test/r/strict_autoinc_1myisam.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_1myisam.result''
      mysql-test/r/strict_autoinc_2innodb.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_2innodb.result''
      mysql-test/r/strict_autoinc_3heap.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_3heap.result''
      mysql-test/r/strict_autoinc_4bdb.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_4bdb.result''
      mysql-test/r/strict_autoinc_5ndb.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_5ndb.result''
      mysql-test/t/strict_autoinc_1myisam.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_1myisam.test''
      mysql-test/t/strict_autoinc_2innodb.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_2innodb.test''
      mysql-test/t/strict_autoinc_3heap.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_3heap.test''
      mysql-test/t/strict_autoinc_4bdb.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_4bdb.test''
      mysql-test/t/strict_autoinc_5ndb.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_5ndb.test''
      2233201b
  6. 29 Aug, 2006 2 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · a32f6b89
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Manual merge from 4.0.
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Manual merge from 4.0.
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Manual merge from 4.0.
      a32f6b89
    • unknown's avatar
      Bug#14400 - Query joins wrong rows from table which is · 7d600f71
      unknown authored
                  subject of "concurrent insert"
      Better fix by Monty: "The previous bug fix didn't work
      when using partial keys."
      
      
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Added test result
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Added test case
      7d600f71
  7. 23 Aug, 2006 1 commit
  8. 22 Aug, 2006 7 commits
  9. 21 Aug, 2006 3 commits
  10. 18 Aug, 2006 2 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 70b73788
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      
      sql/examples/ha_tina.cc:
        Auto merged
      70b73788
    • unknown's avatar
      innodb r702 · 3468780e
      unknown authored
      innodb r719
      
      
      innobase/btr/btr0btr.c:
        innodb r702
      innobase/buf/buf0buf.c:
        innodb r702
      innobase/dict/dict0dict.c:
        innodb r702
      innobase/fil/fil0fil.c:
        innodb r702
      innobase/fsp/fsp0fsp.c:
        innodb r702
      innobase/include/btr0cur.ic:
        innodb r719
      innobase/include/buf0buf.ic:
        innodb r702
      innobase/log/log0log.c:
        innodb r702
      innobase/log/log0recv.c:
        innodb r702
      innobase/os/os0file.c:
        innodb r702
      innobase/row/row0mysql.c:
        innodb r702
      innobase/row/row0sel.c:
        innodb r702
      innobase/srv/srv0start.c:
        innodb r702
      innobase/ut/ut0dbg.c:
        innodb r702
      sql/ha_innodb.cc:
        innodb r702
      3468780e
  11. 17 Aug, 2006 6 commits
    • unknown's avatar
      BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexed · c17fc16c
      unknown authored
                  table results in table corrupt
      
      Fulltext key has always two keysegs, thus we need to update
      FT_SEGS (last) element from seg array in case of compressed table.
      Also we must update ft2_keyinfo.
      
      
      myisam/mi_packrec.c:
        Fulltext key has always two keysegs, thus we need to update
        FT_SEGS (last) element from seg array in case of compressed table.
        Also we must update ft2_keyinfo.
      c17fc16c
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 5c8c2ab4
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      BitKeeper/deleted/.del-mysql_client.result:
        Auto merged
      BitKeeper/deleted/.del-mysql_client.test:
        Auto merged
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      5c8c2ab4
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 860c3853
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      860c3853
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 7faa9efe
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      7faa9efe
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · d82c1514
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      d82c1514
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · d3efda57
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      d3efda57
  12. 16 Aug, 2006 9 commits