1. 10 May, 2007 5 commits
  2. 09 May, 2007 10 commits
  3. 08 May, 2007 25 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c863f1ee
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27670-bug-5.0-opt-mysql
      
      
      c863f1ee
    • unknown's avatar
      Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a · 80788a34
      unknown authored
      TIMESTAMP field when no value has been provided.
      
      The LOAD DATA sets the current time in the TIMESTAMP field with
      CURRENT_TIMESTAMP default value when the field is detected as a null.
      But when the LOAD DATA command loads data from a file that doesn't contain
      enough data for all fields then the rest of fields are simply set to null
      without any check. This leads to no value being inserted to such TIMESTAMP
      field.
      
      Now the read_sep_field() and the read_fixed_length() functions set current
      time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
      when a NULL value is loaded to the field.
      
      
      mysql-test/t/loaddata.test:
        Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
        default value for a TIMESTAMP field when no value has been provided.
      mysql-test/r/loaddata.result:
        Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
        default value for a TIMESTAMP field when no value has been provided.
      sql/sql_load.cc:
        Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
        TIMESTAMP field when no value has been provided.
        Now the read_sep_field() and the read_fixed_length() functions set current
        time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
        when a NULL value is loaded to the field.
      80788a34
    • unknown's avatar
      item_cmpfunc.cc, type_datetime.result, type_datetime.test, item_cmpfunc.h: · a15fe8d9
      unknown authored
        After merge fix.
      
      
      sql/item_cmpfunc.cc:
        After merge fix.
      sql/item_cmpfunc.h:
        After merge fix.
      mysql-test/r/type_datetime.result:
        After merge fix.
      mysql-test/t/type_datetime.test:
        After merge fix.
      a15fe8d9
    • unknown's avatar
      correcting previous commit · 738b2dd8
      unknown authored
      738b2dd8
    • unknown's avatar
      increase heartbeat interval to avoid load related start up issues in mysql-test-run · f01f1938
      unknown authored
      
      BitKeeper/etc/ignore:
        Added libmysqld/ha_ndbcluster_cond.cc to the ignore list
      f01f1938
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 68c97505
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      BitKeeper/deleted/.del-ndb_config_1_node.ini:
        Auto merged
      BitKeeper/deleted/.del-ndb_config_4_node.ini:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      mysql-test/ndb/ndb_config_2_node.ini:
        manual merge
      68c97505
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · d78f5372
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      d78f5372
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 3229c61e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/test/ndbapi/testBasic.cpp:
        merge
      3229c61e
    • unknown's avatar
      ndb - bug#20535 · efa9faf2
      unknown authored
        set null bits on delete+insert
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        set null bits on delete+insert
      storage/ndb/test/ndbapi/testBasic.cpp:
        set null bits on delete+insert
        20535
      storage/ndb/test/run-test/daily-basic-tests.txt:
        testcase
      efa9faf2
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · 58a22741
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/handler.cc:
        Manual merge
      sql/item_cmpfunc.cc:
        Manual merge
      sql/item_cmpfunc.h:
        Manual merge
      sql/item_func.h:
        Manual merge
      sql/sql_class.h:
        Manual merge
      58a22741
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · beacbfda
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      beacbfda
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 5bb2a2a1
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      5bb2a2a1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a6b14a62
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      a6b14a62
    • unknown's avatar
      ndb - bug#27437 · c02934a5
      unknown authored
        redo extra verification code so that tupkeyref is reset just before tupkeyreq
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        redo extra verification code so that tupkeyref is reset just before tupkeyreq
      c02934a5
    • unknown's avatar
      Raise version number after cloning 5.1.18-beta · 3a065ffa
      unknown authored
      3a065ffa
    • unknown's avatar
      warning eliminated · 4fbd484e
      unknown authored
      4fbd484e
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4d108ce7
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      4d108ce7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4caf6d38
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      4caf6d38
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 8ae76210
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      8ae76210
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 503c92d9
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/r/ndb_basic.result:
        SCCS merged
      503c92d9
    • unknown's avatar
      ndb - bug#27437 · 3962e2d4
      unknown authored
        bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
        this was however "normally" shadowed, but made LQH crash when LCP was about to start
      
      
      mysql-test/r/ndb_basic.result:
        testcase
      mysql-test/t/ndb_basic.test:
        testcase
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)
      ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        make sure TUPKEYREF is not sent twice in case of "error" in interpreted program
      3962e2d4
    • unknown's avatar
      Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb-bj · 6aa333d9
      unknown authored
      into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
      
      
      6aa333d9
    • unknown's avatar
      Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj · 90ae0c35
      unknown authored
      into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
      
      
      sql/ha_ndbcluster.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      90ae0c35
    • unknown's avatar
      Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · ae4e628e
      unknown authored
      into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      ae4e628e