1. 14 May, 2007 11 commits
  2. 11 May, 2007 3 commits
  3. 10 May, 2007 7 commits
  4. 09 May, 2007 10 commits
  5. 08 May, 2007 9 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