1. 19 Aug, 2005 11 commits
    • 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
      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 27 commits
    • unknown's avatar
      Manual merge · 2e804faa
      unknown authored
      2e804faa
    • unknown's avatar
      Manual merge · a166d8ca
      unknown authored
      a166d8ca
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.0-clean · 4cd0ef49
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12591
      
      
      sql/sql_show.cc:
        Auto merged
      4cd0ef49
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 88a7d01e
      unknown authored
      into moonbone.local:/work/10624-bug-5.0-mysql
      
      
      sql/sql_lex.cc:
        Auto merged
      88a7d01e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 0b8e774e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/item_strfunc.cc:
        Auto merged
      0b8e774e
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 619b4b0f
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      619b4b0f
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6713cff5
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-aug18-fix
      
      
      6713cff5
    • unknown's avatar
      Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988,... · d150e4a2
      unknown authored
      Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
       )
      
      
      
      d150e4a2
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · be9ccb35
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      be9ccb35
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 749f599e
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      749f599e
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 6ea6df4e
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      6ea6df4e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d593d49
      unknown authored
      into mysql.com:/usersnfs/pchardin/mysql-5.0
      
      
      8d593d49
    • unknown's avatar
      Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory · fa19a9f2
      unknown authored
          and Bug#12297 SP crashes the server if data inserted inside a lon loop
      Third commit attempt. With fixes to the issues, showed up after full rebuild and
      tests on other hosts.
      
      
      mysql-test/r/rpl_sp.result:
        New warnings appeared in result file, as now we always create spcont in a stored routine.
        This is correct behaviour. We swallowed some warnings, as we used thd->spcont to check whether
        we are in the SP though we didn't set spcont in certain cases. This is fixed now.
      mysql-test/r/sp.result:
        fixed result file to reflect new tests
      mysql-test/t/sp.test:
        Added tests for bugs. Though one of them is disabled, as it fails because of the other bug.
        It should be enabled, when bug 12297 is fixed.
      sql/sp_head.cc:
        Per-instruction arena is implemented
      sql/sp_rcontext.cc:
         Now we should deal with callers_arena->free_list when we employ reuse mechanism with callers_arena
         switched during sp_eval_func_item
      sql/sp_rcontext.h:
        Add new member to sp_rcontext class, in order to handle instructions with assignment
        and/or with nested SP processing properly.
      fa19a9f2
    • unknown's avatar
      stop on NULL comparison only if it is allowed (BUG#12509) · 341f8221
      unknown authored
      
      mysql-test/r/row.result:
        Correct NULL handling in row comporison
      mysql-test/t/row.test:
        Correct NULL handling in row comporison (BUG#12509)
      sql/item_cmpfunc.cc:
        stop on NULL comparison only if it is allowed
      sql/item_cmpfunc.h:
        support optimisation in case of processing WHERE/HAVING, where NULL and FALSE are equal
      341f8221
    • unknown's avatar
      WL#2486 - natural and using join according to SQL:2003 · 34bf64bc
      unknown authored
      - Fixed minor error after Monty's review.
      
      
      sql/table.cc:
        cur_table_ref is used in the first pass of the loop *before* it is set later in the loop.
      34bf64bc
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 320d451d
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      320d451d
    • unknown's avatar
      Fix merge of BUG#11538 fix. · 3fad8218
      unknown authored
      
      config/ac-macros/ha_ndbcluster.m4:
        Merge fix for BUG#11538 fix.
      3fad8218
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · e1ea6cc5
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/sql_view.cc:
        Auto merged
      e1ea6cc5
    • unknown's avatar
      view.test: · c9fa6a47
      unknown authored
        Added a test case for bug #10970.
      view.result:
        Added a test case for bug #10970.
        Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
      sql_view.cc:
        Fixed bug #10970.
        In the function mysql_create_view if a view does not refer
        any tables directly the variable table must be updated
        after the call of open_and_lock_tables.
      errmsg.txt:
        Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
        (when fixing bug #10970).
      
      
      sql/share/errmsg.txt:
        Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
        (when fixing bug #10970).
      sql/sql_view.cc:
        Fixed bug #10970.
        In the function mysql_create_view if a view does not refer
        any tables directly the variable table must be updated
        after the call of open_and_lock_tables.
      mysql-test/r/view.result:
        Fixed bug #10970.
        Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
      mysql-test/t/view.test:
        Added a test case for bug #10970.
      c9fa6a47
    • unknown's avatar
      Allow consistent cursor view see changes made by creating transaction. · bbd4f64a
      unknown authored
      This is quick fix and needs to be fixed when semi-consistent 
      high-granularity read view is implemented (Bug #12456).
      
      
      bbd4f64a
    • unknown's avatar
      Fix minor typo in handling of error conditions and return of SLEEP(). · fc44a776
      unknown authored
      
      sql/item_func.cc:
        Remove unnecessary initialization, fix parens placement
      fc44a776
    • unknown's avatar
      Revert patch for Bug #12595, it causes the sql_mode test to fail. · 6dfb7847
      unknown authored
      
      mysql-test/r/select.result:
        Update results
      mysql-test/t/select.test:
        Remove regression test
      sql/item_cmpfunc.cc:
        Revert patch for checking length of ESCAPE, it is not correct.
      6dfb7847
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-12582 · 76fade75
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      76fade75
    • unknown's avatar
      Fix bad merge of sql/item_strfunc.cc by aivanov · c471e84b
      unknown authored
      
      sql/item_strfunc.cc:
        Fix bad merge
      c471e84b
    • unknown's avatar
      Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582) · 12bed9ff
      unknown authored
      
      include/my_global.h:
        Add distinct set_timespec_nsec() macro for when HAVE_TIMESPEC_TS_SEC
        is defined.
      12bed9ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4d2bf4be
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      4d2bf4be
    • unknown's avatar
      Cleanups and optimization during review of new code · 44086a62
      unknown authored
      
      mysql-test/t/kill.test:
        Moved --disable_reconnect earlier to avoid race condition
      sql/sql_help.cc:
        Cleanup during review of new code
        (Moved variable definitions first in function
      sql/sql_insert.cc:
        Cleanup during review of new code
      sql/sql_lex.cc:
        Cleanup during review of new code
      sql/sql_parse.cc:
        Cleanup during review of new code
        Changed potential problem with previous_table_ref where it dependent that TABLE_LIST first element would be next_local
        Rearanged code in add_table_to_list() to remove extra if
        Combined 2 calls to calloc() to one
      sql/sql_view.cc:
        Remove extra indentation level
        Combined common 'on error' exit
      sql/sql_yacc.yy:
        Fixed comment style
      sql/table.cc:
        Cleanup during review of new code
        - Changed while() loops to for() loop (to make code more readable)
        - Removed not needed initialization of variables
        - Removed not needed 'else' cases
        - Removed trivial ASSERT's that was checked by previous code
        - Moved comment setting last in Natural_join_column::check_grants()
      44086a62
  3. 17 Aug, 2005 2 commits