summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug #13817703 - auto_increment_offset != 1 + innodb_autoinc_lock_mode=1 => ↵Sunny Bains2012-03-293-128/+174
| | | | | | | | | | | | bulk inserts fail Fix the calculation of the next autoinc value when offset > 1. Some of the results have changed due to the changes in the allocation calculation. The new calculation will result in slightly bigger gaps for bulk inserts. rb://866 Approved by Jimmy Yang. Backported from mysql-trunk (5.6)
* Bug#13898343 THREAD LOOPS ENDLESSLY IN LF_PINBOX_PUT_PINS WHILE HOLDINGMarc Alff2012-03-282-21/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCK_THREAD_COUNT When using the performance schema file io instrumentation in MySQL 5.5, a thread would loop forever inside lf_pinbox_put_pins, when disconnecting. It would also hold LOCK_thread_count while doing so, effectively killing the server. The root cause of the loop in lf_pinbox_put_pins() is a leak of LF_PINS, when used with the filename_hash LF_HASH table in the performance schema. This fix contains the following changes: 1) Added the missing call to lf_hash_search_unpin(), to prevent the leak. 2) In mysys/lf_alloc-pin.c, there was some extra debugging code (MY_LF_EXTRA_DEBUG) written to detect precisely this kind of issues, but it was never used. Replaced MY_LF_EXTRA_DEBUG with DBUG_OFF, so that leaks similar to this one can be always detected in regular debug builds. 3) Backported the fix for the following bug, from 5.6 to 5.5: Bug#13417446 - 63339: INCORRECT FILE PATH IN PEFORMANCE_SCHEMA ON WINDOWS
* Merge from 5.1 to 5.5Praveenkumar Hulakund2012-03-286-48/+106
|\
| * Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVEPraveenkumar Hulakund2012-03-286-48/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analysis: ------------------------------- According to the Manual (http://dev.mysql.com/doc/refman/5.1/en/identifier-case-sensitivity.html): "Column, index, stored routine, and event names are not case sensitive on any platform, nor are column aliases." In other words, 'lower_case_table_names' does not affect the behaviour of those identifiers. On the other hand, trigger names are case sensitive on some platforms, and case insensitive on others. 'lower_case_table_names' does not affect the behaviour of trigger names either. The bug was that SHOW statements did case sensitive comparison for stored procedure / stored function / event names. Fix: Modified the code so that comparison in case insensitive for routines and events for "SHOW" operation. As part of this commit, only fixing the test failures due to the actual code fix.
* | Merge from mysql-5.1.Sunny Bains2012-03-282-3/+3
|\ \ | |/
| * Merge from mysql-5.0Sunny Bains2012-03-284-8/+8
| |\
| | * Bug# 13847885 - PURGING STALLS WHEN PURGE_SYS->N_PAGES_HANDLED OVERFLOWSSunny Bains2012-03-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change the type of purge_sys_t::n_pages_handled and purge_sys_t::handle_limit to ulonglong from ulint. On a 32 bit system doing ~700 deletes per second the counters can overflow in ~3.5 months, if they are 32 bit. Approved by Jimmy Yang over IM.
* | | merge 5.1 => 5.5Tor Didriksen2012-03-274-1/+112
|\ \ \ | |/ /
| * | Backport of fix for Bug#12763207 - ASSERT IN SUBSELECT::SINGLE_VALUE_TRANSFORMERTor Didriksen2012-03-274-1/+112
| | |
* | | Merge from 5.1 to 5.5Praveenkumar Hulakund2012-03-273-2/+207
|\ \ \ | |/ /
| * | Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVEPraveenkumar Hulakund2012-03-273-2/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analysis: ------------------------------- According to the Manual (http://dev.mysql.com/doc/refman/5.1/en/identifier-case-sensitivity.html): "Column, index, stored routine, and event names are not case sensitive on any platform, nor are column aliases." In other words, 'lower_case_table_names' does not affect the behaviour of those identifiers. On the other hand, trigger names are case sensitive on some platforms, and case insensitive on others. 'lower_case_table_names' does not affect the behaviour of trigger names either. The bug was that SHOW statements did case sensitive comparison for stored procedure / stored function / event names. Fix: Modified the code so that comparison in case insensitive for routines and events for "SHOW" operation.
* | | Bug#13704145: ELIMINATE LRU SCAN WHEN DROPPING A TABLEInaam Rana2012-03-266-91/+365
| | | | | | | | | | | | | | | | | | | | | | | | rb://942 approved by: Marko Makela We don't need to scan LRU for dropping AHI entries when DROPing a table. AHI entries are already removed when we free up extents for the btree.
* | | Merged some fixes from 7.2 release branchesBjorn Munch2012-03-226-8/+34
| | |
* | | Upmerge of empty merge changesets from the release backmerges (5.0.96, 5.1.62).Joerg Bruehe2012-03-210-0/+0
|\ \ \ | |/ / | | | | | | | | | Manually resolved conflicts in ".bzr-mysql/default.conf" (tree name) and in "storage/innodb_plugin" (does not belong into 5.5).
| * | Upmerge an empty merge changeset (backmerge of 5.0.96 into main 5.0),Joerg Bruehe2012-03-210-0/+0
| |\ \ | | |/ | | | | | | solve a conflict in ".bzr-mysql/default.conf".
| | * Merge from mysql-5.0.96-releasekaren.langford@oracle.com2012-03-20101-1042/+2363
| | |\
| * | \ Merge from mysql-5.1.62-releasekaren.langford@oracle.com2012-03-20124-979/+2558
| |\ \ \
* | | | | backport Bug #47707 print some progress messages during shutdown of innodbJimmy Yang2012-03-215-39/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to mysql-5.5 rb://979 approved by Marko
* | | | | Fix tree setup: Wrong mailing list for commit mails.Joerg Bruehe2012-03-201-2/+2
| | | | |
* | | | | Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-20127-963/+2736
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | conflict in "sql/filesort.cc" solved manually.
| * \ \ \ \ Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.Joerg Bruehe2012-03-028-19/+69
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Also, take a syntax fix (C++ style comment in C file) in client/mysqldump.c.
| | * | | | Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1.Joerg Bruehe2012-03-027-17/+67
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Further upgrade the yaSSL library to version 2.2.0Joerg Bruehe2012-03-027-17/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to pick up some new security fixes that are in it. Patch provided by Georgi Kodinov.
| | * | | | AIX builds fail for comments using //Karen Langford2012-02-281-2/+2
| | | | | |
| * | | | | fix for the windows platform for bug: 13788143Hery Ramilison2012-03-011-2/+2
| | | | | |
| * | | | | Upmerge the copyright year change, from 5.1 to 5.5.Joerg Bruehe2012-02-281-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Upmerge the copyright year change, from 5.0 to 5.1.Joerg Bruehe2012-02-281-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | The current year is 2012, and nobody noticed ...Joerg Bruehe2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update the year in the copyright notice, file "README".
| * | | | | addendum to the --builtin-innodb depreacation bug. Fixing test suite output.Georgi Kodinov2012-02-191-1/+2
| | | | | |
| * | | | | Addendum to BUG#13586262 : fixed a wrong test suite outputGeorgi Kodinov2012-02-181-1/+2
| | | | | |
| * | | | | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-180-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1827-583/+1344
| | |\ \ \ \
| * | \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-1830-567/+1327
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-170-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-170-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | merged mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-02-1722-37/+22
| | | |\ \ \ \ \
| | * | \ \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1757-77/+145
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-17132-160/+361
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Upmerge the AIX compile fix into 5.5.Joerg Bruehe2012-02-161-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge compile fix for AIX into delivery tree.Joerg Bruehe2012-02-161-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Compile fix needed for AIX,Joerg Bruehe2012-01-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to work around the lack of a bzero() prototype.
| * | | | | | | | | | | Bug#13633383 63183: SMALL SORT_BUFFER_SIZE CRASH IN MERGE_BUFFERSTor Didriksen2012-02-144-99/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is a backport of some of the cleanups/refactorings that were done as part of WL#1393 Optimizing filesort with small limit.
| * | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-1394-797/+1958
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | merge from 5.0-securityGeorgi Kodinov2012-02-1395-796/+1955
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4Georgi Kodinov2012-02-1095-797/+1956
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $SUBJ$ 1. Took a diff between the previous base version and the mysql sources. 2. Added the new 2.1.4 base version. 3. Reviewed and re-applied the diff from step #1.
| * | | | | | | | | | | mergeGeorgi Kodinov2012-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | mergeGeorgi Kodinov2012-02-103-11/+117
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2012-02-103-11/+116
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge of fix for Bug#11765810.Martin Hansson2012-02-073-11/+116
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug #11765810 58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BYMartin Hansson2012-02-073-11/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IS EXECUTED TWICE FROM P This bug is a duplicate of bug 12567331, which was pushed to the optimizer backporting tree on 2011-06-11. This is just a back-port of the fix. Both test cases are included as they differ somewhat.
View Lorry Controller Status