summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#38066 Events log 'note' level messages by default in the error logKristofer Pettersson2008-10-071-13/+0
| | | | | | | | | | | | | | The event scheduler logged start-, stop-execution messages in the error log on lowest log-warning level which would lead to very large log files in a short time. This patch changes this behavior so that no start-/stop-messages are logged. Log messages stating successful execution are also removed. sql/event_scheduler.cc: * Removed logging for start-/stop-events. * Removed log-messages stating successful execution of events.
* merge of bug #37943 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2008-10-013-2/+99
|\
| * Bug#37943: Reproducible mysqld crash/sigsegv in sel_trees_can_be_oredGeorgi Kodinov2008-10-013-1/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When analyzing the possible index use cases the server was re-using an internal structure. This is wrong, as this internal structure gets updated during the analysis. Fixed by making a copy of the internal structure for every place it needs to be used. Also stopped the generation of empty SEL_TREE structures that unnecessary complicate the analysis. mysql-test/r/index_merge.result: Bug#37943: test case mysql-test/t/index_merge.test: Bug#37943: test case sql/opt_range.cc: Bug#37943: - Make copy constructors for SEL_TREE and sub-structures and use them when OR-ing trees. - don't generate empty SEL_TREEs. Return NULL instead.
* | BUG#38269: pushbuild gives valgrind error in ha_statistic_increment for ↵Sven Sandberg2008-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | rpl_temporary Re-enabling failing test case because server logs were lost in pushbuild, so we need to run it again. mysql-test/suite/rpl/t/disabled.def: Re-enabling failing test case because server logs were lost in pushbuild, so we need to run it again.
* | null merge of the 5.0-bugteam symlink test failure fixGeorgi Kodinov2008-10-010-0/+0
|\ \ | |/
| * fixed a failure in symlink.test caused by replacing rm with remove_fileGeorgi Kodinov2008-10-011-1/+5
| |
* | fixed a win32 warning caused by the fix for bug #35981Georgi Kodinov2008-10-011-1/+1
| |
* | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2008-10-011-2/+2
|\ \ | |/
| * fixed a wrong directory in distinct.testGeorgi Kodinov2008-10-011-2/+2
| |
| * merged 5.0-main -> 5.0-bugteamGeorgi Kodinov2008-10-011-2/+2
| |\
| | * Raise version number after cloning 5.0.70unknown2008-09-191-2/+2
| | |
| * | merged 5.0-5.1.29-rc into 5.0-bugteamGeorgi Kodinov2008-10-015-13/+38
| |\ \
* | \ \ merged 5.1-5.1.29-rc -> 5.1-bugteamGeorgi Kodinov2008-10-0136-137/+1946
|\ \ \ \
| * | | | Bug#34306: Can't make copy of log tables when server binary log is enabledDavi Arnaut2008-09-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-merge bug fix: lock_type is a enumeration type and not a bit mask. sql/sql_cache.cc: Check for lock type explicitly. Also err on the safe side and invalidate the query cache for any write lock.
| * | | | Merge from parent branch.Davi Arnaut2008-09-291-2/+10
| |\ \ \ \
| | * | | | BUG#35843 Slow replication slave when using partitioned myisam tableHe Zhenxing2008-09-261-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to improve the performance when replicating to partitioned myisam tables with row-based format, the number of rows of current rows log event is estimated and used to setup storage engine for bulk inserts.
| * | | | | Bug#34306: Can't make copy of log tables when server binary log is enabledDavi Arnaut2008-09-2912-15/+310
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that when statement-based replication was enabled, statements such as INSERT INTO .. SELECT FROM .. and CREATE TABLE .. SELECT FROM need to grab a read lock on the source table that does not permit concurrent inserts, which would in turn be denied if the source table is a log table because log tables can't be locked exclusively. The solution is to not take such a lock when the source table is a log table as it is unsafe to replicate log tables under statement based replication. Furthermore, the read lock that does not permits concurrent inserts is now only taken if statement-based replication is enabled and if the source table is not a log table. include/thr_lock.h: Introduce yet another lock type that my get upgraded depending on the binary log format. This is not a optimal solution but can be easily improved later. mysql-test/r/log_tables.result: Add test case result for Bug#34306 mysql-test/suite/binlog/r/binlog_stm_row.result: Add test case result for Bug#34306 mysql-test/suite/binlog/t/binlog_stm_row.test: Add test case for Bug#34306 mysql-test/t/log_tables.test: Add test case for Bug#34306 sql/lock.cc: Assert that TL_READ_DEFAULT is not a real lock type. sql/mysql_priv.h: Export new function. sql/mysqld.cc: Remove using_update_log. sql/sql_base.cc: Introduce function that returns the appropriate read lock type depending on how the statement is going to be replicated. It will only take a TL_READ_NO_INSERT log if the binary is enabled and the binary log format is statement-based and the table is not a log table. sql/sql_parse.cc: Remove using_update_log. sql/sql_update.cc: Use new function to choose read lock type. sql/sql_yacc.yy: The lock type is now decided at open_tables time. This old behavior was actually misleading as the binary log format can be dynamically switched and this would not change for statements that have already been parsed when the binary log format is changed (ie: prepared statements).
| * | | | merge (update of local branch before push)Mattias Jonsson2008-09-204-4/+23
| |\ \ \ \
| | * | | | fixed a problem with the push of bug #31434Georgi Kodinov2008-09-191-3/+3
| | | | | |
| | * | | | merge of bug 39353 5.0-5.1.29-rc -> 5.1-5.1.29-rcGeorgi Kodinov2008-09-193-1/+20
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | merged 5.0-5.1.29-rc into B39353 treeGeorgi Kodinov2008-09-1917-907/+102
| | | |\ \ \
| | | | * \ \ auto-mergeTatiana A. Nurnberg2008-09-1615-895/+84
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | * | | | Bug #39353: Multiple conditions on timestamp column crashes serverGeorgi Kodinov2008-09-183-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for bug 31887 was incomplete : it assumes that all the field types returned by the IS_NUM macro are descendants of Item_num and tries to zero-fill the values before doing constant substitution with such fields when they are compared to constant string values. The only exception to this is Field_timestamp : it's in the IS_NUM macro, but is not a descendant of Field_num. Fixed by excluding timestamp fields (Field_timestamp) when zero-filling when converting the constant to compare with to a string. Note that this will not exclude the timestamp columns from const propagation. mysql-test/r/compare.result: Bug #39353: test case mysql-test/t/compare.test: Bug #39353: test case sql/item.cc: Bug #39353: don't zero-fill timestamp fields when const propagating to a string : they'll be converted to a string in a date/time format and not as an integer.
| * | | | | | Bug#30573: Ordered range scan over partitioned tables returns some rows twiceMattias Jonsson2008-09-184-90/+159
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Bug#33555: Group By Query does not correctly aggregate partitions Backport of bug-33257 which is the same bug. read_range_*() calls was not passed to the partition handlers, but was translated to index_read/next family calls. Resulting in duplicates rows and wrong aggregations. mysql-test/r/partition_range.result: Bug#30573: Ordered range scan over partitioned tables returns some rows twice Updated result file mysql-test/t/partition_range.test: Bug#30573: Ordered range scan over partitioned tables returns some rows twice Re-enabled the test sql/ha_partition.cc: Bug#30573: Ordered range scan over partitioned tables returns some rows twice backport of bug-33257, correct handling of read_range_* calls, without converting them to index_read/next calls sql/ha_partition.h: Bug#30573: Ordered range scan over partitioned tables returns some rows twice backport of bug-33257, correct handling of read_range_* calls, without converting them to index_read/next calls
| * | | | | Post-push fix for bug #26020: User-Defined Variables are not consistence ↵Gleb Shchepa2008-09-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with columns data types. --ps-protocol problem has been fixed. sql/item_func.cc: Added update of Item_func_set_user_var::entry->update_query_id for every PS execution.
| * | | | | Bug#26020: User-Defined Variables are not consistent withGleb Shchepa2008-09-188-12/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | columns data types The "SELECT @lastId, @lastId := Id FROM t" query returns different result sets depending on the type of the Id column (INT or BIGINT). Note: this fix doesn't cover the case when a select query references an user variable and stored function that updates a value of that variable, in this case a result is indeterminate. The server uses incorrect assumption about a constantness of an user variable value as a select list item: The server caches a last query number where that variable was changed and compares this number with a current query number. If these numbers are different, the server guesses, that the variable is not updating in the current query, so a respective select list item is a constant. However, in some common cases the server updates cached query number too late. The server has been modified to memorize user variable assignments during the parse phase to take them into account on the next (query preparation) phase independently of the order of user variable references/assignments in a select item list. mysql-test/r/user_var.result: Added test case for bug #26020. mysql-test/t/user_var.test: Added test case for bug #26020. sql/item_func.cc: An update of entry and update_query_id variables has been moved from Item_func_set_user_var::fix_fields() to a separate method, Item_func_set_user_var::set_entry(). sql/item_func.h: 1. The Item_func_set_user_var::set_entry() method has been added to update Item_func_set_user_var::entry. 2. The Item_func_set_user_var::entry_thd field has beend added to update Item_func_set_user_var::entry only when needed. sql/sql_base.cc: Fix: setup_fiedls() calls Item_func_set_user_var::set_entry() for all items from the thd->lex->set_var_list before the first call of ::fix_fields(). sql/sql_lex.cc: The lex_start function has been modified to reset the st_lex::set_var_list list. sql/sql_lex.h: New st_lex::set_var_list field has been added to memorize all user variable assignments in the current select query. sql/sql_yacc.yy: The variable_aux rule has been modified to memorize in-query user variable assignments in the st_lex::set_var_list list.
| * | | | | auto-mergeTatiana A. Nurnberg2008-09-1629-915/+164
| |\ \ \ \ \
| * \ \ \ \ \ Bug#35981: ALTER EVENT causes the server to change the PRESERVE option.Tatiana A. Nurnberg2008-09-116-2/+247
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If [NOT] PRESERVE was not given, parser always defaulted to NOT PRESERVE, making it impossible for the "not given = no change" rule to work in ALTER EVENT. Leaving out the PRESERVE-clause defaults to NOT PRESERVE on CREATE now, and to "no change" in ALTER. mysql-test/r/events_2.result: show that giving no PRESERVE-clause to ALTER EVENT results in no change. show that giving no PRESERVE-clause to CREATE EVENT defaults to NOT PRESERVE as per the docs. Show specifically that this is also handled correctly when trying to ALTER EVENTs into the past. mysql-test/t/events_2.test: show that giving no PRESERVE-clause to ALTER EVENT results in no change. show that giving no PRESERVE-clause to CREATE EVENT defaults to NOT PRESERVE as per the docs. Show specifically that this is also handled correctly when trying to ALTER EVENTs into the past. sql/event_db_repository.cc: If ALTER EVENT was given no PRESERVE-clause (meaning "no change"), we don't know the previous PRESERVE-setting by the time we check the parse-data. If ALTER EVENT was given dates that are in the past, we don't know how to react, lacking the PRESERVE-setting. Heal this by running the check later when we have actually read the previous EVENT-data. sql/event_parse_data.cc: Change default for ON COMPLETION to indicate, "not specified." Also defer throwing errors when ALTER EVENT is given dates in the past but not PRESERVE-clause until we know the previous PRESERVE-value. sql/event_parse_data.h: Add third state for ON COMPLETION [NOT] PRESERVE (preserve, don't, not specified). Make check_dates() public so we can defer this check until deeper in the callstack where we have all the required data. sql/sql_yacc.yy: If CREATE EVENT is not given ON COMPLETION [NOT] PRESERVE, we default to NOT, as per the docs.
| | * | | | | | Bug#35981: ALTER EVENT causes the server to change the PRESERVE option.Tatiana A. Nurnberg2008-08-186-2/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If [NOT] PRESERVE was not given, parser always defaulted to NOT PRESERVE, making it impossible for the "not given = no change" rule to work in ALTER EVENT. Leaving out the PRESERVE-clause defaults to NOT PRESERVE on CREATE now, and to "no change" in ALTER. mysql-test/r/events_2.result: show that giving no PRESERVE-clause to ALTER EVENT results in no change. show that giving no PRESERVE-clause to CREATE EVENT defaults to NOT PRESERVE as per the docs. Show specifically that this is also handled correctly when trying to ALTER EVENTs into the past. mysql-test/t/events_2.test: show that giving no PRESERVE-clause to ALTER EVENT results in no change. show that giving no PRESERVE-clause to CREATE EVENT defaults to NOT PRESERVE as per the docs. Show specifically that this is also handled correctly when trying to ALTER EVENTs into the past. sql/event_db_repository.cc: If ALTER EVENT was given no PRESERVE-clause (meaning "no change"), we don't know the previous PRESERVE-setting by the time we check the parse-data. If ALTER EVENT was given dates that are in the past, we don't know how to react, lacking the PRESERVE-setting. Heal this by running the check later when we have actually read the previous EVENT-data. sql/event_parse_data.cc: Change default for ON COMPLETION to indicate, "not specified." Also defer throwing errors when ALTER EVENT is given dates in the past but not PRESERVE-clause until we know the previous PRESERVE-value. sql/event_parse_data.h: Add third state for ON COMPLETION [NOT] PRESERVE (preserve, don't, not specified). Make check_dates() public so we can defer this check until deeper in the callstack where we have all the required data. sql/sql_yacc.yy: If CREATE EVENT is not given ON COMPLETION [NOT] PRESERVE, we default to NOT, as per the docs.
| * | | | | | | Bug#31434 mysqldump dumps view as tableTatiana A. Nurnberg2008-09-114-13/+1091
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump creates stand-in tables before dumping the actual view. Those tables were of the default type; if the view had more columns than that (a pathological case, arguably), loading the dump would fail. We now make the temporary stand-ins MyISAM tables to prevent this. client/mysqldump.c: When creating a stand-in table, specify its type to avoid defaulting to a type with a column-number limit (like Inno). The type is always MyISAM as we know that to be available. mysql-test/r/mysqldump-max.result: add test results for 31434 mysql-test/r/mysqldump.result: mysqldump sets engine-type (MyISAM) for stand-in tables for views now. Update test results. mysql-test/t/mysqldump-max.test: Show that mysqldump's stand-in tables for views explicitly set engine-type to MyISAM to avoid falling back on an engine that might support fewer columns than the final view requires (here's lookin' at you, inno). Also show that this actually has the desired effect by dumping and reloading a view that has more columns than inno supports.
| | * | | | | | Bug#31434 mysqldump dumps view as tableTatiana A. Nurnberg2008-09-112-12/+18
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump creates stand-in tables before dumping the actual view. Those tables were of the default type; if the view had more columns than that (a pathological case, arguably), loading the dump would fail. We now make the temporary stand-ins MyISAM tables to prevent this. client/mysqldump.c: When creating a stand-in table, specify its type to avoid defaulting to a type with a column-number limit (like Inno). The type is always MyISAM as we know that to be available. mysql-test/r/mysqldump.result: mysqldump sets engine-type (MyISAM) for stand-in tables for views now. Update test results.
* | | | | | | automergePatrick Crews2008-09-301-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bug#38311 Some tests use 'rm' which is not portablePatrick Crews2008-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Repush of change to fix tests on Pushbuild.
| * | | | | | automergePatrick Crews2008-09-304-11/+39
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge from main branch.Davi Arnaut2008-09-3011-106/+169
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 5.0 -> 5.1Patrick Crews2008-09-3011-106/+169
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | AutomergePatrick Crews2008-09-307-3/+68
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Bug#38311 - Fix of some cruft from remove_files in ndb_autodiscover.test, ↵Patrick Crews2008-09-237-99/+156
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up of distinct.test, and replacing error numbers with error names.
| | * | | | | | | | | Bug#38311 Some tests use 'rm' which is not portablePatrick Crews2008-09-2012-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Substituted use of MTR's remove_file function in the tests Started with 5.0 tree and will clean up any offenders discovered during upmerge.
* | | | | | | | | | | Bug#38727: BUILD/compile-solaris-* scripts should compile MySQL with libmtmallocDavi Arnaut2008-09-304-7/+8
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link with mtmalloc on Solaris as it is done in our release builds. Replace deprecated flag with the newer option as already done in other scripts. BUILD/compile-solaris-amd64-forte: Link to mtmalloc and replace deprecated flag. BUILD/compile-solaris-amd64-forte-debug: Replace deprecated flag. BUILD/compile-solaris-sparc: Link to mtmalloc. BUILD/compile-solaris-sparc-forte: Link to mtmalloc
* | | | | | | | | | manual merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-09-304-11/+39
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Fixed bug #17823: 'arc' directories inside database directories.Gleb Shchepa2008-09-304-11/+39
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server created "arc" directories inside database directories and maintained there useless copies of .frm files. Creation and renaming procedures of those copies as well as creation of "arc" directories has been discontinued. Removal procedure has been kept untouched to be able to cleanup existent database directories by the DROP DATABASE query. Also view renaming procedure has been updated to remove these directories. sql/parse_file.cc: Fixed bug #17823: 'arc' directories inside database directories. View/table creation and renaming procedures maintained backup copies of .frm files. Those copies are unused yet, so this feature was incomplete and unnecessary. 1. Unwanted code has been hidden by FRM_ARCHIVE ifdefs (the FRM_ARCHIVE macro is not defined). 2. Renaming procedure has been modified to remove obsolete "arc" directories. sql/parse_file.h: Fixed bug #17823: 'arc' directories inside database directories. The "thd" parameter has been added to the rename_in_schema_file() function. sql/sql_db.cc: Fixed bug #17823: 'arc' directories inside database directories. Scope of the mysql_rm_arc_files() function has been changed to global for use from the parse_file.cc file. sql/sql_view.cc: Fixed bug #17823: 'arc' directories inside database directories. Added the "thd" argument to rename_in_schema_file() calls.
* | | | | | | | | mergingAlexey Botchkov2008-09-303-1/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Bug#37949 Crash if argument to SP is a subquery that returns more than one row Alexey Botchkov2008-09-293-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JOIN for the subselect wasn't cleaned if we came upon an error during sub_select() execution. That leads to the assertion failure in close_thread_tables() part of the 6.0 code backported per-file comments: mysql-test/r/sp-error.result Bug#37949 Crash if argument to SP is a subquery that returns more than one row test result mysql-test/t/sp-error.test Bug#37949 Crash if argument to SP is a subquery that returns more than one row test case sql/sp_head.cc Bug#37949 Crash if argument to SP is a subquery that returns more than one row lex->unit.cleanup() call added if not substatement
* | | | | | | | | AutomergeKristofer Pettersson2008-09-2518-135492/+135621
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ mergeMattias Jonsson2008-09-2312-135378/+135568
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or ↵Mattias Jonsson2008-09-1812-135378/+135568
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory) It is a very big test and as such it takes a lot of time. Solution is to divide the test in two parts, one for testing increasing column size and one for decreasing size. The innodb branch does extended tests (that myisam is not) due to the $do_pk_tests variabel, that is the reason why the innodb branch takes longer. No increase of memory usage in innodb was found when analyzing, (tested with looping some millions time of create/drop and alter commands) The memory exhaust discovered in the test is due to mysqltest which stores the result in memory (result-file) and this was the biggest result file in the test framework, so by dividing the test into two parts also cuts the memory usage of mysqltest. mysql-test/suite/parts/inc/partition_alter2_1.inc: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/inc/partition_alter2_2.inc: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_1_innodb.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_1_myisam.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_2_innodb.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_2_myisam.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/disabled.def: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Removed the test completely (since it has never been supported) mysql-test/suite/parts/t/partition_alter2_1_innodb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_1_myisam.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_2_innodb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_2_myisam.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_ndb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Removing test since ndb has never supported these tests
| * | | | | | | | | | merge of changesPatrick Crews2008-09-222-59/+49
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat ↵Magnus Svensson2008-09-222-59/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more robust mysql-test/lib/mtr_cases.pl: forward port the algorithm to check if a binlog format is supported mysql-test/mysql-test-run.pl: Don't use dynamic setting of binlog format - does not work
| * | | | | | | | | | | Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more ↵Patrick Crews2008-09-224-55/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robust Trimmed some error-prone and variable portions of the test and added 'flush status' to ensure deterministic test