1. 25 Apr, 2006 24 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 77869308
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      77869308
    • unknown's avatar
      Post-merge fixes from 5.0. · 1e869b0e
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Post-merge fix. Added new 5.0 test case manually.
      sql/sql_yacc.yy:
        Post-merge fix. Removed GOTO/LABEL from parser.
      1e869b0e
    • unknown's avatar
      cb495066
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · b4999513
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/sql_yacc.yy:
        Auto merged
      b4999513
    • unknown's avatar
      ndb - · b784da04
      unknown authored
        Fix bootstrap/compile error
      
      
      storage/ndb/tools/restore/restore_main.cpp:
        Fix bootstrap/compile error
      b784da04
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 07326694
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      07326694
    • unknown's avatar
      ndb_restore: more compatablitity checks · 5ea56852
      unknown authored
      5ea56852
    • unknown's avatar
      Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge · 225330cd
      unknown authored
      into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
      
      
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/timezone_grant.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      mysql-test/r/rpl_insert_id.result:
        Manual merge.
      mysql-test/t/disabled.def:
        Manual merge.
      mysql-test/t/rpl_insert_id.test:
        Manual merge.
      sql/item_func.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge - not complete yet.
      225330cd
    • unknown's avatar
      Merge jonas@perch:src/51-work/ · ae26e002
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ae26e002
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · e8c9d968
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      e8c9d968
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 27ace481
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      27ace481
    • unknown's avatar
      ndb - bug#18597 · abc0d700
      unknown authored
        Handle early abort of scan, so that resources are correctly freed
      
      
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Handle early abort
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Handle early abort so that require on running.empty() does not fire
      abc0d700
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ea564a72
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      ea564a72
    • unknown's avatar
      modified ndb backup/restore to be byte order independant · c662fccd
      unknown authored
      - the replica info was not stored in byte order indepentent format
      - backup/restore still compatible 5.0->5.1
      - but patch makes previous 5.1 versions completely incompatible
      
      
      c662fccd
    • unknown's avatar
      ndb - · de513b18
      unknown authored
      1) relax version check for restore block since no changes has happend since 5.1.6
         and improve error message on check failure
         
      2) improve lcp/backup max write size...
      
      
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Increase max write size to 256k (currently not configurable...)
      storage/ndb/src/kernel/blocks/restore.cpp:
        Relax version check for restore block since no changes has happend since 5.1.6
      storage/ndb/src/kernel/blocks/restore.hpp:
        Relax version check for restore block since no changes has happend since 5.1.6
      de513b18
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · d61758db
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      d61758db
    • unknown's avatar
      Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 · c2911678
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      c2911678
    • unknown's avatar
      Fixed memleak detected by valgrind · e42428d5
      unknown authored
      e42428d5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f0d5afd6
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      f0d5afd6
    • unknown's avatar
      Manually merged · 08f93037
      unknown authored
      
      client/mysql.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
        Auto merged
      mysql-test/t/rpl_stm_until.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/unireg.h:
        Auto merged
      storage/ndb/src/kernel/SimBlockList.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
        Auto merged
      08f93037
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 848932cf
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
      
      
      848932cf
    • unknown's avatar
      Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new · a2b3fa5e
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
      
      
      a2b3fa5e
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c9841352
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      c9841352
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 135adc63
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      135adc63
  2. 24 Apr, 2006 16 commits