summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug #40360: Binlog related errors with binlog offMats Kindahl2008-11-033-1/+32
| | | | | | | | | | | | | | | | | | When statement-based replication is used, and the transaction isolation level is READ-COMMITTED or stricter, InnoDB will print an error because statement-based replication might lead to inconsistency between master and slave databases. However, when the binary log is not engaged, this is not an issue and an error should not be printed. This patch makes thd_binlog_format() return BINLOG_FORMAT_ UNSPEC when the binary log is not engaged for the given thread. mysql-test/t/innodb_mysql.test: Adding test that no error message is printed from inside InnoDB when the binary log is turned off.
* Bug#39451 Debug builds broken with Sun Studio compilerKristofer Pettersson2008-10-212-2/+2
| | | | | | | | Debug builds of MySQL 5.1, 6.0 with Sun Studio 12 broke because of use of gcc specific feature. The fix is to replace __FUNCTION__ with the corresponding character string
* Raise version number after cloning 5.1.29-rcunknown2008-10-101-1/+1
|
* manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcGleb Shchepa2008-10-094-1/+239
|\
| * Bug#38499: flush tables and multitable table update withGleb Shchepa2008-10-094-1/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | derived table cause crash When a multi-UPDATE command fails to lock some table, and subsequently succeeds, the tables need to be reopened if they were altered. But the reopening procedure failed for derived tables. Extra cleanup has been added. mysql-test/r/lock_multi.result: Added test case for bug #38499. mysql-test/t/lock_multi.test: Added test case for bug #38499. sql/sql_union.cc: Bug#38499: flush tables and multitable table update with derived table cause crash Obsolete assertion has been removed. sql/sql_update.cc: Bug#38499: flush tables and multitable table update with derived table cause crash Extra cleanup for derived tables has been added: 1) unit.cleanup(), 2) unit->reinit_exec_mechanism().
* | set back version to 5.1.29Georgi Kodinov2008-10-091-1/+1
| |
* | WL4403: --general_log and --slow_query_log don't turn on the logging.Georgi Kodinov2008-10-092-4/+1
| | | | | | | | | | Fixed a compilation warning
* | fixed a compile warning in 5.1-5.1.29-rcGeorgi Kodinov2008-10-081-0/+5
| |
* | fixed a compilation problem in 5.1-5.1.29-rcGeorgi Kodinov2008-10-081-2/+2
| |
* | Fix for bug#39585: innodb and myisam corruption after binary Ramil Kalimullin2008-10-082-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrade from <=5.0.46 to >=5.0.48 Problem: 'check table .. for upgrade' doesn't detect incompatible collation changes made in 5.0.48. Fix: check for incompatible collation changes. sql/handler.cc: Fix for bug#39585: innodb and myisam corruption after binary upgrade from <=5.0.46 to >=5.0.48 - check for incompatible collation changes made in 5.0.48: bug #29461 latin7_general_ci latin7_general_cs latin7_estonian_cs latin2_hungarian_ci koi8u_general_ci cp1251_ukrainian_ci cp1250_general_ci bug #29499, bug #27562 ascii_general_ci
* | Merging with 5.1-5.1.29-rcMats Kindahl2008-10-0847-72221/+3291
|\ \
| * \ merged 5.1-5.1.29-rc -> 5.1-bugteamGeorgi Kodinov2008-10-081-0/+6
| |\ \
| | * | Bug#37453: Dropping/creating index on partitioned table withMattias Jonsson2008-10-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB Plugin locks table This is a pre fix update that does the change to the handler api. This is done since there are already changes in this version, so the real fix does not need to change the api. sql/handler.h: Bug#37453: Dropping/creating index on partitioned table with InnoDB Plugin locks table The check for which alter table flags a handler have is done through the handlerton, which will not work correctly for any partitioned table. It must be through the handler interface. To be able to fix this I have to add a virtual function to the handler class.
| * | | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2008-10-081-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | disabled a randomly failing test and opened a bug report
| | * | merged 5.0-5.1.29-rc -> 5.0-bugteamGeorgi Kodinov2008-10-089-24/+201
| | |\ \
| * | \ \ merged 5.1-5.1.29-rc -> 5.1-bugteamGeorgi Kodinov2008-10-0810-26/+204
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | fixed test suite failures in 5.1-bugteamGeorgi Kodinov2008-10-074-0/+9
| | | | |
| * | | | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2008-10-071-1/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merged 5.0-5.1.29-rc -> 5.0-bugteamGeorgi Kodinov2008-10-076-8/+82
| | |\ \ \
| * | \ \ \ merged 5.1-5.1.29-rc -> 5.1-bugteamGeorgi Kodinov2008-10-0769-215/+6462
| |\ \ \ \ \
| * \ \ \ \ \ Merge fix of autoconf substitution of string containing single quotes.Chad MILLER2008-10-061-9/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix autoconf substitution and evaluation of a string inside single quotesChad MILLER2008-10-061-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that if the substitution contains single-quotes, the program will fail.
| * | | | | | Merge fix for bug 11122.Chad MILLER2008-10-061-15/+18
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge fix for bug 11122.Chad MILLER2008-10-061-15/+18
| | |\ \ \ \ \
| | | * | | | | Remove part of comment for b-g#11122 that is no longer true.Chad MILLER2008-10-061-6/+1
| | | | | | | |
| | | * | | | | Bug#11122: Server won't always start when cold-booting after a crashChad MILLER2008-10-021-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The grep expression that finds a running "mysqld" program fails if the "mysqld_safe" is running with the same PID. Now, excise "ps" output that has the word " grep" or "mysqld_safe" in it, to be a little more certain that the matched process is not a false positive hit. This will fail when the path to mysqld contains either of those two names, which should be acceptable. Additionally, some text to search could be truncated if very long. Expand the number of lines "ps" emits.
| * | | | | | | Merge fix for join-testcase failure.Chad MILLER2008-10-062-6/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge fix for join-testcase failure.Chad MILLER2008-10-062-6/+6
| | |\ \ \ \ \ \
| | | * | | | | | Fix for test for b-g#35754 which fails based on hostname ?= "localhost".Chad MILLER2008-10-062-6/+6
| | | | | | | | |
| * | | | | | | | mergingAlexey Botchkov2008-10-062-2/+6
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ mergeMattias Jonsson2008-10-062-2/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#38120: main.partition fails sporadicallyMattias Jonsson2008-09-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sporadic failures due to full disk. Fix by truncating general_log before altering it. (if running the full main-test, it can be big). mysql-test/r/partition.result: Bug#38120: main.partition fails sporadically updated result file mysql-test/t/partition.test: Bug#38120: main.partition fails sporadically Truncating general_log before altering it. (if running the full main-test, it can be big when altering it).
| * | | | | | | | | | Bug#38083 Error-causing row inserted into partitioned table despite errorAlexey Botchkov2008-10-065-127/+203
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problems are located in the sql_partition.cc where functions calculation partition_id don't expect error returned from item->val_int(). Fixed by adding checks to these functions. Note - it tries to fix more problems than just the reported bug. per-file comments: modified: mysql-test/r/partition.result Bug#38083 Error-causing row inserted into partitioned table despite error test result mysql-test/t/partition.test Bug#38083 Error-causing row inserted into partitioned table despite error test case sql/opt_range.cc Bug#38083 Error-causing row inserted into partitioned table despite error get_part_id() call fixed sql/partition_info.h Bug#38083 Error-causing row inserted into partitioned table despite error get_subpart_id_func interface changed. sql/sql_partition.cc Bug#38083 Error-causing row inserted into partitioned table despite error various functions calculationg partition_id and subpart_id didn't expect an error returned from item->val_int(). Error checks added.
| | | | | | | | | |
| | \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ Merge of fixes for Bug#36874,#38427,#37744,#38762Matthias Leich2008-10-0415-72062/+2737
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | with actual tree
| | | * | | | | | | | Fix for Bug#36874 : main.slow_launch_time_func test failsMatthias Leich2008-10-022-97/+72
| | | | | | | | | | |
| | | * | | | | | | | Merge 5.0 -> 5.1 of fix for Bug#38427Matthias Leich2008-10-021-1/+7
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Data too long" in some configurations, tests "<ENGINE>_func_view" fail
| | | * \ \ \ \ \ \ \ \ Merge 5.0 -> 5.1 of fix forMatthias Leich2008-10-022-7/+12
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#38762 main.federated_bug_25714 fails sporadically
| | | * | | | | | | | | | Fix for Bug#37744 Expected result of "<engine>_storedproc" testMatthias Leich2008-10-0110-71957/+2646
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is inconsistent + several improvements Details: - The subtest with assignment of floating point numbers to DECIMAL parameters in functions and procedures checks now that the final DECIMAL value is the same as if we assign the floating point numbers to columns, user variables etc. = The impact of math libs or truncation must be the same. - Remove storage engine variants of this test because the stored procedure properties tested do not depend on the storage engine. Use the fastest storage engine (MEMORY) for any tables needed. - reset global sort_buffer_size to startup value - Partially improved formatting.
| | * | | | | | | | | | | Merge of fixes for Bug#38427 and Bug#38762 into actual treeMatthias Leich2008-10-043-1/+24
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (no conflicts)
| | | * | | | | | | | | | Fix for Bug#38427 "Data too long" in some configurations,Matthias Leich2008-10-021-1/+7
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests "<ENGINE>_func_view" fail
| | | * | | | | | | | | Fix for Bug#38762 main.federated_bug_25714 fails sporadicallyMatthias Leich2008-10-022-0/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Merge fix for Bug#35754.Chad MILLER2008-10-033-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge fix for Bug#35754.Chad MILLER2008-10-035-23/+27
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug#35754: mysql_install_db does not work if no hostname is setChad MILLER2008-09-245-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Machines with hostname set to "localhost" cause uniqueness errors in the SQL bootstrap data. Now, insert zero lines for cases where the (lowercased) hostname is the same as an already-inserted 'localhost' name. Also, fix a few tests that expect certain local accounts to have a certain host name.
| * | | | | | | | | | | merge with the main 5.1-bugteamAndrei Elkin2008-10-033-22/+37
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bug#37481: status.test fails randomlyDavi Arnaut2008-10-032-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the test was trying to obtain a lock on a table in one connection without ensuring that a insert which was executed in another connection had released the lock on the same table. The solution is to add a dummy select query after the insert to ensure that the table is unlocked and closed by the time it tries to lock it again. This is enough to prevent test failures described in the bug report. As an extra safety measure, concurrent inserts are disabled. Remove comments that calculated the Table_locks_immediate. This value is not tested anymore and it's calculation did not reflect the actual value. mysql-test/r/status.result: Update test case result. mysql-test/t/status.test: Issue a dummy select to ensure that tables are unlocked after a insert and disable concurrent inserts as a extra-safety.
| | * | | | | | | | | | | Wrap function used for debugging with the DBUG_OFF condition.Davi Arnaut2008-10-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function uses a variable only available under debug mode.
| * | | | | | | | | | | | Bug #28786 binlog_killed.test fails: 'reset master' does not reset binloggingAndrei Elkin2008-10-031-0/+11
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test failed originally -- did not reset binlogging - for the reason identified by bug@15580. However it never can be run on the embedded platfrom for yet another cause - the embedded can not KILL query. Comments added to the test particularly relating `reset master' to the mentioned bug. mysql-test/suite/binlog/t/binlog_killed.test: adding commets explaining why the test has to have include/not_embedded.inc guard.
| * | | | | | | | | | | Merge from main branch.Davi Arnaut2008-10-0212-97/+295
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge fix for 38629 from 5.0Vladislav Vaintroub2008-10-021-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /