1. 07 Jan, 2005 1 commit
  2. 04 Jan, 2005 19 commits
  3. 03 Jan, 2005 20 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 6926e703
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      6926e703
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 299d28e2
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      299d28e2
    • unknown's avatar
      3410ce09
    • unknown's avatar
      Merge · fcb2a0ab
      unknown authored
      
      ndb/include/ndb_types.h:
        SCCS merged
      fcb2a0ab
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 114b3154
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      114b3154
    • unknown's avatar
      merge error · 3cd62d82
      unknown authored
      3cd62d82
    • unknown's avatar
      merge 5.0->5.0-ndb · 5c93c3e1
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      ndb/test/tools/Makefile.am:
        Auto merged
      5c93c3e1
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b89482ab
      unknown authored
      into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
      
      
      b89482ab
    • unknown's avatar
      sync0sync.h, sync0rw.h: · d474247d
      unknown authored
        Fix Bug#7624
      
      
      innobase/include/sync0rw.h:
        Fix Bug#7624
      innobase/include/sync0sync.h:
        Fix Bug#7624
      d474247d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 613201b8
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      613201b8
    • unknown's avatar
      fixed reporting error · 386f1f35
      unknown authored
      386f1f35
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 57deb768
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      57deb768
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · a14a2258
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndb_global.h.in:
        Auto merged
      ndb/include/ndb_types.h:
        Auto merged
      a14a2258
    • unknown's avatar
      updated ndbapi examples · cca9cd0b
      unknown authored
      cca9cd0b
    • unknown's avatar
      bug#7626 - post review version · 9ecd9ac6
      unknown authored
      
      ndb/include/ndb_global.h.in:
        move types into ndb_global.h.in
        Check sizeof of Uint8, Uint32 & Uint64
      ndb/include/ndb_types.h:
        move types into ndb_global.h.in
      9ecd9ac6
    • unknown's avatar
      Better handling of ensuring that setup_tables() are not called twice · 2bcaed34
      unknown authored
      This fixed a bug in prepared statements when used with outher joins
      Fixed a bug in SUM(DISTINCT) when used with prepared statements.
      Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
      
      
      mysql-test/r/mysqldump.result:
        Safety fix if a previous test would fail
      mysql-test/r/show_check.result:
        Safety fix if a previous test would fail
      mysql-test/r/sp.result:
        Fix for --ps-protocol
      mysql-test/r/synchronization.result:
        Safety fix if a previous test would fail
      mysql-test/r/system_mysql_db.result:
        Safety fix if a previous test would fail
      mysql-test/t/mysqldump.test:
        Safety fix if a previous test would fail
      mysql-test/t/select.test:
        Safety fix if a previous test would fail
      mysql-test/t/show_check.test:
        Safety fix if a previous test would fail
      mysql-test/t/sp.test:
        fix for --ps-protocol
      mysql-test/t/strict.test:
        Fix for --ps-protocol
      mysql-test/t/synchronization.test:
        Safety fix if a previous test would fail
      mysql-test/t/system_mysql_db.test:
        Safety fix if a previous test would fail
      sql/item_sum.cc:
        Fix bug in SUM(DISTINCT...) when using with prepared statements
      sql/item_sum.h:
        Fix bug in SUM(DISTINCT...) when using with prepared statements
      sql/mysql_priv.h:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_base.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_insert.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_parse.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_prepare.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_select.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_union.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_update.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/table.h:
        Better handling of ensuring that setup_tables() are not called twice
      2bcaed34
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · e23ba8ea
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndb_types.h:
        Auto merged
      e23ba8ea
    • unknown's avatar
      bug#7626 - ndb UintPtr handling · e197fa45
      unknown authored
      
      ndb/include/ndb_types.h:
        redo UintPtr handling
      e197fa45
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 423241da
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      423241da
    • unknown's avatar
      bug#7626 - ndb - non portable uint_ptr · 3c1b5f54
      unknown authored
      
      ndb/include/ndb_types.h:
        redo UintPtr handling using SIZEOF_CHARP
      ndb/test/tools/Makefile.am:
        remove unused defines
      3c1b5f54