1. 26 Nov, 2005 1 commit
  2. 25 Nov, 2005 1 commit
  3. 24 Nov, 2005 20 commits
  4. 23 Nov, 2005 8 commits
    • unknown's avatar
      Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f4431619
      unknown authored
      into  regul.home.lan:/mnt/md/bk/mysql-5.0
      
      
      f4431619
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1c313f03
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      sql/sql_class.cc:
        Auto merged
      1c313f03
    • unknown's avatar
      Always initialize THD::thread_stack: it's used in · 0633a41c
      unknown authored
      check_stack_overrun().
      
      
      sql/slave.cc:
        Move initialization of THD::thread_stack before THD::store_globals()
      sql/sql_acl.cc:
        Initialize THD::thread_stack in artificial THDs used
        to load gratns subsystem.
      sql/sql_class.cc:
        Add an assert that THD::thread_stack is assigned.
      sql/sql_insert.cc:
        Add initialization of THD::thread_stack (delayed insert
        thread).
      sql/sql_parse.cc:
        Move initialization of THD::thread_stack before
        THD::store_globals().
      sql/sql_udf.cc:
        Add initialization for THD::thread_stack (an artificial
        THD used to initialize UDF subsystem).
      sql/tztime.cc:
        Add initialization for THD::thread_stack (an artificial
        THD used to initialize timezones).
      0633a41c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aa4da5f7
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      aa4da5f7
    • unknown's avatar
      Fixed BUG#13729 Stored procedures: packet error after exception handled · b1182823
      unknown authored
        Don't set thd->is_fatal_error in sql_update for duplicate key errors.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#13729.
      mysql-test/r/sp_trans.result:
        New test case for BUG#14840.
      mysql-test/t/sp.test:
        New test case for BUG#13729.
      mysql-test/t/sp_trans.test:
        New test case for BUG#14840.
      sql/sql_update.cc:
        Don't set thd->is_fatal_error if it's a duplicate key error.
      b1182823
    • unknown's avatar
      A name of macro is fixed. · 056d7266
      unknown authored
      056d7266
    • unknown's avatar
      merged · 12826df8
      unknown authored
      12826df8
    • unknown's avatar
      postmerge fix · 4aea839b
      unknown authored
      4aea839b
  5. 22 Nov, 2005 10 commits
    • unknown's avatar
      merge · ffc506e9
      unknown authored
      ffc506e9
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0 · aa06123f
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
      
      
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/sp.result:
        merge
      sql/share/errmsg.txt:
        merge
      aa06123f
    • unknown's avatar
      Recursion support made for SP (BUG#10100). · 164ce4c5
      unknown authored
      
      client/mysqltest.c:
        An expected error messages hiding from the log if disable_result_log is in force.
      mysql-test/r/sp-dynamic.result:
        The test expanded for case of allowed/disalowed recursion.
      mysql-test/r/sp-error.result:
        Error messages changed.
        Test of bug11394() made with allowed recursion.
      mysql-test/r/sp.result:
        Tests for recursion.
      mysql-test/r/trigger.result:
        Check that triggers are not affected by this patch.
      mysql-test/r/variables.result:
        Test of max_sp_recursion_depth variable.
      mysql-test/t/sp-dynamic.test:
        The test expanded for case of allowed/disalowed recursion.
      mysql-test/t/sp-error.test:
        Error messages changed.
        Test of bug11394() made with allowed recursion.
      mysql-test/t/sp.test:
        Tests for recursion.
      mysql-test/t/trigger.test:
        Check that triggers are not affected by this patch.
      mysql-test/t/variables.test:
        Test of max_sp_recursion_depth variable.
      sql/item_func.cc:
        sp_find_function() and sp_find_procedure() joined to sp_find_routine()
          function as it was mentioned in TODO.
      sql/mysqld.cc:
        max_sp_recursion_depth variable added.
      sql/set_var.cc:
        max_sp_recursion_depth variable added.
      sql/share/errmsg.txt:
        An error message changed.
        An error message added.
      sql/sp.cc:
        sp_find_function() and sp_find_procedure() joined to sp_find_routine()
          function as it was mentioned in TODO.
        Temory LEX is allocated on a stack, not on a heap.
        Recursion support added for stored procedures.
      sql/sp.h:
        sp_find_function() and sp_find_procedure() joined to sp_find_routine()
          function as it was mentioned in TODO.
      sql/sp_head.cc:
        Initialization of new sp_head fields to get correct list of instances
          contained one instance only.
        Stack requirement for SP instruction is increased.
        Stack free space is checked before mem root initialisation to avoid
          memory leak.
        Pointer to the free instance management added before and after
          SP execution.
      sql/sp_head.h:
        New sp_head variables added to support inst of instances of SP
          for recursion and pointer on ths first free to use instance.
      sql/sql_base.cc:
        open_table() consume a lot of stack space so we check free stack space before it.
      sql/sql_class.h:
        max_sp_recursion_depth variable added.
      sql/sql_parse.cc:
        sp_find_function() and sp_find_procedure() joined to sp_find_routine()
          function as it was mentioned in TODO.
      164ce4c5
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0 · a2c26aa7
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
      
      
      sql/item.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        merge
      mysql-test/r/trigger.result:
        merge
      mysql-test/t/sp.test:
        merge
      mysql-test/t/trigger.test:
        merge
      sql/item.cc:
        merge
      sql/sp_rcontext.h:
        merge
      a2c26aa7
    • unknown's avatar
      Fix for BUG#13549 "Server crash with nested stored procedures · 6574612d
      unknown authored
      if inner routine has more local variables than outer one, and
      one of its last variables was used as argument to NOT operator".
      
      THD::spcont was non-0 when we were parsing stored routine/trigger
      definition during execution of another stored routine. This confused
      methods of Item_splocal and forced them use wrong runtime context.
      Fix ensures that we always have THD::spcont equal to zero during
      routine/trigger body parsing. This also allows to avoid problems
      with errors which occur during parsing and SQL exception handlers.
      
      
      mysql-test/r/sp.result:
        Test suite for bug#13549.
      mysql-test/r/trigger.result:
        Test suite for bug#13549.
      mysql-test/t/sp.test:
        Test suite for bug#13549.
      mysql-test/t/trigger.test:
        Test suite for bug#13549.
      sql/item.cc:
        Protection against using wrong context by SP local variable.
      sql/item.h:
        Protection against using wrong context by SP local variable.
      sql/protocol.cc:
        An incorrect macro name fixed.
      sql/protocol.h:
        An incorrect macro name fixed.
      sql/sp.cc:
        Do not allow SP which we are parsing to use other SP
        context (BUG#13549).
      sql/sp_head.cc:
        Protection against using wrong context by SP local variable.
      sql/sp_rcontext.h:
        Protection against using wrong context by SP local variable.
      sql/sql_cache.h:
        An incorrect macro name fixed.
      sql/sql_class.cc:
        Protection against using wrong context by SP local variable.
      sql/sql_class.h:
        Protection against using wrong context by SP local variable.
      sql/sql_trigger.cc:
        Do not allow Trigger which we are parsing to use
        other SP context (BUG#13549).
      sql/sql_yacc.yy:
        Protection against using wrong context by SP local variable.
      6574612d
    • unknown's avatar
      Added support of stress mode to mysql-test-run.pl · 3fc626a0
      unknown authored
      Corrected function declaration 
      
      
      mysql-test/lib/mtr_misc.pl:
        Corrected function declaration
      mysql-test/mysql-test-run.pl:
        Added support of stress mode
      mysql-test/lib/mtr_stress.pl:
        Added support of stress mode
      3fc626a0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 16213b21
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/share/errmsg.txt:
        Auto merged
      16213b21
    • unknown's avatar
      German error messages · 3a84f6e2
      unknown authored
      3a84f6e2
    • unknown's avatar
      Manual merge from 4.1, bug#15145. · 57e1c5aa
      unknown authored
      57e1c5aa
    • unknown's avatar
      support-files/mysql.spec.sh · 6a6caf56
      unknown authored
      Fix a possible problem on RPM un-install. bug#15145
      
      
      support-files/mysql.spec.sh:
        Extend the file existence check for "init.d/mysql" on un-install
        to also guard the call to "insserv"/"chkconfig".
        bug#15145, br#5369 / 5586, csc#7129
      6a6caf56