1. 29 Jun, 2006 2 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · b25c34a6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      b25c34a6
    • unknown's avatar
      ndb - autotest · 6efd848c
      unknown authored
        Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
      
      
      ndb/test/ndbapi/testNodeRestart.cpp:
        Fix testNodeRestart -n DuringLCP and others
      6efd848c
  2. 28 Jun, 2006 1 commit
    • unknown's avatar
      ndb - bug#20442 · d7534c3a
      unknown authored
        force close of scan (of outstanding scan_frag)
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Force close of scan in when not doing committed read scan
      d7534c3a
  3. 27 Jun, 2006 1 commit
    • unknown's avatar
      ndb - bug#20252 · f1056028
      unknown authored
        allow user to specify scan batch size in readTuples
      
      
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Allow user to specify batch size
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Allow user to specify batch size
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Fix so that last row works even if batch is complete
      ndb/src/ndbapi/NdbReceiver.cpp:
        Allow user yo specify batch size
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Allow user to specify batchsize
      f1056028
  4. 26 Jun, 2006 2 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 841a5b7a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/vm/SafeCounter.hpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      841a5b7a
    • unknown's avatar
      ndb - bug#20683 · 7072a63a
      unknown authored
        part 1 - make sure return code is propagated from request tracker
      
      
      ndb/src/kernel/vm/RequestTracker.hpp:
        propagate return value
      ndb/src/kernel/vm/SafeCounter.hpp:
        make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert
      7072a63a
  5. 22 Jun, 2006 1 commit
    • unknown's avatar
      ndb - bug#19164 · 505c2b3d
      unknown authored
        set max value on ports
      
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        set max vlue on ports
      505c2b3d
  6. 21 Jun, 2006 2 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · de79a31c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      de79a31c
    • unknown's avatar
      ndb - bug#20197 · e7e9cc25
      unknown authored
        also close scan which are in "delivered" state, as it's impossible to release locks afterwards
      
        backport from 5.1
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        ndb - bug#20197
          also close scan which are in "delivered" state, as it's impossible to release locks afterwards
      e7e9cc25
  7. 01 Jun, 2006 2 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · dd47289b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      dd47289b
    • unknown's avatar
      ndb - bug#20185 · 49a4c85b
      unknown authored
        Dont be too aggressive in Dbtc::nodeFailCheckTransaction
        let it timeout by 1, so that it does not assert that it has waited too long
        old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        error codes
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        2 new error inserts
        7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
        7031 - delay in GCP_PREPARE and die
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
      ndb/test/ndbapi/testNodeRestart.cpp:
        testcase
      ndb/test/run-test/daily-basic-tests.txt:
        autotest
      49a4c85b
  8. 19 May, 2006 1 commit
    • unknown's avatar
      ndb - bug#19930 · aa26f5cb
      unknown authored
        Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
      
      
      ndb/include/util/SocketServer.hpp:
        Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
      ndb/src/common/util/SocketServer.cpp:
        Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
      ndb/src/mgmsrv/Services.cpp:
        Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
      aa26f5cb
  9. 08 May, 2006 1 commit
  10. 07 May, 2006 10 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 47302570
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0
      
      
      mysql-test/r/rpl_user_variables.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/t/rpl_user_variables.test:
        Manual merge
      47302570
    • unknown's avatar
      Post-merge fixes. · 5aa69d34
      unknown authored
      5aa69d34
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 · 30a7094f
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      mysql-test/r/having.result:
        Auto merged
      mysql-test/t/having.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      mysql-test/r/rpl_user_variables.result:
        Manual merge
      mysql-test/t/rpl_user_variables.test:
        Manual merge
      sql/sql_lex.cc:
        Manual merge
      sql/sql_prepare.cc:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      30a7094f
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4e67d58
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-4.1
      
      
      e4e67d58
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c438e490
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136
      
      
      sql/sql_select.cc:
        Auto merged
      c438e490
    • unknown's avatar
      Bug#19136: Crashing log-bin and uninitialized user variables in a derived table · a910a0bf
      unknown authored
      recalculating results
      
      
      mysql-test/r/rpl_user_variables.result:
        fixing results
      a910a0bf
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1 · 048469eb
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/rpl_user_variables.result:
        manual merge use local
      mysql-test/t/rpl_user_variables.test:
        manual merge use version 5.0's "show binlog events from 98"
      048469eb
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 · ce6a2d32
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug19136_unass_user_var
      
      
      sql/item_func.cc:
        Auto merged
      ce6a2d32
    • unknown's avatar
      Fixed bug #14927. · 375749b8
      unknown authored
      A query with a group by and having clauses could return a wrong
      result set if the having condition contained a constant conjunct 
      evaluated to FALSE.
      It happened because the pushdown condition for table with
      grouping columns lost its constant conjuncts.
      Pushdown conditions are always built by the function make_cond_for_table
      that ignores constant conjuncts. This is apparently not correct when
      constant false conjuncts are present.
      
      
      
      mysql-test/r/having.result:
        Added a test case for bug #14927.
      mysql-test/t/having.test:
        Added a test case for bug #14927.
      sql/sql_lex.cc:
        Fixed bug #14927.
        Initialized fields for having conditions in  st_select_lex::init_query().
      sql/sql_lex.h:
        Fixed bug #14927.
        Added a field to restore having condititions for execution in SP and PS.
      sql/sql_prepare.cc:
        Fixed bug #14927.
        Added code to restore havinf conditions for execution in SP and PS.
      sql/sql_select.cc:
        Fixed bug #14927.
        Performed evaluation of constant expressions in having clauses.
        If the having condition contains a constant conjunct that is always false
        an empty result set is returned after the optimization phase.
        In this case the corresponding EXPLAIN command now returns 
        "Impossible HAVING" in the last column.
      375749b8
  11. 06 May, 2006 14 commits
  12. 05 May, 2006 3 commits