1. 11 Feb, 2006 1 commit
    • unknown's avatar
      mysql-test-run.{pl,sh}: · 18faf002
      unknown authored
        Give space for second and third slave port
      
      
      mysql-test/mysql-test-run.pl:
        Give space for second and third slave port
        Define shell variables for all ports, and
        list these at startup
      mysql-test/mysql-test-run.sh:
        Give space for second and third slave port
      18faf002
  2. 10 Feb, 2006 6 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34d8502a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      34d8502a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a68ba18
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      9a68ba18
    • unknown's avatar
      Bug #17249 ndb, delete statement with join where clause fails when table do not have pk · 26287714
      unknown authored
      Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
      
      change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      
      
      mysql-test/r/ndb_basic.result:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
      mysql-test/t/ndb_basic.test:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
      sql/ha_ndbcluster.cc:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
        
        change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      sql/ha_ndbcluster.h:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
        
        change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      26287714
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · c1a6def2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      c1a6def2
    • unknown's avatar
      bug#10987 - ndb - unable to find restorable replica · 165d5390
      unknown authored
        Introduce new variable c_newest_restorable_gci
          which is set _after_ both GCP_SAVE and COPY_GCI
          
        This variable is used when cutting redo (calcKeepGci)
        
        Also make sure complete GCI is run inbetween LCP's
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Introduce new variable c_newest_restorable_gci
          which is set _after_ both GCP_SAVE and COPY_GCI
        
        This variable is used when cutting redo (calcKeepGci)
        Also make sure complete GCI is run inbetween LCP's
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Introduce new variable c_newest_restorable_gci
          which is set _after_ both GCP_SAVE and COPY_GCI
        
        This variable is used when cutting redo (calcKeepGci)
        Also make sure complete GCI is run inbetween LCP's
      165d5390
    • unknown's avatar
      bug#17295 - ndb - error while reading REDO log · bbcb4a56
      unknown authored
        fix corruption due to page 0, file 0 gets released
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Make sure that page 0, file 0 isnt released
      bbcb4a56
  3. 08 Feb, 2006 1 commit
  4. 07 Feb, 2006 6 commits
  5. 06 Feb, 2006 3 commits
    • unknown's avatar
      Bug #17154 load data infile of char values into a table of char(PK) hangs · 8deb6616
      unknown authored
      Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
      Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data
      
      
      mysql-test/r/ndb_load.result:
        New BitKeeper file ``mysql-test/r/ndb_load.result''
      mysql-test/t/ndb_load.test:
        New BitKeeper file ``mysql-test/t/ndb_load.test''
      8deb6616
    • unknown's avatar
      bug#13966 - ndb · db4d82ba
      unknown authored
        better error message on invalid config change
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        fix typo
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Change error message...note that this is a guess
      db4d82ba
    • unknown's avatar
      bug#13965 · c9147c5e
      unknown authored
        ndb - error while restarting in dict
              improve error message when changed config leads to failed restart
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        improve error message
      c9147c5e
  6. 05 Feb, 2006 1 commit
    • unknown's avatar
      ndb - bug#16693 (4.1) test + workaround, analyze later · 1076e176
      unknown authored
      
      ndb/test/ndbapi/testBlobs.cpp:
        do batched deletes + list commit across open cursor test cases
      ndb/tools/delete_all.cpp:
        if blobs, no commit across open cursor (single trans)
        cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)
      1076e176
  7. 03 Feb, 2006 2 commits
    • unknown's avatar
      ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ] · b301e658
      unknown authored
      
      mysql-test/r/ndb_blob.result:
        replace+tinyblob back-patch from 5.0
      mysql-test/t/ndb_blob.test:
        replace+tinyblob back-patch from 5.0
      ndb/src/ndbapi/NdbBlob.cpp:
        replace+tinyblob back-patch from 5.0
      b301e658
    • unknown's avatar
      BUG#16893: Crash in test 'fulltext_order_by' · 394c88df
      unknown authored
      Fixed that fulltext query + union results in unexpected behaviour.
      
      
      sql/item_func.h:
        Remove access to table object from cleanup() as the table object
        may have been dropped earlier (In case of temporary tables or of
        close_thread_tables() is run before cleanup())
        This fixed a bug with access to already freed memory
      sql/sql_base.cc:
        Reset variables used by fulltext
      394c88df
  8. 01 Feb, 2006 2 commits
    • unknown's avatar
      fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset) · 1e686ae7
      unknown authored
      
      libmysql/libmysql.c:
        stmt->mysql could be 0x0 if the connection has failed between prepare and execute
        or any other operation. thus if the user decides to use mysql_stmt_reset()
        we should not segfault.
      tests/mysql_client_test.c:
        test for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
      1e686ae7
    • unknown's avatar
      BUG#14496: Crash or strange results with prepared statement, · e3c30863
      unknown authored
                 MATCH and FULLTEXT
      Fixed that fulltext query using PS results in unexpected behaviour
      when executed 2 or more times.
      
      
      mysql-test/r/fulltext.result:
        Testcase for BUG#14496.
      mysql-test/t/fulltext.test:
        Testcase for BUG#14496.
      sql/item_func.h:
        In Item_func_match::cleanup() always reset ft_handler to 0.
      e3c30863
  9. 31 Jan, 2006 3 commits
  10. 30 Jan, 2006 4 commits
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2cb45da8
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
      
      
      2cb45da8
    • unknown's avatar
      Fixed BUG#15653, BUG#16582. · 8eaf6f11
      unknown authored
        Applied innodb-4.1-ss20 snapshot.
      
      
      innobase/btr/btr0sea.c:
        Applied innodb-4.1-ss20 snapshot.
          Account for a race condition when dropping the adaptive
          hash index for a B-tree page (Bug #16582).
          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. This fix is from Heikki.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      innobase/fil/fil0fil.c:
        Applied innodb-4.1-ss20 snapshot.
          Keep track on unflushed modifications to file spaces. When
          there are tens of thousnads of file spaces, flushing all files
          in fil_flush_file_spaces() would be very slow (Bug #16582).
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      innobase/include/btr0sea.ic:
        Applied innodb-4.1-ss20 snapshot.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      8eaf6f11
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 43f122c4
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
      
      
      43f122c4
    • unknown's avatar
      Fixed BUG#16387. · cc47eb77
      unknown authored
        Applied innodb-4.1-ss17 snapshot.
        Do not mistake TABLENAME_ibfk_0 for auto-generated id.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-4.1-ss17 snapshot.
          dict_table_get_highest_foreign_id(): Ignore foreign
          constraint identifiers starting with the pattern
          TABLENAME_ibfk_0 (BUG#16387).
      mysql-test/r/innodb.result:
        Applied innodb-4.1-ss17 snapshot.
          Fixed results for added test case.
      mysql-test/t/innodb.test:
        Applied innodb-4.1-ss17 snapshot.
          Added test case.
      cc47eb77
  11. 28 Jan, 2006 3 commits
    • unknown's avatar
      mysql-test-run.pl: · 13896eaa
      unknown authored
        Aligned the MTR_BUILD_THREAD policy to shell version
      
      
      mysql-test/mysql-test-run.pl:
        Aligned the MTR_BUILD_THREAD policy to shell version
      13896eaa
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 55ca11fe
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      55ca11fe
    • unknown's avatar
      mysql-test-run.sh: · a73b7dc2
      unknown authored
        Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
      
      
      mysql-test/mysql-test-run.sh:
        Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
      a73b7dc2
  12. 27 Jan, 2006 7 commits
  13. 26 Jan, 2006 1 commit