summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a comment for thd->proc_info.Konstantin Osipov2009-07-221-0/+4
|
* auto-merge mysql-5.1-bugteam (local) -> mysql-5.1-bugteam.Evgeny Potemkin2009-07-193-38/+45
|\
| * auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam Alfranio Correia2009-07-193-38/+45
| |\
| | * BUG#46129 Failing mixed stm (with trans and non-trans tables) causes wrong ↵Alfranio Correia2009-07-183-38/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seq in binlog The fix for BUG 43929 introduced a regression issue. In a nutshell, when a statement that changes a non-transactional table fails, it is written to the binary log with the error code appended. Unfortunately, after BUG 43929, this failure was flushing the transactional chace causing mismatch between execution and logging histories. To fix this issue, we avoid flushing the transactional cache when a commit or rollback is not issued.
* | | Merged fix for the bug#46051.Evgeny Potemkin2009-07-194-0/+48
|\ \ \ | |/ / |/| |
| * | Merged corrected fix for the bug#46051.Evgeny Potemkin2009-07-183-4/+3
| |\ \
| | * | Bug#46051: Incorrectly market field caused wrong result.Evgeny Potemkin2009-07-183-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When during the optimization an item is moved to the upper select the item's context left unchanged. This caused wrong result in the PS/SP mode. The Item_ident::remove_dependence_processor now sets the context of the select to which the item is moved to. mysql-test/r/subselect.result: The test case for the bug#46051 is adjusted. mysql-test/t/subselect.test: The test case for the bug#46051 is adjusted. sql/item.cc: Bug#46051: Incorrectly market field caused wrong result. The Item_ident::remove_dependence_processor now sets the context of the select to which the item is moved to.
| * | | Merged fix for the bug#46051.Evgeny Potemkin2009-07-173-0/+50
| |\ \ \ | | |/ /
| | * | Bug#46051: Incorrectly market field caused wrong result.Evgeny Potemkin2009-07-163-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a subselect all fields from outer selects are marked as dependent on selects they are belong to. In some cases optimizer substitutes it for an equivalent expression. For example "a_field IN (SELECT outer_field)" is substituted with "a_field = outer_field". As we moved the outer_field to the upper select it's not really outer anymore. But it was left marked as outer. If exists an index over a_field optimizer choose wrong execution plan and thus return wrong result. Now the Item_in_subselect::single_value_transformer function removes dependent marking from fields when a subselect is optimized away. mysql-test/r/subselect.result: Added a test case for the bug#46051. mysql-test/t/subselect.test: Added a test case for the bug#46051. sql/item_subselect.cc: Bug#46051: Incorrectly market field caused wrong result. Now the Item_in_subselect::single_value_transformer function removes dependent marking from fields when a subselect is optimized away.
* | | | Bug #45214 get_master_version_and_clock does not report error when queries failunknown2009-07-172-2/+1
| | | | | | | | | | | | | | | | Append the patch for resolving the problems, which have been brought by commiting bug#45214.
* | | | Auto mergeunknown2009-07-179-22/+103
|\ \ \ \ | | |_|/ | |/| |
| * | | automergeGeorgi Kodinov2009-07-163-9/+26
| |\ \ \ | | |/ /
| | * | Bug #46042: backported the fix for the valgrind warning from 5.1Georgi Kodinov2009-07-161-3/+3
| | | |
| | * | Bug #46003 and bug #46034: backported the fixes from azalea.Georgi Kodinov2009-07-163-9/+26
| | | |
| | * | fixed check-cpu to correctly recognize mac CPUsGeorgi Kodinov2009-07-080-0/+0
| | | |
| * | | null merge the second round of fixes of bug #45287 to 5.1-bugteam.Georgi Kodinov2009-07-160-0/+0
| |\ \ \ | | |/ /
| | * | Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-1614-38/+40
| | | | | | | | | | | | | | | | | | | | | | | | Fixed various compilation warnings when compiling on a 64 bit windows.
| * | | AutomergeKristofer Pettersson2009-07-1625-87/+334
| |\ \ \
| | * \ \ automergeGeorgi Kodinov2009-07-162-18/+77
| | |\ \ \
| | * \ \ \ automergeGeorgi Kodinov2009-07-163-10/+7
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | automergeGeorgi Kodinov2009-07-153-0/+24
| | | |\ \ \
| | | * | | | Bug #45287: phase 1 : 32 bit compilation warningsGeorgi Kodinov2009-07-153-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the following problems: 1. cmake 2.6 warning because of a changed default on how the dependencies to libraries with a specified path are resolved. Fixed by requiring cmake 2.6. 2. Removed an obsolete pre-NT4 hack including defining Windows system defines to alter the behavior of windows.h. 3. Disabled warning C4065 on compiling sql_yacc.cc because of a know incompatibility in some of the newer bison binaries.
| * | | | | | Bug#45781 infinite hang/crash in "opening tables" after handler tries to ↵Kristofer Pettersson2009-07-163-3/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open merge table The MERGE table storage engine does not support the HA_CAN_SQL_HANDLE feature and any attempt to open the merge table will fail with ER_ILLEGAL_HA. After an error occurred the tables that was opened must be closed again or they will be left in an inconsistent state. However, the assumption made in the code for closing and register handler tables was that only one table will be opened, and this is not true for MERGE tables which will cause multiple tables to open. The next time a SELECT operation was issued on the merge table it caused the system to freeze. This patch fixes this issue by making sure that all tables which are opened also are closed in the event of an error. mysql-test/r/merge.result: Added test case for bug 45781 mysql-test/t/merge.test: Added test case for bug 45781 sql/sql_handler.cc: * mysql_ha_open() was never ment to open more than one table. If we encounter more tables, we should close all tables related to the current substatement and raise an exception.
* | | | | | | Bug #45214 get_master_version_and_clock does not report error when queries failunknown2009-07-164-32/+329
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "get_master_version_and_clock(...)" function in sql/slave.cc ignores error and passes directly when queries fail, or queries succeed but the result retrieved is empty. The "get_master_version_and_clock(...)" function should try to reconnect master if queries fail because of transient network problems, and fail otherwise. The I/O thread should print a warning if the some system variables do not exist on master (very old master) mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test: Added test file for bug #45214 mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result: Added test result for bug #45214 mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test: Added test file for bug #45214 sql/slave.cc: The 'is_network_error()' function is added for checking if the error is caused by network. Added a new return value (2) to 'get_master_version_and_clock()' function result set to indicate transient network errors when queries fail, and the caller should try to reconnect in this case.
* | | | | | Bug#44495: Prepared Statement: CALL p(<x>) - `thd->protocol == ↵Davi Arnaut2009-07-152-18/+77
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | &thd->protocol_text' failed Merge Konstantin's patch and add a test case. tests/mysql_client_test.c: Add test case for Bug#44495
| * | | | | A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == ↵Konstantin Osipov2009-07-151-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | &thd->protocol_text' failed" Do not assume that SQL prepared statements always run in text protocol. When invoked from a stored procedure, which is itself invoked by means of prepared CALL statement, the protocol may be binary. Juggle with the protocol only when we want to change it to binary in COM_STMT_EXECUTE, COM_STMT_PREPARE. This is a backport from 5.4/6.0, where the bug was fixed as part of WL#4264 "Backup: Stabilize Service Interface"
* | | | | | Addition to #45998 fix, result adjusted.Ramil Kalimullin2009-07-151-0/+11
| | | | | |
* | | | | | merging with 5.0 bugteam treeAnurag Shekhar2009-07-153-0/+22
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Bug#37740 Server crashes on execute statement with full text search and Anurag Shekhar2009-07-153-0/+24
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match against. Server crashes when executing prepared statement with duplicating MATCH() function calls in SELECT and ORDER BY expressions, e.g.: SELECT MATCH(a) AGAINST('test') FROM t1 ORDER BY MATCH(a) AGAINST('test') This query gets optimized by the server, so the value returned by MATCH() from the SELECT list is reused for ORDER BY purposes. To make this optimization server is comparing items from SELECT and ORDER BY lists. We were getting server crash because comparision function for MATCH() item is not intended to be called at this point of execution. In 5.0 and 5.1 this problem is workarounded by resetting MATCH() item to the state as it was during PREPARE. In 6.0 correct comparision function will be implemented and duplicating MATCH() items from the ORDER BY list will be optimized. mysql-test/r/fulltext.result: Updated with the test case for Bug#37740 mysql-test/t/fulltext.test: A test case for Bug#37740. sql/item_func.h: True initialization of 'table' happens in ::fix_fields(). As Item_func_match::eq() may be called before ::fix_fields(), it is expected that 'table' is initialized to 0 when it is reused. This is mostly affecting prepared statements, when the same item doesn't get destroyed, but rather cleaned up and reused.
* | | | | Auto-mergeRamil Kalimullin2009-07-153-1/+24
|\ \ \ \ \
| * | | | | Fix for bug#45998: database crashes when runningRamil Kalimullin2009-07-143-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "create as select" (innodb table) Problem: code constructing "CREATE TABLE..." statement doesn't take into account that current database is not set in some cases. That may lead to a server crash. Fix: check if current database is set. mysql-test/extra/binlog_tests/binlog.test: Fix for bug#45998: database crashes when running "create as select" (innodb table) - test case. mysql-test/suite/binlog/r/binlog_row_binlog.result: Fix for bug#45998: database crashes when running "create as select" (innodb table) - test result. sql/sql_show.cc: Fix for bug#45998: database crashes when running "create as select" (innodb table) - added check if there's current database set.
* | | | | | Merge in bug fixes for client toolsJim Winstead2009-07-1413-58/+193
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | mysqlcheck failed to fix table names when using the --fix-table-namesJim Winstead2009-05-203-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and --all-in-1 options together. (Bug #31821)
| * | | | | mysqladmin --count=X --sleep=Y would always delay Y seconds after the lastJim Winstead2009-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iteration before exiting. (Bug #42639)
| * | | | | The mysql command-line client would include superfluous spaces at the end ofJim Winstead2009-05-203-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some result set lines. (Bug #29622)
| * | | | | Fix warning in use of strlen().Jim Winstead2009-05-201-1/+2
| | | | | |
| * | | | | Table identifiers and file names were not quoted and escaped correctly byJim Winstead2009-05-193-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqlimport. (Bug #28071)
| * | | | | mysql_upgrade ignored the --basedir and --datadir arguments as it has no useJim Winstead2009-05-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for them, but it did so silently. (Bug #36558)
| * | | | | The mysql command-line client didn't implement the readline magic-spaceJim Winstead2009-05-191-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command, which bash does, which could result in a user accidentally disabling the use of the space key in the mysql command-line client. (Bug #27439)
| * | | | | mysqlslap didn't correctly handle --csv with no argument. (Bug #44412)Jim Winstead2009-05-181-2/+6
| | | | | |
| * | | | | mysqladmin did not have enough space allocated for tracking all variablesJim Winstead2009-05-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using --vertical or --relative with extended-status. (Bug #40395) This patch simply increases the buffer size and adds an assert to check that it is big enough -- a more comprehensive fix would dynamically allocate the appropriate buffers.
| * | | | | The output of mysqldump --tab for views included a DROP TABLE statementJim Winstead2009-05-183-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without the IF EXISTS qualifier even though no temporary table is created as for all-in-one dumps including views. (Bug #37377)
* | | | | | merge 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-07-141-1/+1
|\ \ \ \ \ \
| * | | | | | Raise version number after cloning 5.1.37unknown2009-07-131-1/+1
| | | | | | |
| * | | | | | merge tree name changemysql-5.1.37clone-5.1.37-buildGeorgi Kodinov2009-07-131-1/+1
| |\ \ \ \ \ \
| | * | | | | | tree name changedGeorgi Kodinov2009-07-131-1/+1
| | | | | | | |
* | | | | | | | merge 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-07-140-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | automergeGeorgi Kodinov2009-07-1481-1446/+798
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | automergeGeorgi Kodinov2009-07-145-20/+233
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge bug fixesJim Winstead2009-07-135-20/+233
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |