1. 19 Aug, 2005 16 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 141a36c3
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      141a36c3
    • unknown's avatar
      Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash" · 933db613
      unknown authored
      Recommited with post-review fixes
      
      
      server-tools/instance-manager/instance.cc:
        fix behaviour of monitoring routines: they should not  rely on the fact that instance object
        which was used when the instances started exists at stop(). Instead routines should save the
        name of the instance and look for it in the instance_map when needed.
      server-tools/instance-manager/instance.h:
        new functions declared. functions, which were converted to static removed from the class.
      server-tools/instance-manager/instance_options.cc:
        fix valgrind warning
      933db613
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · e39656fb
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-2486
      
      
      e39656fb
    • unknown's avatar
      A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR · 276bd123
      unknown authored
      NOT FOUND ...' in conditional handled incorrectly".
      
      Whenever we remove an instruction during optimization, we need to
      adjust instruction numbers (ip - instruction pointer) stored in all
      instructions. In addition to that, sp_instr_hpush_jump, which 
      corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
      which holds the number of instruction with the continue handler.
      In the bug report, a wrong ip stored in m_handler was pointing at 
      FETCH, which resulted in an error message and abnormal SP termination.
      The fix is to just remove m_handler member from sp_instr_hpush_jump,
      as it's always points to the instruction next to the DECLARE
      statement itself (m_ip+1).
      
      
      mysql-test/r/sp.result:
        Test results fixed (Bug#12168)
      mysql-test/t/sp.test:
        A test case for Bug#12168 "'DECLARE CONTINUE HANDLER FOR NOT
        FOUND ...' in conditional handled incorrectly"
      sql/sp_head.cc:
        Remove m_handler (the number of continue handler instruction)
        as it always equal to m_ip+1
      sql/sp_head.h:
        Remove m_handler (the number of continue handler instruction)
        as it always equal to m_ip+1
      276bd123
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · f887aec2
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-2486
      
      
      f887aec2
    • unknown's avatar
      WL#2486 - natural and using join according to SQL:2003 · 1cb72d7e
      unknown authored
      - Corrected problem with N-way nested natural joins in PS mode.
      - Code cleanup
      - More asserts to check consistency of name resolution contexts
      - Fixed potential memory leak of name resolution contexts
      
      
      mysql-test/r/join.result:
        - Corrected problem with N-way nested natural joins in PS mode.
      mysql-test/t/join.test:
        - Corrected problem with N-way nested natural joins in PS mode.
      sql/item.h:
        - Fixed potential memory leak.
      sql/sql_base.cc:
        - the local context of Item_fields that participate in TABLE_LIST::on_cond for
          natural joins is correctly set to the tables where the corresponding fields
          originate from.
        - removed unused variables
        - correct allocation of contexts
      sql/sql_parse.cc:
        - correct allocation of contexts for JOIN ON conditions.
      sql/table.cc:
        - added asserts to check the consistency of name resolution contexts
      sql/table.h:
        - added asserts to check the consistency of name resolution contexts
      1cb72d7e
    • unknown's avatar
      btr0sea.c: · 1568be58
      unknown authored
        Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL
      
      
      innobase/btr/btr0sea.c:
        Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL
      1568be58
    • unknown's avatar
      fixed test after merge · 9e9d610d
      unknown authored
      9e9d610d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f42e2782
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
      
      
      f42e2782
    • unknown's avatar
      row0sel.c: · dd16ad4e
      unknown authored
        Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)
      
      
      innobase/row/row0sel.c:
        Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)
      dd16ad4e
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f77d6df8
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
      
      
      f77d6df8
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 429e0abb
      unknown authored
      into lmy004.:/work/mysql-5.0-clean
      
      
      429e0abb
    • unknown's avatar
      test fix for fix of 12591 · fce5427e
      unknown authored
      
      mysql-test/r/innodb.result:
        fix result for fix of 12591
      mysql-test/t/innodb.test:
        fix test for fix of 12591
      fce5427e
    • unknown's avatar
      changes in row operation · b9314a4f
      unknown authored
      b9314a4f
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · bba824eb
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      bba824eb
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · adf56c8c
      unknown authored
      into  hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      adf56c8c
  2. 18 Aug, 2005 24 commits