- 15 May, 2006 7 commits
-
-
unknown authored
sql/item.cc: After-merge fixes. sql/item.h: After-merge fixes. sql/item_func.cc: After-merge fixes. sql/item_func.h: After-merge fixes. sql/sp_head.cc: After-merge fixes.
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.0 sql/sp_head.cc: Manual merge.
-
unknown authored
into mysql.com:/home/alexi/innodb/mysql-5.0-ss547
-
unknown authored
into mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work Null merge innobase/os/os0file.c: Null merge sql/ha_innodb.cc: Null merge
-
unknown authored
Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter". innobase/os/os0file.c: Applied innodb-5.0-ss547 snapshot. Check the page trailers also after writing to disk. This improves the chances of diagnosing Bug 18886. os_file_check_page_trailers(): New function for checking that two copies of the LSN stamped on the pages match. os_aio_simulated_handle(): Call os_file_check_page_trailers() before and after os_file_write(). sql/ha_innodb.cc: Applied innodb-5.0-ss547 snapshot. Increment statistic counter in ha_innobase::index_prev().
-
unknown authored
Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter. innobase/os/os0file.c: Applied innodb-4.1-ss29 snapshot. Check the page trailers also after writing to disk. This improves the chances of diagnosing Bug 18886. os_file_check_page_trailers(): New function for checking that two copies of the LSN stamped on the pages match. os_aio_simulated_handle(): Call os_file_check_page_trailers() before and after os_file_write(). sql/ha_innodb.cc: Applied innodb-4.1-ss29 snapshot. Increment statistic counter in ha_innobase::index_prev().
-
unknown authored
Stored procedure execution sometimes placed the address of auto variables in the list of Item changes to undo in THD::rollback_item_tree_changes(). This could cause stack corruption. sql/sp_head.cc: Avoid storing address of auto variables in global rollback list, to prevent stack memory corruption. sql/sp_head.h: Avoid storing address of auto variables in global rollback list, to prevent stack memory corruption. sql/sp_rcontext.cc: Avoid storing address of auto variables in global rollback list, to prevent stack memory corruption. sql/sp_rcontext.h: Avoid storing address of auto variables in global rollback list, to prevent stack memory corruption. sql/sql_class.cc: Avoid storing address of auto variables in global rollback list, to prevent stack memory corruption.
-
- 14 May, 2006 1 commit
-
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/im_options_set.result: Auto merged mysql-test/r/im_options_unset.result: Auto merged mysql-test/r/trigger-grant.result: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
- 13 May, 2006 5 commits
-
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
-
unknown authored
over two views when using syntax with curly braces. Each outer join operation must be placed in a separate nest. This was not done when the syntax with curly braces was used. In some cases, in particular, for queries with outer join operation over views it could cause a crash. mysql-test/r/join_outer.result: Added a test case for bug #19396. mysql-test/t/join_outer.test: Added a test case for bug #19396.
-
unknown authored
remove initialization of unsigned_flag for Item_decimal mysql-test/r/case.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/metadata.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/ps_2myisam.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/ps_3innodb.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/ps_4heap.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/ps_5merge.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/ps_6bdb.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/ps_7ndb.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/type_float.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix mysql-test/r/type_newdecimal.result: Bug#17048 CREATE TABLE ... SELECT truncate values result fix
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
-
unknown authored
itself when executing queries referring to a view with GROUP BY an expression containing non-constant interval. It happened because Item_date_add_interval::eq neglected the fact that the method can be applied to an expression of the form date(col) + interval time_to_sec(col) second at the time when col could not be evaluated yet. An attempt to evaluate time_to_sec(col) in this method resulted in a crash. mysql-test/r/view.result: Added a test case for bug #19490. mysql-test/t/view.test: Added a test case for bug #19490. sql/item_timefunc.cc: Fixed bug #19490. The bug that caused server crash manifested itself when executing queries referring to a view with GROUP BY an expression containing non-constant interval. It happened because Item_date_add_interval::eq neglected the fact that the method can be applied to an expression of the form date(col) + interval time_to_sec(col) second at the time when col could not be evaluated yet. An attempt to evaluate time_to_sec(col) in this method resulted in a crash. The code of Item_date_add_interval::eq was corrected.
-
- 12 May, 2006 21 commits
-
-
unknown authored
Change mode to -rw-rw-r-- include/decimal.h: Change mode to -rw-rw-r-- mysql-test/r/archive_gis.result: Change mode to -rw-rw-r-- mysql-test/r/bdb_gis.result: Change mode to -rw-rw-r-- mysql-test/r/binlog.result: Change mode to -rw-rw-r-- mysql-test/r/compress.result: Change mode to -rw-rw-r-- mysql-test/r/federated_archive.result: Change mode to -rw-rw-r-- mysql-test/r/federated_bug_13118.result: Change mode to -rw-rw-r-- mysql-test/r/im_daemon_life_cycle.result: Change mode to -rw-rw-r-- mysql-test/r/im_life_cycle.result: Change mode to -rw-rw-r-- mysql-test/r/im_options_set.result: Change mode to -rw-rw-r-- mysql-test/r/im_options_unset.result: Change mode to -rw-rw-r-- mysql-test/r/im_utils.result: Change mode to -rw-rw-r-- mysql-test/r/innodb-big.result: Change mode to -rw-rw-r-- mysql-test/r/innodb_gis.result: Change mode to -rw-rw-r-- mysql-test/r/innodb_notembedded.result: Change mode to -rw-rw-r-- mysql-test/r/mysql.result: Change mode to -rw-rw-r-- mysql-test/r/mysqldump-max.result: Change mode to -rw-rw-r-- mysql-test/r/ndb_bitfield.result: Change mode to -rw-rw-r-- mysql-test/r/ndb_condition_pushdown.result: Change mode to -rw-rw-r-- mysql-test/r/ndb_gis.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_ignore_revoke.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_trigger.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_view.result: Change mode to -rw-rw-r-- mysql-test/r/sp-code.result: Change mode to -rw-rw-r-- mysql-test/r/sp-destruct.result: Change mode to -rw-rw-r-- mysql-test/r/sp-dynamic.result: Change mode to -rw-rw-r-- mysql-test/r/sp-vars.result: Change mode to -rw-rw-r-- mysql-test/r/sp_trans.result: Change mode to -rw-rw-r-- mysql-test/r/sum_distinct-big.result: Change mode to -rw-rw-r-- mysql-test/r/trigger-compat.result: Change mode to -rw-rw-r-- mysql-test/r/trigger-grant.result: Change mode to -rw-rw-r-- mysql-test/r/trigger-trans.result: Change mode to -rw-rw-r-- mysql-test/r/type_bit_innodb.result: Change mode to -rw-rw-r-- mysql-test/r/type_newdecimal.result: Change mode to -rw-rw-r-- mysql-test/r/user_limits.result: Change mode to -rw-rw-r-- mysql-test/r/view_grant.result: Change mode to -rw-rw-r-- mysql-test/r/view_query_cache.result: Change mode to -rw-rw-r-- mysql-test/r/xa.result: Change mode to -rw-rw-r-- mysql-test/std_data/bug16266.000001: Change mode to -rw-rw-r-- mysql-test/std_data/vchar.frm: Change mode to -rw-rw-r-- mysql-test/t/binlog-master.opt: Change mode to -rw-rw-r-- mysql-test/t/binlog.test: Change mode to -rw-rw-r-- mysql-test/t/flush_read_lock_kill-master.opt: Change mode to -rw-rw-r-- mysql-test/t/flush_read_lock_kill.test: Change mode to -rw-rw-r-- mysql-test/t/sp_trans.test: Change mode to -rw-rw-r-- mysql-test/t/xa.test: Change mode to -rw-rw-r-- mysys/my_mmap.c: Change mode to -rw-rw-r-- sql/sql_array.h: Change mode to -rw-rw-r-- strings/decimal.c: Change mode to -rw-rw-r--
-
unknown authored
configure.in: Auto merged mysql-test/include/rpl_stmt_seq.inc: Auto merged mysql-test/r/blackhole.result: Auto merged mysql-test/r/ctype_cp932_binlog.result: Auto merged mysql-test/r/fulltext2.result: Auto merged mysql-test/r/ctype_ucs_binlog.result: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/innodb_handler.result: Auto merged mysql-test/r/insert_update.result: Auto merged mysql-test/r/ndb_update.result: Auto merged mysql-test/r/not_embedded_server.result: Auto merged mysql-test/r/repair.result: Auto merged mysql-test/r/query_cache_notembedded.result: Auto merged mysql-test/r/rpl_create_database.result: Auto merged mysql-test/r/rpl_multi_update3.result: Auto merged mysql-test/r/rpl_slave_status.result: Auto merged mysql-test/r/timezone_grant.result: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/gis-rtree.test: Auto merged mysql-test/t/grant2.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/insert_update.test: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/repair.test: Auto merged mysql-test/t/rpl_ddl.test: Auto merged mysql-test/t/rpl_multi_query.test: Auto merged mysql-test/t/rpl_rewrite_db.test: Auto merged sql/sql_bitmap.h: Auto merged sql/sql_handler.cc: Auto merged zlib/Makefile.am: Auto merged mysql-test/std_data/trunc_binlog.000001: SCCS merged
-
unknown authored
Change mode to -rw-rw-r-- Ereport.pl, Ecreate.pl, Ecompare.pl: Change mode to -rwxrwxr-- bdb/dist/s_dir: Change mode to -rw-rw-r-- myisam/ftbench/Ecompare.pl: Change mode to -rwxrwxr-- myisam/ftbench/Ecreate.pl: Change mode to -rwxrwxr-- myisam/ftbench/Ereport.pl: Change mode to -rwxrwxr-- myisam/ftbench/README: Change mode to -rw-rw-r-- myisammrg/myrg_rnext_same.c: Change mode to -rw-rw-r-- mysql-test/include/rpl_stmt_seq.inc: Change mode to -rw-rw-r-- mysql-test/misc/kill_master.sh: Change mode to -rw-rw-r-- mysql-test/r/blackhole.result: Change mode to -rw-rw-r-- mysql-test/r/ctype_cp1250_ch.result: Change mode to -rw-rw-r-- mysql-test/r/ctype_cp932_binlog.result: Change mode to -rw-rw-r-- mysql-test/r/ctype_euckr.result: Change mode to -rw-rw-r-- mysql-test/r/ctype_gb2312.result: Change mode to -rw-rw-r-- mysql-test/r/ctype_ucs_binlog.result: Change mode to -rw-rw-r-- mysql-test/r/fulltext2.result: Change mode to -rw-rw-r-- mysql-test/r/func_des_encrypt.result: Change mode to -rw-rw-r-- mysql-test/r/grant2.result: Change mode to -rw-rw-r-- mysql-test/r/insert_update.result: Change mode to -rw-rw-r-- mysql-test/r/ndb_database.result: Change mode to -rw-rw-r-- mysql-test/r/ndb_update.result: Change mode to -rw-rw-r-- mysql-test/r/not_embedded_server.result: Change mode to -rw-rw-r-- mysql-test/r/query_cache_notembedded.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_create_database.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_drop_db.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_dual_pos_advance.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_insert_select.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_multi_update3.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_multi_update4.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_slave_status.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_trunc_temp.result: Change mode to -rw-rw-r-- mysql-test/r/timezone_grant.result: Change mode to -rw-rw-r-- mysql-test/std_data/master-bin.000001: Change mode to -rw-rw-r-- mysql-test/t/ctype_latin1.test: Change mode to -rw-rw-r-- mysql-test/t/fulltext2.test: Change mode to -rw-rw-r-- mysql-test/t/gis-rtree.test: Change mode to -rw-rw-r-- mysql-test/t/grant2.test: Change mode to -rw-rw-r-- mysql-test/t/insert_update.test: Change mode to -rw-rw-r-- mysql-test/t/mysqltest.test: Change mode to -rw-rw-r-- mysql-test/t/rpl_ddl.test: Change mode to -rw-rw-r-- mysql-test/t/rpl_insert_ignore.test: Change mode to -rw-rw-r-- mysql-test/t/rpl_multi_query.test: Change mode to -rw-rw-r-- mysql-test/t/rpl_rewrite_db-slave.opt: Change mode to -rw-rw-r-- mysql-test/t/rpl_rewrite_db.test: Change mode to -rw-rw-r-- mysql-test/t/subselect2.test: Change mode to -rw-rw-r-- mysql-test/t/union-master.opt: Change mode to -rw-rw-r-- mysys/mf_tempdir.c: Change mode to -rw-rw-r-- mysys/my_crc32.c: Change mode to -rw-rw-r-- mysys/my_gethwaddr.c: Change mode to -rw-rw-r-- mysys/my_getsystime.c: Change mode to -rw-rw-r-- scripts/mysql_prepare_privilege_tables_for_5.sql: Change mode to -rw-rw-r-- sql/sql_bitmap.h: Change mode to -rw-rw-r-- zlib/Makefile.am: Change mode to -rw-rw-r--
-
unknown authored
BitKeeper/deleted/.del-master-bin.001~8917149781db8413: Auto merged myisammrg/myrg_range.c: Auto merged mysql-test/r/innodb_handler.result: Auto merged mysql-test/r/repair.result: Auto merged mysql-test/std_data/trunc_binlog.000001: Auto merged mysql-test/t/bulk_replace.test: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/ctype_tis620.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/innodb_handler.test: Auto merged mysql-test/t/repair.test: Auto merged mysql-test/t/rpl_commit_after_flush.test: Auto merged mysql-test/t/rpl_free_items.test: Auto merged sql/sql_handler.cc: Auto merged
-
unknown authored
Change mode to -rw-rw-r-- dbug_add_tags.pl: Change mode to -rwxrwxr-- dbug/dbug_add_tags.pl: Change mode to -rwxrwxr-- myisammrg/myrg_range.c: Change mode to -rw-rw-r-- mysql-test/r/innodb_handler.result: Change mode to -rw-rw-r-- mysql-test/r/repair.result: Change mode to -rw-rw-r-- mysql-test/std_data/master-bin.001: Change mode to -rw-rw-r-- mysql-test/std_data/trunc_binlog.001: Change mode to -rw-rw-r-- mysql-test/t/bulk_replace.test: Change mode to -rw-rw-r-- mysql-test/t/create_select_tmp.test: Change mode to -rw-rw-r-- mysql-test/t/ctype_tis620.test: Change mode to -rw-rw-r-- mysql-test/t/handler.test: Change mode to -rw-rw-r-- mysql-test/t/innodb_handler.test: Change mode to -rw-rw-r-- mysql-test/t/mix_innodb_myisam_binlog-master.opt: Change mode to -rw-rw-r-- mysql-test/t/repair.test: Change mode to -rw-rw-r-- mysql-test/t/rpl_commit_after_flush.test: Change mode to -rw-rw-r-- mysql-test/t/rpl_free_items-slave.opt: Change mode to -rw-rw-r-- mysql-test/t/rpl_free_items.test: Change mode to -rw-rw-r-- scripts/mysql_secure_installation.sh: Change mode to -rw-rw-r-- sql/sql_handler.cc: Change mode to -rw-rw-r-- support-files/mysql-multi.server.sh: Change mode to -rw-rw-r--
-
unknown authored
into mysql.com:/home/kgeorge/mysql/5.0/B7549 mysql-test/r/subselect.result: Auto merged
-
unknown authored
replaced get_field(MEM_ROOT *mem, Field *field) with get_field(MEM_ROOT *mem, Field *field, String *res). It allows to avoid strlen(). mysql-test/r/information_schema.result: Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes test case mysql-test/t/information_schema.test: Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes test case
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0
-
unknown authored
mysql-test/r/information_schema.result: Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH test case mysql-test/r/join.result: Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH result fix mysql-test/t/information_schema.test: Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH test case
-
unknown authored
from within triggers Add support for passing NEW.x as INOUT and OUT parameters to stored procedures. Passing NEW.x as INOUT parameter requires SELECT and UPDATE privileges on that column, and passing it as OUT parameter requires only UPDATE privilege. mysql-test/r/sp-error.result: Update the result for new message. mysql-test/r/trigger-grant.result: Add result for bug#14635. mysql-test/r/trigger.result: Add result for bug#14635. mysql-test/t/trigger-grant.test: Add test case for bug#14635. mysql-test/t/trigger.test: Add test case for bug#14635. sql/item.cc: Add implementations of set_value() and set_required_privilege() methods of Settable_routine_parameter interface. Use Item_trigger_field::want_privilege instead of Item_trigger_field::access_type. Reset privileges on Item_trigger_field::cleanup(). sql/item.h: Add interface class Settable_routine_parameter and interface query method to Item class. Item_splocal and Item_trigger_field implement this interface. For Item_trigger_field: - add read_only attribute and is_read_only() method. - remove access_type and add original_privilege and want_privilege instead. - add set_value() method. - add reset_privilege() method. sql/item_func.cc: Add implementations of set_value() method of Settable_routine_parameter interface. sql/item_func.h: Item_func_get_user_var implements Settable_routine_parameter interface. sql/share/errmsg.txt: Update english ER_SP_NOT_VAR_ARG message. sql/sp_head.cc: Use Settable_routine_parameter interface for parameter update. sql/sql_yacc.yy: Set read_only and want_privilege members in Item_trigger_field appropriately. For NEW.x trigger variable used in left-hand-side of SET statement the latter is set to UPDATE_ACL, otherwise it is set to SELECT_ACL (but see Item_trigger_field::set_required_privilege(), where it may be updated to different value).
-
unknown authored
-
unknown authored
into mysql.com:/home/mysql-5.0-10418 mysql-test/t/outfile.test: Auto merged sql/item_strfunc.cc: Auto merged mysql-test/r/func_str.result: expect NULL rather than error if file given to load_file() doesn't exist mysql-test/r/outfile.result: expect NULL rather than error if file given to load_file() doesn't exist mysql-test/t/func_str.test: show that load_file() will return NULL rather than throw an error if file doesn't exist
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
- Don't kill the active connection to the server, instead read the connection id, switch connection and kill the first one from there. mysql-test/r/rpl_temporary.result: Update test result mysql-test/t/rpl_temporary.test: Don't kill our own connection to the server as the result code differs depending on platform.
-
unknown authored
a worse execution plan than in 4.1 for some queries. It happened due the fact that at some conditions the optimizer always preferred range or full index scan access methods to lookup access methods even when the latter were much cheaper. The problem was not observed in 4.1 for the reported query because the WHERE condition was not of a form that could cause the problem. Equality propagation introduced on 5.0 added an extra predicate and changed the WHERE condition. The new condition provoked the optimizer to make a bad choice. The problem was fixed by the patch for bug 17379. mysql-test/r/select.result: Added a test case for bug #18940. The problem was fixed by the patch for bug 17379. mysql-test/t/select.test: Added a test case for bug #18940. The problem was fixed by the patch for bug 17379.
-
- 11 May, 2006 4 commits
-
-
unknown authored
Stepped up to 4.0.28 configure.in: Stepped up to 4.0.28
-
unknown authored
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint client/mysql.cc: Auto merged
-
unknown authored
When a view statement is compiled on CREATE VIEW time, most of the optimizations should not be done. Finding the right optimization for a subquery is one of them. Unfortunately the optimizer is resolving the column references of the left expression of IN subqueries in the process of deciding witch optimization to use (if needed). So there should be a special case in Item_in_subselect::fix_fields() : check the validity of the left expression of IN subqueries in CREATE VIEW mode and then proceed as normal. mysql-test/r/subselect.result: test case mysql-test/r/view.result: chnaged explain due to column being resolved mysql-test/t/subselect.test: test case sql/item_subselect.cc: overloaded fix_fields to fix the left_expr in prepare_view_mode sql/item_subselect.h: fix_fields overloaded so it can prepare left_expr
-
unknown authored
into mysql.com:/home/mysql-4.1-10418
-
- 10 May, 2006 2 commits