summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge of mysql-5.1 into mysql-5.5.Davi Arnaut2011-03-143-1/+26
|\
| * Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion ↵Davi Arnaut2011-03-143-1/+26
| | | | | | | | | | | | `!_entered' failed. Add a missing DBUG_RETURN function test_if_number().
* | Bug#11858960 - WINDOWS SERVICE FAILING TO START IMMEDIATELY AFTER Magne Mahre2011-03-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSTALLATION When starting mysqld as an MS Windows NT service, it crashed with "Error 1067: The process terminated unexpectedly". The problem is that thread local variables are not allocated and initialized properly when started as a service. When the server is started as a regular executable, the problem does not occur. Analysis showed that this is a regression after the patch for Bug#11765237/Bug#11763065. Before, the thread local storage was initialized by the call chain: win_main->my_basic_init->my_thread_basic_global_init-> my_thread_init When the my_init() structure was changed, this initialization was moved from win_main to mysqld_main. When started as a service win_main is run in a separate thread, which does not have mysqld_main in its call path, so my_thread_init is never called for this thread. Added a call to my_thread_init / my_thread_end in the service handler function, which solves the problem.
* | A patch for Bug#11765297 (58251 - archive_plugin and blackhole_pluginAlexander Nozdrin2011-03-144-0/+22
| | | | | | | | | | | | | | | | | | | | | | fails when running with ps-protocol). The problem was that when running in --ps-protocol mode mysqltest.cc didn't close created prepared statements. So, the plugins could not be unistalled because there was a prepared statement using them. A fix is to add a dummy statement that forces mysqltest.cc to close the last prepared statement (which uses a plugin-defined table).
* | Fight a problem in internal test builds:Joerg Bruehe2011-03-111-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a RPM test build in a non-release branch is done, the $MYSQL_BINDIR variable ends in "/usr" (rather than in "/usr/lib" as in a RPM release build), this made test "file_contents" fail. A branch for this case is added to the test. The test result is unchanged. mysql-test/t/file_contents.test: Fight a problem in internal test builds: When a RPM test build in a non-release branch is done, the $MYSQL_BINDIR variable ends in "/usr" (rather than in "/usr/lib" as in a RPM release build), this made test "file_contents" fail. Because of this, the old logic did not recognize that a RPM build is done (trailing '/' missing!) and took the tar.gz branch. Just removing the trailing '/' from the "/usr" is not enough, as the logic for RPMs used to replace "/lib" which is not present at all; rather, a new branch was added. To help in case of future problems, the error messages for a failing "open()" now also report "$MYSQL_BINDIR".
* | null upmergeBjorn Munch2011-03-110-0/+0
|\ \ | |/
| * merge from 5.1-mtrBjorn Munch2011-03-1167-11/+124
| |\
* | \ merge from 5.5-mtrBjorn Munch2011-03-1190-24/+264
|\ \ \
| * \ \ null upmergeBjorn Munch2011-03-110-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge from 5.1 mainBjorn Munch2011-03-1110-56/+534
| | |\ \
| * | \ \ merge from 5.5 mainBjorn Munch2011-03-1125-91/+1015
| |\ \ \ \
| * | | | | Add extra line after unit test report in MTRBjorn Munch2011-03-081-2/+5
| | | | | |
| * | | | | null upmergeBjorn Munch2011-03-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | merge from 5.1 mainBjorn Munch2011-03-0814-12/+152
| | |\ \ \ \
| * | \ \ \ \ merge from 5.5 mainBjorn Munch2011-03-0873-294/+991
| |\ \ \ \ \ \
| * | | | | | | Fix non-portable test of %p in unit test my_vsnprintfBjorn Munch2011-03-021-1/+4
| | | | | | | |
| * | | | | | | Attempt at solving missing end of mtr output on WindowsBjorn Munch2011-02-281-0/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Attempt at solving missing end of mtr output on WindowsBjorn Munch2011-02-281-0/+2
| | | | | | | |
| * | | | | | | mtr: ignore not finding ctest if in PB2Bjorn Munch2011-02-251-1/+2
| | | | | | | |
| * | | | | | | vs-config option to ctest made not dependent on WindowsBjorn Munch2011-02-241-2/+2
| | | | | | | |
| * | | | | | | null upmergeBjorn Munch2011-02-240-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge from 5.1 mainBjorn Munch2011-02-2459-641/+1930
| | |\ \ \ \ \ \
| * | | | | | | | 11762407 follow-up fixes to a few testsBjorn Munch2011-02-244-0/+4
| | | | | | | | |
| * | | | | | | | merge from 5.5 mainBjorn Munch2011-02-24163-1584/+4506
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 11766640 follow-up: fix for VS_CONFIG on WindowsBjorn Munch2011-02-242-4/+7
| | | | | | | | | |
| * | | | | | | | | Upmerge 11762407 (54999) with additionsBjorn Munch2011-02-2380-17/+152
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION ↵Bjorn Munch2011-02-2366-11/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UNEXPECTED ERRORS Removed the global suppression, added lots of local ones to affected tests Re-commit, now kept "Slave SQL" at start of patterns.
| * | | | | | | | | Bug #11766640 (59789) Hook the invocation of unit tests in MTR.Bjorn Munch2011-02-217-6/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added code to call 'ctest' if the needed cmake file is present Will do so unless tests/suited named on mtr command line Also add option to turn on/off Will be made to look like a test 'unit-test' which counts towards total Extracts summary report and any test failures from ctest output Addendum: added override to turn off in PB, add back in selected invocations
| * | | | | | | | | null upmergeBjorn Munch2011-02-090-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge from 5.1Bjorn Munch2011-02-0969-385/+1120
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ merge from 5.5Bjorn Munch2011-02-0984-452/+1225
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ merge from mysql5.1 for bug#11760210Mayank Prasad2011-03-114-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS ↵Mayank Prasad2011-03-114-1/+34
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LIKE 'SSL_CIPHER_LIST'" Issue: SSL_CIPHER set to a specific CIPHER name was not getting picked up by SHOW STATUS Command. Solution: If specific cipher name is specified, avoid overwriting of Cipher List with default Cipher names. extra/yassl/src/yassl_int.cpp: If user specified Cipher name is there, avoid populating default cipher names' list. mysql-test/r/ssl_cipher.result: Expected file for ssl_cipher.test test case mysql-test/t/ssl_cipher-master.opt: Server option file for ssl_cipher.test test case. mysql-test/t/ssl_cipher.test: Test case to verify that user specified SSL cipher name is shown in SHOW STATUS Command.
* | | | | | | | | | | Test cleanupMarc Alff2011-03-112-4/+32
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Reworked the test case to be more robust.Marc Alff2011-03-102-67/+173
| | | | | | | | | |
* | | | | | | | | | Local mergeMarc Alff2011-03-105-5/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes inAlexander Nozdrin2011-03-105-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pre-locking list caused by triggers). The thing is that CREATE TRIGGER / DROP TRIGGER may actually change pre-locking list of (some) stored routines. The SP-cache does not detect such changes. Thus if sp_head-instance is cached in SP-cache, subsequent executions of the cached sp_head will use inaccurate pre-locking list. The patch is to invalidate SP-cache on CREATE TRIGGER / DROP TRIGGER.
* | | | | | | | | | | Local mergeMarc Alff2011-03-1086-370/+1548
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Skip tests in disabled-daily.listAnitha Gopi2011-03-101-13/+13
| | | | | | | | | | |
| * | | | | | | | | | Skip the tests listed in disabled-weekly.listAnitha Gopi2011-03-101-7/+7
| | | | | | | | | | |
| * | | | | | | | | | Bug11817185# : Disabled MAIN.ARCHIVE-BIG.TESTAnitha Gopi2011-03-101-0/+1
| | | | | | | | | | |
| * | | | | | | | | | mergeMattias Jonsson2011-03-093-0/+82
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge of Bug#11766232 - bug#59297Mattias Jonsson2011-03-093-0/+82
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#59297: Can't find record in 'tablename' on update inner joinMattias Jonsson2011-01-243-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced in bug#52455. Problem was that the fixed function did not set the last used partition variable, resulting in wrong partition used when storing the position of the newly retrieved row. Fixed by setting the last used partition in ha_partition::index_read_idx_map.
| * | | | | | | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-097-56/+454
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | merge mysql-5.0->mysql-5.1Georgi Kodinov2011-03-090-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ merge mysql-5.0-secrutiy-fixed -> mysql-5.0Georgi Kodinov2011-03-096-54/+452
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge from mysql-5.1.56-releaseunknown2011-03-037-56/+452
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | null weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-02-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | merge 5.0->5.0-securityGeorgi Kodinov2011-02-102-4/+5
| | | | |\ \ \ \ \ \ \ \ \