- 26 Sep, 2005 10 commits
-
-
unknown authored
Search the chain of sp_rcontexts recursively for handlers. If one is found, it will be detected in the sp_head::execute() method at the corresponding level. mysql-test/r/sp.result: New test case for BUG#7049. Note that the spurious warnings in the BUG#12379 test now are gone (as expected). mysql-test/t/sp.test: New test case for BUG#7049. sql/sp_head.cc: Link sp_rcontexts to allow catching errors across invokation boundaries. (Also fixed print method for the hreturn instruction.) sql/sp_rcontext.cc: Link sp_rcontexts to allow catching errors across invokation boundaries. If a handler is not found in the current sp_rcontext, recurse into the previous ones (if any). sql/sp_rcontext.h: Link sp_rcontexts to allow catching errors across invokation boundaries.
-
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.)
-
unknown authored
into moonbone.local:/work/13424-bug-5.0-mysql
-
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
-
unknown authored
into mysql.com:/home/mydev/mysql-5.0-5000
-
unknown authored
into 127.(none):/home/osku/mysql/5.0/clean
-
unknown authored
innobase/row/row0ins.c: Don't assert on temp file creation failure.
-
unknown authored
-
unknown authored
sql/sql_parse.cc: Auto merged
-
unknown authored
into mysql.com:/home/mydev/mysql-5.0-5000
-
- 25 Sep, 2005 3 commits
- 24 Sep, 2005 3 commits
-
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-bug13317
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 sql/handler.cc: Auto merged
-
unknown authored
Windows have no 'cat' command, use < mysql.test: Windows can't handle single quotes in --exec line mysql-test/t/mysql.test: Windows can't handle single quotes in --exec line mysql-test/t/mysqlbinlog.test: Windows have no 'cat' command, use <
-
- 23 Sep, 2005 24 commits
-
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
-
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.
-
unknown authored
into mysql.com:/home/psergey/mysql-4.1-bug13419
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
unknown authored
-
unknown authored
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0 sql/mysqld.cc: merge
-
unknown authored
Fix out-of-order status variable. sql/mysqld.cc: Fix out-of-order status variable.
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean
-
unknown authored
Fix out-of-order status variable. sql/mysqld.cc: Fix out-of-order status variable.
-
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
-
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.
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_strfunc.cc: Auto merged
-
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
-
unknown authored
After merge fix
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
-
unknown authored
into 127.(none):/home/osku/mysql/5.0/clean
-
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.
-
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.
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407 sql/mysqld.cc: Auto merged
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
-
unknown authored
caused spurious test failures. mysql-test/t/rpl_multi_delete.test: Fixed race condition in test that caused spurious test failure. To have predictable result from statements which are run on slave we need to sync master and slave explicitly. mysql-test/t/rpl_multi_update.test: Fixed race condition in test that caused spurious test failure. To have predictable result from statements which are run on slave we need to sync master and slave explicitly.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
mysql-test/r/loaddata.result: Add drop tablea after test case mysql-test/r/type_decimal.result: Update warnings mysql-test/r/union.result: Miss in merge mysql-test/t/loaddata.test: Add drop table after test case sql/opt_sum.cc: Add missing } sql/sql_load.cc: Manual merge
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 sql/handler.cc: Auto merged
-