1. 02 Sep, 2005 27 commits
    • unknown's avatar
      row0sel.c: · 79cf2a65
      unknown authored
        Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5
      
      
      innobase/row/row0sel.c:
        Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5
      79cf2a65
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 0616ea91
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/t/variables.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/r/variables.result:
        Resolve conflict
      scripts/mysqld_multi.sh:
        Resolve conflict
      0616ea91
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11280 · 76da91b5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      76da91b5
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · eef7dff3
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      eef7dff3
    • unknown's avatar
      Rename: · 8857d641
      unknown authored
      - current_arena to stmt_arena: the thread may have more than one
      'current' arenas: one for runtime data, and one for the parsed 
      tree of a statement. Only one of them is active at any moment.
      - set_item_arena -> set_query_arena, because Item_arena was renamed to 
      Query_arena a while ago
      - set_n_backup_item_arena -> set_n_backup_active_arena;
      the active arena is the arena thd->mem_root and thd->free_list
      are currently pointing at.
      - restore_backup_item_arena -> restore_active_arena (with the same
      rationale)
      - change_arena_if_needed -> activate_stmt_arena_if_needed; this
      method sets thd->stmt_arena active if it's not done yet.
      
      
      sql/item.cc:
        Rename.
      sql/item_cmpfunc.cc:
        Rename.
      sql/item_func.cc:
        Rename.
      sql/item_subselect.cc:
        Rename.
      sql/item_subselect.h:
        Remove an unused forward declaration.
      sql/item_sum.h:
        Remove an unused forward declaration.
      sql/mysql_priv.h:
        Remove an unused forward declaration.
      sql/sp.cc:
        Rename.
      sql/sp_head.cc:
        Rename.
      sql/sql_base.cc:
        Rename.
      sql/sql_class.cc:
        Rename.
      sql/sql_class.h:
        Rename.
      sql/sql_lex.cc:
        Rename.
      sql/sql_parse.cc:
        Rename.
      sql/sql_prepare.cc:
        Rename.
      sql/sql_select.cc:
        Rename.
      sql/sql_show.cc:
        Rename.
      sql/sql_union.cc:
        Rename.
      sql/sql_view.cc:
        Rename.
      sql/table.cc:
        Rename.
      8857d641
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8027ca8f
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      8027ca8f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · ba5d5bbf
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-5.0-push
      
      ba5d5bbf
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0923d5bd
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-5.0-push
      
      0923d5bd
    • unknown's avatar
      Removed redundant case in Makefile.am · 331f75d1
      unknown authored
      
      
      Makefile.am:
        Removed redundant case
      331f75d1
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-5.0 · 2c353660
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-5.0-push
      
      2c353660
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · e5733f2a
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-5.0
      
      
      ndb/include/kernel/signaldata/SignalData.hpp:
        Auto merged
      ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        merge
      e5733f2a
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 726c996c
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0
      
      726c996c
    • unknown's avatar
      ndb - fix printout related to bug#10987 · dfa2174a
      unknown authored
      
      ndb/src/common/debugger/EventLogger.cpp:
        Fix extended printout of LCP_FRAGMENT_COMPLETED
      dfa2174a
    • unknown's avatar
      ndb - bug#12608 · a4337300
      unknown authored
        Always abort if node failure occured between startTransaction and commit
        (can later be improved by wl#2610)
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Always abort if node failure occured between startTransaction and commit
      a4337300
    • unknown's avatar
      ndb - bug #10987 · d67ce2a9
      unknown authored
        make sure not to cut log to early 
        (specificly not use LCP with maxGciStarted that has not yet completed)
      
      
      ndb/include/kernel/signaldata/SignalData.hpp:
        Add signal data printer for START_FRAG_REQ
      ndb/include/kernel/signaldata/StartFragReq.hpp:
        Add signal data printer for START_FRAG_REQ
      ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
        Add signal data printer for START_FRAG_REQ
      ndb/src/common/debugger/signaldata/StartRec.cpp:
        Add signal data printer for START_FRAG_REQ
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Add maxGciStarted/Completed to event report
        bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed
      d67ce2a9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 71330b53
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      71330b53
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · dc243124
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      dc243124
    • unknown's avatar
      mysqltest.test: Remove output from shells in result file · 1da95439
      unknown authored
      
      mysql-test/r/mysqltest.result:
        Update test results
      mysql-test/t/mysqltest.test:
        Send output from failed command to /dev/null in order to avoid recording the output from different shells
      1da95439
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/mysql-4.1 · 78a67d55
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0
      
      
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      Makefile.am:
        Manual merge
      mysql-test/r/rpl_replicate_do.result:
        Manual merge
      sql/log_event.cc:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      78a67d55
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1f89b880
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12363
      
      1f89b880
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 5d8dd66d
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
      
      5d8dd66d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · c594b614
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      c594b614
    • unknown's avatar
      postmerge changes · 5985c127
      unknown authored
      
      mysql-test/t/lowercase_view.test:
        error code changed after merege
      mysql-test/t/view.test:
        error code changed after merege
      sql/item.cc:
        inline function used instead of frequently used expression
        removed old TODO
      sql/sql_base.cc:
        layoutfixed
        inline function used instead of frequently used expression
      sql/sql_insert.cc:
        inline function used instead of frequently used expression
      5985c127
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · f1f3cedd
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/t/rpl_slave_status.test:
        Merge to 5.0
      f1f3cedd
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · abad8cfc
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12363
      
      
      mysql-test/t/variables.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/r/variables.result:
        SCCS merged
      abad8cfc
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 644d9142
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      644d9142
    • unknown's avatar
      sp_head.cc: · d8574776
      unknown authored
        Fix crash reported in bug 12849.
        It doesn't fix the whole problem though.
        Let Pem fix it later.
      
      
      sql/sp_head.cc:
        Fix crash reported in bug 12849.
        It doesn't fix the whole problem though.
        Let Pem fix it later.
      d8574776
  2. 01 Sep, 2005 13 commits