1. 27 Sep, 2005 6 commits
  2. 26 Sep, 2005 10 commits
    • unknown's avatar
      Fixed BUG#6127: Stored procedure handlers within handlers don't work · ad8ff141
      unknown authored
          Replaced the dumb in-handler/not-in-handler check with a proper recursion
          check of handlers being executed.
          (Re-commit in a different tree, to make push possible.)
      
      
      mysql-test/r/sp.result:
        New test case for BUG#6127.
      mysql-test/t/sp.test:
        New test case for BUG#6127.
      sql/sp_head.cc:
        Replaced the setting of ctx->in_handler with a enter/exit handler methods.
      sql/sp_rcontext.cc:
        Replaced the boolean in_handler flag with a stack of handlers being exectuted, for proper recursion check.
      sql/sp_rcontext.h:
        Replaced the boolean in_handler flag with a stack of handlers being exectuted, for proper recursion check.
        (And added some comments in the sp_rcontext class.)
      ad8ff141
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4aa9a107
      unknown authored
      into moonbone.local:/work/13424-bug-5.0-mysql
      
      
      4aa9a107
    • unknown's avatar
      Fix for bug #13367 · aeca681b
      unknown authored
      aeca681b
    • unknown's avatar
      Fix bug #13424 locking view with query cache enabled crashes server · 05c17f2a
      unknown authored
      For LOCK view is opened but not prepared thus leaving 'table' field set to
      NULL. invalidate_locked_for_write() wasn't checking that and call to 
      invalidate_table(NULL) crashes server.
      
      To invalidate_locked_for_write() added check that ensures that table is
      completely opened.
      
      
      sql/sql_cache.cc:
        Fix bug #13424 locking view with query cache enabled crashes server
        Added check that table is completely opened.
      mysql-test/t/view_query_cache.test:
        Test case for bug#13424 locking view with query cache enabled crashes server
      mysql-test/r/view_query_cache.result:
        Test case for bug#13424 locking view with query cache enabled crashes server
      05c17f2a
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 526a1a92
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      526a1a92
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f126ba4
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/clean
      
      
      6f126ba4
    • unknown's avatar
      InnoDB: Handle temporary file creation failure more gracefully. · 3d23a234
      unknown authored
      
      innobase/row/row0ins.c:
        Don't assert on temp file creation failure.
      3d23a234
    • unknown's avatar
      Merging · cbfe4f59
      unknown authored
      cbfe4f59
    • unknown's avatar
      Merging · f6b2b7a4
      unknown authored
      
      sql/sql_parse.cc:
        Auto merged
      f6b2b7a4
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · e2829d41
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      e2829d41
  3. 25 Sep, 2005 3 commits
  4. 24 Sep, 2005 3 commits
  5. 23 Sep, 2005 18 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 92bf3cc1
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-merge-sept24
      
      
      92bf3cc1
    • unknown's avatar
      Manually merged · 5f01a330
      unknown authored
      
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_select.cc:
        Manually merged.
      5f01a330
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5559c48e
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug13419
      
      
      5559c48e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 76aac14e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      76aac14e
    • unknown's avatar
      2a4f5aac
    • unknown's avatar
      Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 · 94486830
      unknown authored
      into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
      
      
      sql/mysqld.cc:
        merge
      94486830
    • unknown's avatar
      mysqld.cc: · c5b8e9bb
      unknown authored
        Fix out-of-order status variable.
      
      
      sql/mysqld.cc:
        Fix out-of-order status variable.
      c5b8e9bb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 8f9e385b
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      8f9e385b
    • unknown's avatar
      mysqld.cc: · 1c064d28
      unknown authored
        Fix out-of-order status variable.
      
      
      sql/mysqld.cc:
        Fix out-of-order status variable.
      1c064d28
    • unknown's avatar
      row0ins.c: · 611dc88c
      unknown authored
        Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
      
      
      innobase/row/row0ins.c:
        Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
      611dc88c
    • unknown's avatar
      Fix for yet another compilation failure on Windows which was introduced during · 4b314fc1
      unknown authored
      work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
      privileges on used tables and stored routines when using a VIEW."
      (aka bug #13402 "Windows VS 2003 Compiler error")
      
      
      sql/mysqld.cc:
        handle_connections_namedpipes():
          THD::host member has moved to the Security_context class.
          New THD::security_ctx member points to active security context.
      4b314fc1
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-13361 · 24971d05
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/item_strfunc.cc:
        Auto merged
      24971d05
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-4100 · 944db06b
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      myisam/mi_dbug.c:
        Auto merged
      myisam/mi_rkey.c:
        Auto merged
      myisam/mi_search.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      944db06b
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 79b79064
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
      
      
      79b79064
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · f132ab56
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/clean
      
      
      f132ab56
    • unknown's avatar
      Merge 127.(none):/home/osku/mysql/5.0/clean · ce8af216
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/3443
      
      
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      mysql-test/r/innodb.result:
        Merge fixes.
      mysql-test/t/innodb.test:
        Merge fixes.
      ce8af216
    • unknown's avatar
      Fix bug #3443, better foreign key error messsages. · e4b0b0d0
      unknown authored
      
      innobase/dict/dict0dict.c:
        Add 'add_newline' parameter to dict_print_info_on_foreign_key_in_create_format.
      innobase/include/dict0dict.h:
        Add 'add_newline' parameter to dict_print_info_on_foreign_key_in_create_format.
      innobase/include/os0file.h:
        Add os_file_read_string.
      innobase/include/trx0trx.h:
        Add trx_set_detailed_error and trx_set_detailed_error_from_file functions
        and a detailed_error field to trx_struct.
      innobase/include/ut0mem.h:
        Add ut_strlcpy.
      innobase/os/os0file.c:
        Add os_file_read_string.
      innobase/row/row0ins.c:
        Add row_ins_set_detailed function and call it when needed.
        
        Adapt to changes in dict_print_info_on_foreign_key_in_create_format.
      innobase/trx/trx0trx.c:
        Add trx_set_detailed_error and trx_set_detailed_error_from_file.
        
        Clear trx->detailed_error in trx_create.
      innobase/ut/ut0mem.c:
        Add ut_strlcpy.
      mysql-test/r/innodb.result:
        Add new tests, adapt existing ones whose output was changed.
      mysql-test/t/innodb.test:
        Add new tests, adapt existing ones whose output was changed.
      sql/ha_innodb.cc:
        Add get_error_message.
        
        Clear trx->detailed_error in start_stmt and external_lock.
      sql/ha_innodb.h:
        Add get_error_message.
      sql/handler.cc:
        Add special case code in print_error for HA_ERR_ROW_IS_REFERENCED and
        HA_ERR_NO_REFERENCED_ROW.
        
        Change SETMSG to point to new error messages.
      sql/share/errmsg.txt:
        Add ER_ROW_IS_REFERENCED_2 and ER_NO_REFERENCED_ROW_2.
      e4b0b0d0