summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* test result updated to match [incorrect] mysql result.Sergei Golubchik2010-11-051-1/+1
| | | | mysql bug#58011
* mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-0594-1163/+2031
|\
| * bumped up the versionGeorgi Kodinov2010-11-031-1/+1
| |
| * Merge from mysql-5.1.52-releaseunknown2010-11-01155-1815/+4059
| |\
| | * Fix bug #57345unknown2010-10-113-3/+31
| | |
| | * Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine".Jimmy Yang2010-10-067-0/+114
| | | | | | | | | | | | | | | rb://477 approved by Marko
| | * merge of 5.1-bugteam into 5.1-securityGeorgi Kodinov2010-10-06148-1803/+3837
| | |\
| | | * mergeGeorgi Kodinov2010-10-052-14/+78
| | | |\
| | | | * Bug #56428: Replace copyright notice removed from SHA1 code (.h)Georgi Kodinov2010-10-051-2/+35
| | | | |
| | | | * Bug #56427 : Replace copyright notice removed from SHA1 codeGeorgi Kodinov2010-10-051-12/+43
| | | | |
| | | * | mergedGeorgi Kodinov2010-10-052-138/+136
| | | | |
| | | * | merged 5.0-bugteam into 5.1-bugteamGeorgi Kodinov2010-10-052-3/+11
| | | |\ \ | | | | |/
| | | | * Disable NDB tests to run by default.Georgi Kodinov2010-10-053-5/+14
| | | | |
| | | | * mergeGeorgi Kodinov2010-10-050-0/+0
| | | | |\
| | | * | \ merged mysql-5.1 into mysql-5.1-bugteamGeorgi Kodinov2010-10-0548-133/+813
| | | |\ \ \
| | | * \ \ \ Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-047-72/+105
| | | |\ \ \ \
| | | | * | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-044-36/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | row_search_for_mysql(): Acquire an intention lock on the table before locking the first record gap.
| | | | * | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-043-36/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | row_search_for_mysql(): Acquire an intention lock on the table before locking the first record gap.
| | | | * | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-10-045-681/+681
| | | | |\ \ \ \
| | | * | | | | | Small test fix after 56753Bjorn Munch2010-10-031-2/+2
| | | | | | | | |
| | | * | | | | | merge from 5.1-mtrBjorn Munch2010-10-038-36/+149
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #20304 mysqltest: reap with no preceding statement hangs foreverBjorn Munch2010-10-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added sanity check, similar to the one preventing send without reap
| | | | * | | | | | Bug #52828 Tests that use perl fail when perl is not in pathBjorn Munch2010-09-302-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to run perl fails, just like it does when perl is started but fails Trap the case that perl was not found/could not be started, and skip test Also force a restart of servers since test may already have done something mtr now also appends path of current perl to PATH to aid mysqltest
| | | | * | | | | | Small test fix after 56753Bjorn Munch2010-09-301-2/+2
| | | | | | | | | |
| | | | * | | | | | merge from 5.1Bjorn Munch2010-09-29251-2437/+3535
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Bug #56125 MTR2 start-and-exit removes server tmpdir, server becomes not ↵Bjorn Munch2010-09-281-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operational This happens when creating new tmpdir due to too long socket path Don't delete it if --start-and-exit, but warn user to do it.
| | | | * | | | | | | Bug #56921 It should be possible to log connection statements in mysqltestBjorn Munch2010-09-223-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --enable-connect-log, somewhet similar to --enable-query-log If query log is disabled, disable connect log too Also some related cleanup in mysqltest.test: removing duplicate test loop
| | | | * | | | | | | test fixes after 56753Bjorn Munch2010-09-212-3/+12
| | | | | | | | | | |
| | | | * | | | | | | Bug #55426 mysqltest crashes when trying to unlock not acquired mutexBjorn Munch2010-09-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up: don't call pthread_join() on Windows This change only valid for 5.1
| | | | * | | | | | | Bug #56753 mtr silently ignores junk after backticksBjorn Munch2010-09-155-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stepping backward to end of `` expression, check for illegal chars
| | | | * | | | | | | Bug #55426 mysqltest crashes when trying to unlock not acquired mutexBjorn Munch2010-09-141-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #55546 mysqltest fails to create a new thread on HPUX Missing call to pthread_join(), in embedded mode This independently solves both problems, see 55426 for details. Addendum: cannot test against a pthread_t, adds boolean flag instead
| | | | * | | | | | | Bug #56647 Valgrind warnings for memory leak in mysqltest.ccBjorn Munch2010-09-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved an init_dynamic_string() from before to after potential die()
| | | * | | | | | | | Automerge.Alexey Kopytov2010-10-0176-962/+1421
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ mergeMattias Jonsson2010-10-018-9/+120
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | | * | | | | | | mergeMattias Jonsson2010-10-013-7/+48
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Bug#55458: Partitioned MyISAM table gets crashed by multi-table updateMattias Jonsson2010-09-303-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#57113: ha_partition::extra(ha_extra_function): Assertion `m_extra_cache' failed Fix for bug#55458 included DBUG_ASSERTS causing debug builds of the server to crash on another multi-table update. Removed the asserts since they where wrong. (updated after testing the patch in 5.5). mysql-test/r/partition.result: updated result mysql-test/t/partition.test: Added test for bug#57113 sql/ha_partition.cc: Removed the assert for m_extra_cache when ::extra(HA_PREPARE_FOR_UPDATE) was called.
| | | | | * | | | | | | | mergeMattias Jonsson2010-10-016-2/+72
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Bug#51851: Server with SBR locks mutex twice onMattias Jonsson2010-10-016-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOAD DATA into partitioned MyISAM table Problem was that both partitioning and myisam used the same table_share->mutex for different protections (auto inc and repair). Solved by adding a specific mutex for the partitioning auto_increment. Also adding destroying the ha_data structure in free_table_share (which is to be propagated into 5.5). This is a 5.1 ONLY patch, already fixed in 5.5+.
| | | | * | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-0152-227/+458
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | / / / / | | | | | | |_|_|_|/ / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Fix Bug#56340 innodb updates index stats too frequently after non-index updatesVasil Dimov2010-09-302-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a simple optimization issue. All stats are related to only indexed columns, index size or number of rows in the whole table. UPDATEs that touch only non-indexed columns cannot affect stats and we can avoid calling the function row_update_statistics_if_needed() which may result in unnecessary I/O. Approved by: Marko (rb://466)
| | | | | * | | | | | | | Fix a potential bug when using __sync_lock_test_and_set()Vasil Dimov2010-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TYPE __sync_lock_test_and_set (TYPE *ptr, TYPE value, ...) it is not documented what happens if the two arguments are of different type like it was before: the first one was lock_word_t (byte) and the second one was 1 or 0 (int). Approved by: Marko (via IRC)
| | | | | * | | | | | | | Increment InnoDB Plugin version to 1.0.13.Vasil Dimov2010-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB Plugin 1.0.12 has been released with MySQL 5.1.51.
| | | | | * | | | | | | | Silence a GCC warning about reaching the end of non-void funcVasil Dimov2010-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spotted by: Marko
| | | | | * | | | | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-09-28193-1555/+4766
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix typo, should be UNIV_SYNC_DEBUG.Vasil Dimov2010-09-151-4/+4
| | | | | | | | | | | | | |
| | | | | * | | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warning: trx/trx0undo.c: In function 'trx_undo_truncate_end': trx/trx0undo.c:1069:14: error: variable 'rseg' set but not used [-Werror=unused-but-set-variable]
| | | | | * | | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warning: trx/trx0undo.c: In function 'trx_undo_set_state_at_prepare': trx/trx0undo.c:1871:16: error: variable 'page_hdr' set but not used [-Werror=unused-but-set-variable]
| | | | | * | | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warning: trx/trx0trx.c: In function 'trx_prepare_off_kernel': trx/trx0trx.c:1808:11: error: variable 'update_hdr_page' set but not used [-Werror=unused-but-set-variable]
| | | | | * | | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warning: trx/trx0sys.c: In function 'trx_sys_create_doublewrite_buf': trx/trx0sys.c:244:15: error: variable 'new_block' set but not used [-Werror=unused-but-set-variable]
| | | | | * | | | | | | | | (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6Vasil Dimov2010-09-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warnings: trx/trx0roll.c: In function 'trx_undo_arr_remove_info': trx/trx0roll.c:744:9: error: variable 'n' set but not used [-Werror=unused-but-set-variable] trx/trx0roll.c:743:9: error: variable 'n_used' set but not used [-Werror=unused-but-set-variable]
View Lorry Controller Status