1. 11 Nov, 2004 1 commit
  2. 10 Nov, 2004 14 commits
    • unknown's avatar
      Merge · f06a4e23
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/handler.h:
        SCCS merged
      f06a4e23
    • unknown's avatar
      WL#1596 "make mysqldump --master-data --single-transaction able to do online... · fbc56a51
      unknown authored
      WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable
      binlog coordinates corresponding to the dump".
      The good news is that now mysqldump can be used to get an online backup of InnoDB *which works for
      point-in-time recovery and replication slave creation*. Formerly, mysqldump --master-data --single-transaction
      used to call in fact mysqldump --master-data, so the dump was not an online dump (took big lock all time of dump).
      The only lock which is now taken in this patch is at the beginning of the dump: mysqldump does:
      FLUSH TABLES WITH READ LOCK; START TRANSACTION WITH CONSISTENT SNAPSHOT; SHOW MASTER STATUS; UNLOCK TABLES;
      so the lock time is in fact the time FLUSH TABLES WITH READ LOCK takes to return (can be 0 or very long, if
      a table is undergoing a huge update).
      I have done some more minor changes listed in the paragraph of mysqldump.c.
      WL#2237 "WITH CONSISTENT SNAPSHOT clause for START TRANSACTION":
      it's a START TRANSACTION which additionally starts a consistent read on all
      capable storage engine (i.e. InnoDB). So, can serve as a replacement for
      BEGIN; SELECT * FROM some_innodb_table LIMIT 1; which starts a consistent read too. 
      
      
      client/mysqldump.c:
        Main change: mysqldump --single-transaction --master-data is now able to, at the same time,
        take an online dump of InnoDB (using consistent read) AND get the binlog position corresponding to this dump
        (before, using the two options used to silently cancel --single-transaction).
        This uses the new START TRANSACTION WITH CONSISTENT SNAPSHOT syntax.
        Additional changes: 
        a) cleanup:
         - DBerror calls exit() so some code was unneeded
         - no need to call COMMIT at end, leave disconnection do the job
         - mysql_query_with_error_report()
        b) requirements I had heard from colleagues:
         - --master-data now requires an argument, to comment out ("--") the CHANGE MASTER or not
           (commenting had been asked for point-in-time recovery when replication is not necessary).
         - --first-slave is renamed to --lock-all-tables
        c) more sensible behaviours (has been discussed internally):
         - if used with --master-data, --flush-logs is probably intended to get a flush synchronous
           with the dump, not one random flush per dumped db.
         - disabled automatic reconnection as, at least, SQL_MODE would be lost (and also, depending
           on options, LOCK TABLES, BEGIN, FLUSH TABLES WITH READ LOCK).
      include/mysqld_error.h:
        an error if START TRANSACTION WITH CONSISTENT SNAPSHOT is called and there is no consistent-read capable storage engine
        (idea ((C) PeterG) is that it's a bit like CREATE TABLE ENGINE=InnoDB when there is no support for InnoDB).
      sql/handler.cc:
        new ha_start_consistent_snapshot(), which, inside an existing transaction, starts a consistent read
        (offers an alternative to SELECTing any InnoDB table). Does something only for InnoDB.
        Warning if no suitable engine supported.
      sql/handler.h:
        declarations
      sql/lex.h:
        symbols for lex
      sql/share/czech/errmsg.txt:
        new message
      sql/share/danish/errmsg.txt:
        new message
      sql/share/dutch/errmsg.txt:
        new message
      sql/share/english/errmsg.txt:
        new message
      sql/share/estonian/errmsg.txt:
        new message
      sql/share/french/errmsg.txt:
        new message
      sql/share/german/errmsg.txt:
        new message
      sql/share/greek/errmsg.txt:
        new message
      sql/share/hungarian/errmsg.txt:
        new message
      sql/share/italian/errmsg.txt:
        new message
      sql/share/japanese/errmsg.txt:
        new message
      sql/share/korean/errmsg.txt:
        new message
      sql/share/norwegian-ny/errmsg.txt:
        new message
      sql/share/norwegian/errmsg.txt:
        new message
      sql/share/polish/errmsg.txt:
        new message
      sql/share/portuguese/errmsg.txt:
        new message
      sql/share/romanian/errmsg.txt:
        new message
      sql/share/russian/errmsg.txt:
        new message
      sql/share/serbian/errmsg.txt:
        new message
      sql/share/slovak/errmsg.txt:
        new message
      sql/share/spanish/errmsg.txt:
        new message
      sql/share/swedish/errmsg.txt:
        new message
      sql/share/ukrainian/errmsg.txt:
        new message
      sql/sql_lex.h:
        new option in lex (transaction options)
      sql/sql_parse.cc:
        warning comment (never make UNLOCK TABLES commit a transaction, please);
        support for starting consistent snapshot.
      sql/sql_yacc.yy:
        new clause WITH CONSISTENT SNAPSHOT (syntax ok'd by PeterG) for START TRANSACTION.
      fbc56a51
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4f110c51
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6031
      
      4f110c51
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 120448c3
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      120448c3
    • unknown's avatar
      added configure switch for ndb port number · 24798bc7
      unknown authored
          added new variable for ndb port 1186
          changed meaning of ndb_port_base to be default tcp port setting
          changed to use split between port and port_base for ndbcluster
          so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
          added larger space to pid print
          moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
          added c-api to Ndb_mgmclient
          pass also ndb_port to make
      
      
      acinclude.m4:
        added configure switch for ndb port number
      configure.in:
        added new variable for ndb port 1186
        changed meaning of ndb_port_base to be default tcp port setting
      mysql-test/mysql-test-run.sh:
        changed to use split between port and port_base for ndbcluster
      mysql-test/ndb/Makefile.am:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      mysql-test/ndb/ndbcluster.sh:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      ndb/src/common/mgmcommon/LocalConfig.cpp:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      ndb/src/common/mgmcommon/Makefile.am:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      ndb/src/common/mgmcommon/NdbConfig.c:
        added larger space to pid print
      ndb/src/mgmclient/CommandInterpreter.cpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
        added c-api to Ndb_mgmclient
      ndb/src/mgmclient/main.cpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
      ndb/src/mgmclient/ndb_mgmclient.hpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
      ndb/src/mgmsrv/ConfigInfo.cpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
      ndb/src/mgmsrv/Makefile.am:
        pass also ndb_port to make
      24798bc7
    • unknown's avatar
      Bug#6031 - To drop database you have to execute DROP DATABASE command twice. · c52a4685
      unknown authored
        DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
        General solution - construct a TYPELIB at runtime instead of a static list.
      
      
      mysql-test/r/ndb_basic.result:
        Bug#6031
          New test for bug
      mysql-test/t/ndb_basic.test:
        Bug#6031
          New test for bug
      sql/ha_ndbcluster.cc:
        Cosmetic fix
      sql/handler.cc:
        Bug#6031
          New function - ha_known_exts()
          We can construct TYPELIB of known db file extensions.
      sql/handler.h:
        Bug#6031
          New function - ha_known_exts()
      sql/sql_db.cc:
        Bug#6031
          We use a constructed list of known extensions instead of a static list
      c52a4685
    • unknown's avatar
      Adding new function prototype · 0ffae6f6
      unknown authored
      0ffae6f6
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · d4765cdd
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      d4765cdd
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49c484c9
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      49c484c9
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · 68ed51a6
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
      
      68ed51a6
    • unknown's avatar
      1. When mixing NULL to a character string, · ad63974d
      unknown authored
      the result takes its charset/collation
      attributes from the character string,
      e.g.  SELECT func(NULL, _latin2'string')
      now returns a latin2 result. This is
      done by introducing a new derivation
      (aka coercibility) level DERIVATION_IGNORABLE,
      which is used with Item_null.
      2. 'Pure' NULL is now BINARY(0), not CHAR(0).
      I.e. NULL is now more typeless.
      
      
      mysql-test/r/metadata.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/null.result:
        Testing mixing NULL with a character string with a number of functions.
      mysql-test/r/ps_2myisam.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_3innodb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_4heap.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_5merge.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_6bdb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_7ndb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/t/null.test:
        Testing mixing NULL with a character string with a number of functions.
      sql/item.cc:
        New derivation level.
      sql/item.h:
        New derivation level.
      ad63974d
    • unknown's avatar
      replaced init_db.sql · d254fe6f
      unknown authored
      
      mysql-test/init_db.sql:
        replaced old init_db.sql on new one
      d254fe6f
    • unknown's avatar
      bug#6538 · e4b27d97
      unknown authored
      ndb: Fix return value in index_last wo/ rows
      
      
      sql/ha_ndbcluster.cc:
        Return correct when not finding any row from index_last
      e4b27d97
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 00d0c457
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      00d0c457
  3. 09 Nov, 2004 9 commits
  4. 08 Nov, 2004 16 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4d514c01
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      4d514c01
    • unknown's avatar
      As rollback can be 30 times slower than insert in InnoDB, and user may · ae124520
      unknown authored
      not know there's rollback (if it's because of a dupl row), better warn
      that it's happening. It can also be of use for a DBA killing a
      connection and wondering what this connection is still doing now. Example:
      |  5 | root | localhost | test | Killed  | 10   | Rolling back | insert into i select * from j |
      
      
      sql/handler.cc:
        As rollback can be 30 times slower than insert in InnoDB, and user may
        not know there's rollback (if it's because of a dupl row), better warn.
      ae124520
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d3feb035
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      d3feb035
    • unknown's avatar
      added ndb test platform test · 80cc397a
      unknown authored
      80cc397a
    • unknown's avatar
      compile fix for ndbapi test program on irix (variable scope) · 83399365
      unknown authored
      
      ndb/test/include/NDBT_Test.hpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/ScanFunctions.hpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testDataBuffers.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testDeadlock.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testDict.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testIndex.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testLcp.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testNdbApi.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testOIBasic.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testReadPerf.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testRestartGci.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testScanPerf.cpp:
        compile fix for ndbapi test program on irix
      ndb/test/ndbapi/testSystemRestart.cpp:
        compile fix for ndbapi test program on irix
      83399365
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · ed51422f
      unknown authored
      into mysql.com:/home/bk/b6239-4.1-v2-pending
      
      ed51422f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4348c7c4
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      4348c7c4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 44bb12c3
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      44bb12c3
    • unknown's avatar
      Makefile.am: · fa6b95f4
      unknown authored
        fix to make make -jN work
      
      
      ndb/src/mgmclient/Makefile.am:
        fix to make make -jN work
      fa6b95f4
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 430918c2
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      430918c2
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7992b583
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      7992b583
    • unknown's avatar
      Makefile.am: · 7e06793e
      unknown authored
        added so that it is possible to make mysql_test_run_new
        but not done for target all do:
         make mysql_test_run_new
      
      
      mysql-test/Makefile.am:
        added so that it is possible to make mysql_test_run_new
        but not done for target all do:
         make mysql_test_run_new
      7e06793e
    • unknown's avatar
      Makefile.am: · 5540f0e7
      unknown authored
        remove mysql_test_run_new for now, it breaks the make
      
      
      mysql-test/Makefile.am:
        remove mysql_test_run_new for now, it breaks the make
      5540f0e7
    • unknown's avatar
      Makefile.am: · b98b2cc9
      unknown authored
        changed make order
      .del-Makefile_old~dde91b00b37d2a06:
        Delete: ndb/tools/Makefile_old
      .del-Makefile_old~70d769657921a760:
        Delete: ndb/test/tools/Makefile_old
      .del-Makefile_old~58f0559822147dd9:
        Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
      .del-Makefile_old~4fdb3c92ebd2eb29:
        Delete: ndb/test/run-test/Makefile_old
      .del-Makefile_old~1497f81a0c2125e:
        Delete: ndb/test/src/Makefile_old
      .del-Makefile_old~fbd3934fabdfe550:
        Delete: ndb/test/ndbapi/Makefile_old
      .del-Makefile_old~ec8e48326d4aa09:
        Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
      .del-Makefile_old~1046c9ce93ef1fb8:
        Delete: ndb/test/ndbapi/bank/Makefile_old
      .del-Makefile_old~7c98d8f1d275983f:
        Delete: ndb/src/ndbapi/Makefile_old
      .del-Makefile_old~4463cf06fc2fceb9:
        Delete: ndb/src/mgmapi/Makefile_old
      .del-Makefile_old~274925c960801993:
        Delete: ndb/src/mgmsrv/Makefile_old
      .del-Makefile_old~b3d33fdde8bc12c0:
        Delete: ndb/src/kernel/Makefile_old
      .del-Makefile_old~6dbe2defc7237d4d:
        Delete: ndb/src/kernel/vm/Makefile_old
      .del-Makefile_old~cf05571c99011360:
        Delete: ndb/src/kernel/error/Makefile_old
      .del-Makefile_old~29a955a7e17d650e:
        Delete: ndb/src/kernel/blocks/Makefile_old
      .del-Makefile_old~f8b2a47eb434d43:
        Delete: ndb/src/kernel/blocks/suma/Makefile_old
      .del-Makefile_old~f0c05bb23d5c23ca:
        Delete: ndb/src/kernel/blocks/grep/Makefile_old
      .del-Makefile_old~a6fd2e579249f6e0:
        Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
      .del-Makefile_old~7e8d8b4e2b1fa8f7:
        Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
      .del-Makefile_old~73c174fc712803c5:
        Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
      .del-Makefile_old~16de31311951fc04:
        Delete: ndb/src/kernel/blocks/trix/Makefile_old
      .del-Makefile_old~788c80e5e758ac7:
        Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
      .del-Makefile_old~5ebf2b4f85ab09cf:
        Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
      .del-Makefile_old~530f9e0bc038a62:
        Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
      .del-Makefile_old~315b927180484020:
        Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
      .del-Makefile_old~d013a228cad86ba0:
        Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
      .del-Makefile_old~c2e33f043b8aa45e:
        Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
      .del-Makefile_old~bdf406f5fb4696cb:
        Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
      .del-Makefile_old~38a24016d2ad8aa7:
        Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
      .del-Makefile_old~2804044250a6fd91:
        Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
      .del-Makefile_old~e58eec87cd8dc79e:
        Delete: ndb/src/cw/Makefile_old
      .del-Makefile_old~b50c85b8eb69aacb:
        Delete: ndb/src/kernel/blocks/backup/Makefile_old
      .del-Makefile_old~16e186623106985e:
        Delete: ndb/src/cw/cpcd/Makefile_old
      .del-Makefile_old~f03f74238d640d5:
        Delete: ndb/src/common/mgmcommon/Makefile_old
      .del-Makefile_old~a8e9765b520b7c68:
        Delete: ndb/src/common/util/Makefile_old
      .del-Makefile_old~9f275aed83c8652b:
        Delete: ndb/src/common/transporter/Makefile_old
      .del-Makefile_old~8d901a664eca1ec:
        Delete: ndb/src/common/portlib/Makefile_old
      .del-Makefile_old~19643559613c75c7:
        Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
      .del-Makefile_old~a3f6fc0e1411bb28:
        Delete: ndb/src/common/logger/Makefile_old
      .del-Makefile_old~754f27fab7d4da3b:
        Delete: ndb/src/common/debugger/signaldata/Makefile_old
      .del-Makefile_old~54ca8df95719e59f:
        Delete: ndb/src/common/debugger/Makefile_old
      
      
      BitKeeper/deleted/.del-Makefile_old~54ca8df95719e59f:
        Delete: ndb/src/common/debugger/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~754f27fab7d4da3b:
        Delete: ndb/src/common/debugger/signaldata/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~a3f6fc0e1411bb28:
        Delete: ndb/src/common/logger/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~19643559613c75c7:
        Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~8d901a664eca1ec:
        Delete: ndb/src/common/portlib/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~9f275aed83c8652b:
        Delete: ndb/src/common/transporter/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~a8e9765b520b7c68:
        Delete: ndb/src/common/util/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~f03f74238d640d5:
        Delete: ndb/src/common/mgmcommon/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~16e186623106985e:
        Delete: ndb/src/cw/cpcd/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~b50c85b8eb69aacb:
        Delete: ndb/src/kernel/blocks/backup/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~e58eec87cd8dc79e:
        Delete: ndb/src/cw/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~2804044250a6fd91:
        Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~38a24016d2ad8aa7:
        Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~bdf406f5fb4696cb:
        Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~c2e33f043b8aa45e:
        Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~d013a228cad86ba0:
        Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~315b927180484020:
        Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~530f9e0bc038a62:
        Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~5ebf2b4f85ab09cf:
        Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~788c80e5e758ac7:
        Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~16de31311951fc04:
        Delete: ndb/src/kernel/blocks/trix/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~73c174fc712803c5:
        Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~7e8d8b4e2b1fa8f7:
        Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~a6fd2e579249f6e0:
        Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~f0c05bb23d5c23ca:
        Delete: ndb/src/kernel/blocks/grep/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~f8b2a47eb434d43:
        Delete: ndb/src/kernel/blocks/suma/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~29a955a7e17d650e:
        Delete: ndb/src/kernel/blocks/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~cf05571c99011360:
        Delete: ndb/src/kernel/error/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~6dbe2defc7237d4d:
        Delete: ndb/src/kernel/vm/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~b3d33fdde8bc12c0:
        Delete: ndb/src/kernel/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~274925c960801993:
        Delete: ndb/src/mgmsrv/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~4463cf06fc2fceb9:
        Delete: ndb/src/mgmapi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~7c98d8f1d275983f:
        Delete: ndb/src/ndbapi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~1046c9ce93ef1fb8:
        Delete: ndb/test/ndbapi/bank/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~ec8e48326d4aa09:
        Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~fbd3934fabdfe550:
        Delete: ndb/test/ndbapi/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~1497f81a0c2125e:
        Delete: ndb/test/src/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~4fdb3c92ebd2eb29:
        Delete: ndb/test/run-test/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~58f0559822147dd9:
        Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~70d769657921a760:
        Delete: ndb/test/tools/Makefile_old
      BitKeeper/deleted/.del-Makefile_old~dde91b00b37d2a06:
        Delete: ndb/tools/Makefile_old
      ndb/src/mgmclient/Makefile.am:
        changed make order
      b98b2cc9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 489e6a81
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      489e6a81
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/new-fix · 564fbe2d
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/ndbapi/NdbOperationExec.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      564fbe2d