1. 19 Nov, 2004 25 commits
  2. 18 Nov, 2004 15 commits
    • unknown's avatar
      log_event.cc: · 11411969
      unknown authored
        post-conflict-merge fix (duplicate comment)
      
      
      sql/log_event.cc:
        post-conflict-merge fix (duplicate comment)
      11411969
    • unknown's avatar
    • unknown's avatar
      Merge · 383bbc95
      unknown authored
      
      sql/log_event.cc:
        SCCS merged
      383bbc95
    • unknown's avatar
      When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some... · e6674272
      unknown authored
      When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
      much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
      command, so it is quite innocuous.
      
      
      e6674272
    • unknown's avatar
      Merge · 60e1b917
      unknown authored
      
      sql/ha_ndbcluster.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      60e1b917
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9856980b
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      9856980b
    • unknown's avatar
      change file name to avoid conflict · c35400bc
      unknown authored
          corrected mistake in previous patch
      
      
      ndb/tools/Makefile.am:
        change file name to avoid conflict
      ndb/tools/restore/restore_main.cpp:
        corrected mistake in previous patch
      c35400bc
    • unknown's avatar
      bug#6677 bug#6684 · edcf9e66
      unknown authored
      edcf9e66
    • unknown's avatar
    • unknown's avatar
      fil0fil.h, fil0fil.c: · 645570aa
      unknown authored
        Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
      
      
      innobase/fil/fil0fil.c:
        Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
      innobase/include/fil0fil.h:
        Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
      645570aa
    • unknown's avatar
      fix for mysqladmin link problem · 00886f71
      unknown authored
           .c -> .cc
          fix source dist problem for ndb
          fix type check problem for mysqladmin
      
      
      
      client/Makefile.am:
        fix for mysqladmin link problem
         .c -> .cc
      client/mysqladmin.cc:
        fix for mysqladmin link problem
         .c -> .cc
      configure.in:
        fix for mysqladmin link problem
         .c -> .cc
      ndb/include/Makefile.am:
        fix source dist problem for ndb
      ndb/src/mgmclient/CommandInterpreter.cpp:
        fix type check problem
      ndb/src/mgmclient/ndb_mgmclient.hpp:
        fix type check problem
      ndb/src/mgmclient/ndb_mgmclient.h:
        fix type check problem
      00886f71
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · e1ac2e62
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
      
      e1ac2e62
    • unknown's avatar
      ndb: new arbitrator behaviour for >=3-way: < 1/2 nodes can survive · 4c8b1857
      unknown authored
      
      ndb/include/kernel/signaldata/ArbitSignalData.hpp:
        new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
      ndb/src/common/debugger/EventLogger.cpp:
        new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
      4c8b1857
    • unknown's avatar
      row0ins.c: · 9df54b9a
      unknown authored
        row_ins_scan_sec_index_for_duplicate(),
        row_ins_duplicate_error_in_clust():
        remove unused variables "ptr"
      
      
      innobase/row/row0ins.c:
        row_ins_scan_sec_index_for_duplicate(),
        row_ins_duplicate_error_in_clust():
        remove unused variables "ptr"
      9df54b9a
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 080ec6a0
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      080ec6a0