1. 10 Jan, 2005 6 commits
  2. 09 Jan, 2005 9 commits
  3. 08 Jan, 2005 25 commits
    • unknown's avatar
      Merge · f029af06
      unknown authored
      
      ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      ndb/include/ndb_constants.h:
        merge 5.0->5.0-ndb
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        merge 5.0->5.0-ndb
      ndb/include/ndbapi/NdbDictionary.hpp:
        merge 5.0->5.0-ndb
      ndb/include/util/NdbSqlUtil.hpp:
        merge 5.0->5.0-ndb
      ndb/src/common/util/NdbSqlUtil.cpp:
        merge 5.0->5.0-ndb
      f029af06
    • unknown's avatar
      updated some mgmapi docs · 3fbb1dd5
      unknown authored
      3fbb1dd5
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 · 09ee2d3d
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-5.0-clean
      
      
      09ee2d3d
    • unknown's avatar
      Update test as result of merge · e9befed6
      unknown authored
      
      mysql-test/r/heap.result:
        update test
      e9befed6
    • unknown's avatar
      ndb - wl-1442 4.1->5.0 merge fixes · 09a48726
      unknown authored
      
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        wl-1442 4.1->5.0 merge fixes
      ndb/include/ndb_constants.h:
        wl-1442 4.1->5.0 merge fixes
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1442 4.1->5.0 merge fixes
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 4.1->5.0 merge fixes
      09a48726
    • unknown's avatar
      Merge · 2c12921a
      unknown authored
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/ndb_index_ordered.result:
        Auto merged
      mysql-test/t/ndb_index_ordered.test:
        Auto merged
      ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        merge
      ndb/include/ndbapi/NdbDictionary.hpp:
        merge
      ndb/include/util/NdbSqlUtil.hpp:
        merge
      ndb/src/common/util/NdbSqlUtil.cpp:
        merge
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        merge
      sql/ha_ndbcluster.cc:
        merge
      2c12921a
    • unknown's avatar
      Merge mysql.com:/home/jwinstead2/mysql-4.1-7233 · f2034fdb
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-5.0-clean
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/sql_mode.result:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      f2034fdb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 94504d52
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      94504d52
    • unknown's avatar
      few harmless warnings from automated code-checking tools fixed · 4c8d52aa
      unknown authored
      
      client/mysql.cc:
        few harmless warnings from automated code-checking tools fixed
        cleanup
      4c8d52aa
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 · c86ae204
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1-clean
      
      
      c86ae204
    • unknown's avatar
      ndb_constants.h: · 39aa7b10
      unknown authored
        wl-1442 comment for 4.1->5.0
      
      
      ndb/include/ndb_constants.h:
        wl-1442 comment for 4.1->5.0
      39aa7b10
    • unknown's avatar
      ndb - wl-1442 fix Time ordering · 3186b340
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        wl-1442 fix Time.  adds new type id 25
      mysql-test/t/ndb_index_ordered.test:
        wl-1442 fix Time.  adds new type id 25
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/include/ndbapi/NdbDictionary.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/src/ndbapi/NdbDictionary.cpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/test/include/NdbSchemaOp.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/tools/restore/consumer.cpp:
        wl-1442 fix Time.  adds new type id 25
      sql/ha_ndbcluster.cc:
        wl-1442 fix Time.  adds new type id 25
      3186b340
    • unknown's avatar
      Ndb.hpp: Fixed some typos and added note · 6e38a4cd
      unknown authored
      about parallelism (Guide section).
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Fixed some typos and added note about parallelism 
        (Guide section).
      6e38a4cd
    • unknown's avatar
      Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b278ee6c
      unknown authored
      into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Auto merged
      b278ee6c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · f62f8f2e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Auto merged
      f62f8f2e
    • unknown's avatar
      fixed some mgmapi docs · c16322ad
      unknown authored
      added example to ndbapi docs
      
      
      ndb/include/mgmapi/mgmapi.h:
        fixed some mgmapi docs
      ndb/include/ndbapi/Ndb.hpp:
        added examples
      ndb/src/mgmapi/mgmapi.cpp:
        removed unused parameter
      c16322ad
    • unknown's avatar
      More documentation fixes/edits to Ndb.hpp (NDB · 17f32ed6
      unknown authored
      Programmers Guide section.)
      
      
      ndb/include/ndbapi/Ndb.hpp:
        More fixes/edits (finished NDB Programmers Guide section.)
      17f32ed6
    • unknown's avatar
      ndb - wl-1442 fix Date ordering · 633ee9b0
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        wl-1442 fix Date.  reuses old unused Timespec type id
      mysql-test/t/ndb_index_ordered.test:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/include/ndbapi/NdbDictionary.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/src/ndbapi/NdbDictionary.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/test/include/NdbSchemaOp.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/tools/restore/consumer.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      sql/ha_ndbcluster.cc:
        wl-1442 fix Date.  reuses old unused Timespec type id
      633ee9b0
    • unknown's avatar
      ndb - wl-1442 updated ndb_index_ordered.result · 2a3f285e
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        wl-1442 missed result file
      2a3f285e
    • unknown's avatar
      Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 83695e84
      unknown authored
      into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb
      
      
      83695e84
    • unknown's avatar
      First round of edits to Ndb.hpp for Alcatel PDF. · b8a32fdc
      unknown authored
      
      ndb/include/ndbapi/Ndb.hpp:
        Edits for Alcatel PDF version (first set).
      b8a32fdc
    • unknown's avatar
      ndb - wl-1442 bug#7725 datetime ordering · ce6de604
      unknown authored
      
      mysql-test/t/ndb_index_ordered.test:
        wl-1442 datetime ordering
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 datetime ordering
      ce6de604
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-ndb · 96d92b12
      unknown authored
      into build.mysql.com:/users/tulin/mysql-5.0-ndb
      
      
      96d92b12
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 605c7071
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      605c7071
    • unknown's avatar