summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removing copyright headers from test filesBjorn Munch2011-10-19126-1827/+0
|\
| * Remove copyright header from parser_stack.testBjorn Munch2011-10-191-15/+0
| |
* | Merge the changes of 5.5.17 back into main 5.5Joerg Bruehe2011-10-192-3/+14
|\ \
| * | Exclude NDB man pages from a source tarball,Joerg Bruehe2011-10-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these sources don't have any current NDB. man/CMakeLists.txt: This will need to be modified as soon as NDB is added to the 5.5 sources, then the man page exclusion should be controlled by the build option also governing NDB use.
| * | Transferring a change from main 5.5 into the 5.5.17 build:Joerg Bruehe2011-09-3031-859/+367
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revision-id: inaam.rana@oracle.com-20110930110219-vnpaqghj9hm0grds | parent: rohit.kalhans@oracle.com-20110930094635-hjhrv55tg6z6pz7y | committer: Inaam Rana <inaam.rana@oracle.com> | branch nick: mysql-5.5 | timestamp: Fri 2011-09-30 07:02:19 -0400 | message: | Revert original fix for Bug 12612184 and the follow up fix for | Bug 12704861. | | Bug 12704861 fix was revno: 3504.1.1 (rb://693) | Bug 12612184 fix was revno: 3445.1.10 (rb://678)
| * | Transferring a change from main 5.5 into the 5.5.17 build:Joerg Bruehe2011-09-301-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revision-id: rafal.somla@oracle.com-20110929150216-jl3y54s54w04y2vu | parent: marko.makela@oracle.com-20110929123146-03lcg1vixncyviyn | committer: Rafal Somla <rafal.somla@oracle.com> | branch nick: bug12982926 | timestamp: Thu 2011-09-29 17:02:16 +0200 | message: | Bug#12982926 CLIENT CAN OVERRIDE ZERO-LENGTH-ALLOCATE BUFFER | | Changes in client plugin needed for testing the issue (test instrumentation).
| * | Fix the spec file: Files must not be mentioned twice in a "%files" list.Joerg Bruehe2011-09-281-2/+5
| | |
* | | Bug #11754855 46528: NEED A WAY TO PASS A VARIABLE TO MTR COMMANDSunknown2011-10-193-1/+49
| | | | | | | | | | | | | | | | | | | | | modified function do_get_error in mysqltest.cc to handle multiple variable passed added test case to mysqltest.test to verify handling to multiple errors passed
* | | Merge of fix for bug#13102538 from mysql-5.1.Nirbhay Choubey2011-10-185-5/+0
|\ \ \ | | |/ | |/|
| * | Bug#13102538 : COMPILE ERROR ON SOLARIS WHEN COMPILINGNirbhay Choubey2011-10-185-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH LIBEDIT Libedit won't build on platforms that do not provide "sys/cdefs.h". Removed the inclusion of cdefs.h from all files other that sys.h, which includes this file only when the header is found while configuring.
* | | BUG#12968567: mysql_plugin : incorrect return from bootstrap failureunknown2011-10-171-2/+1
| | | | | | | | | | | | | | | | | | | | | This patch corrects a defect whereby the bootstrap_server() method was returning 0 instead of the error code generated. The code has been changed to return the correct value returned from the bootstrap command.
* | | BUG#12968815: mysql_plugin : disable requires plugin name but doesn't use itunknown2011-10-173-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects a defect in the building of the DELETE commands for disabling a plugin whereby only the original plugin data was deleted. If there were other plugins, the delete did not remove the rows. The code has been changed to remove all rows from the mysql.plugin table that were inserted when the plugin was loaded. The test has also been changed to correctly identify if all rows have been deleted.
* | | Introduced this code to make the gcc 4.6.1 compiler happy. WhenAlfranio Correia2011-10-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | warnings are converted to errors, the compiler complains about the fact that binlog_can_be_corrupted is defined but never used. We need to check if this is a dead code or if someone removed any code by mistake.
* | | Merge of changeset of WL#5945 from mysql-5.1.Nirbhay Choubey2011-10-1452-2989/+5373
|\ \ \ | |/ /
| * | WL#5945 : Improve libedit libraryNirbhay Choubey2011-10-1452-2994/+5373
| | | | | | | | | | | | | | | Updated libedit library.
* | | automergeSergey Glukhov2011-10-1216-424/+276
|\ \ \
| * \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-1216-424/+276
| |\ \ \ | | |/ /
| | * | Bug#13006367 62487: innodb takes 3 minutes to clean up the adaptiveMarko Mäkelä2011-10-1217-386/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash index at shutdown btr_search_disable(): Just drop the entire adaptive hash index, without dropping every record separately. buf_pool_clear_hash_index(): Renamed and simplified from buf_pool_drop_hash_index(). Set block->index = NULL for every block in the buffer pool. Do not release the btr_search_latch. The caller will have to adjust other data structures. Remove block->is_hashed. It is redundant, should be always equal to block->index != NULL. Remove btr_search_fully_disabled, btr_search_enabled_mutex, and SYNC_SEARCH_SYS_CONF. We drop the AHI in one pass, without releasing the btr_search_latch in between. Replace void* with const rec_t* and add assertions on btr_search_latch and btr_search_enabled to ha0ha.h, ha0ha.ic, ha0ha.c. page_set_max_trx_id(): Ignore the adaptive hash index. I forgot to push this in rb:750. btr0sea.c: Always after acquiring btr_search_latch, check for block->index==NULL or !btr_search_enabled. We can now set block->index=NULL while only holding btr_search_latch in exclusive mode. Always acquire btr_search_latch before reading block->index, except in shortcuts when testing for block->index == NULL. ha_clear(), ha_search(): Unused function, remove. buf_page_peek_if_search_hashed(): Remove. This function may avoid latching a page at the cost of doing a duplicate buf_pool->page_hash lookup. rb:775 approved by Inaam Rana
* | | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULTSergey Glukhov2011-10-129-2/+109
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When temporary tables is used for result sorting result field for gconcat function is created using group_concat_max_len size. It leads to result truncation when character_set_results is multi-byte character set due to insufficient tmp table field size. The fix is to increase temporary table field size for gconcat. Method make_string_field() is overloaded for Item_func_group_concat class and uses max_characters * collation.collation->mbmaxlen size for result field. max_characters is maximum number of characters what can fit into max_length size. mysql-test/r/ctype_utf16.result: test result mysql-test/r/ctype_utf32.result: test result mysql-test/r/ctype_utf8.result: test result mysql-test/t/ctype_utf16.test: test case mysql-test/t/ctype_utf32.test: test case mysql-test/t/ctype_utf8.test: test case sql/item.h: make Item::make_string_field() virtual sql/item_sum.cc: added Item_func_group_concat::make_string_field(TABLE *table) method which uses max_characters * collation.collation->mbmaxlen size for result item. max_characters is maximum number of characters what can fit into max_length size. sql/item_sum.h: added Item_func_group_concat::make_string_field(TABLE *table) method
* | | merge 5.1 -> 5.5Vinay Fisrekar2011-10-1232-11/+96
|\ \ \ | |/ / | | | | | | adjust/modify tests as they were failing if system time zone is set differently.
| * | bug#11766457 - adjusting/modifying the the tests as tests were failing if ↵Vinay Fisrekar2011-10-1232-11/+96
| | | | | | | | | | | | system time zone is set differently.
* | | Test "file_contents" failed in non-community RPMs on SuSEJoerg Bruehe2011-10-101-6/+6
| | | | | | | | | | | | | | | | | | because the search pattern for the "INFO_*" files was not general enough: Fixed.
* | | Bug#12912112 MYSQL_CLIENT_TEST FAILS ON TEST_TRUNCATION Magne Mahre2011-10-061-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sun Studio 12 has an error when calculating the compile-time length of a constant character string. The error is only present when building an optimized 32-bits version, using the -xbuiltin=(%all) compiler flag. During compilation, the compiler recognizes the use of the strlen() function used on a constant string. It optimizes the strlen and replaces it with the actual length of the string. This optimization seems to calculate the length wrongly in this particular case. Replacing the "const char *" with a "const char []" solves the problem.
* | | null upmergeBjorn Munch2011-10-050-0/+0
|\ \ \ | |/ /
| * | merge 5.1-mtr => 5.1Bjorn Munch2011-10-0520-70/+9
| |\ \
* | \ \ merge 5.5-mtr => 5.5Bjorn Munch2011-10-0531-130/+52
|\ \ \ \
| * | | | Silly mistake in gdb output: replaced print with resfile_print,Bjorn Munch2011-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but the latter only takes one argument, duh! Fixed by concatenating the args (replace , with .)
| * | | | Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET ↵Bjorn Munch2011-10-0525-57/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INNODB_FILE_FORMAT_CHECK This is a redo for 5.5 Added 'innodb_file_format_max' as variable to ignore change to. Tests that had to restore this amended Two tests assumed it to be Antelope, make sure these run on a freshly started server
| | * | | backporting 11766169, fixing 13034450Bjorn Munch2011-10-031-2/+5
| | | | |
| | * | | Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET ↵Bjorn Munch2011-09-2719-68/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INNODB_FILE_FORMAT_CHECK Added 'innodb_file_format_check' as variable to ignore change to. Tests that had to restore this amended Two tests assumed it to be Antelope, make sure these run on a freshly started server For 5.5, apparently innodb_file_format_max is the one to ignore
| * | | | mtr: print which suites are used, unless explicit test namesBjorn Munch2011-10-031-0/+1
| | | | |
| * | | | mtr --help: add --boot-xxx and sort some debug optionsBjorn Munch2011-09-291-3/+6
| | | | |
| * | | | removed some duplicate/redundant entries from .bzrignoreBjorn Munch2011-09-291-68/+0
| | | | |
| * | | | Bug #12373393 PB2 SHOULD ALLOW TO CREATE COLLECTIONS AS SUPER SET OF ↵Bjorn Munch2011-09-294-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EXISTING COLLECTIONS Let CMake parse files with a ".in" suffix containing includes Added default.release.in to replace default.release Explained in README New patch: replace 'include' with '#include' to avoid accidental matches
* | | | | automergeSergey Glukhov2011-10-050-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | automergeSergey Glukhov2011-10-054-0/+8
| |\ \ \ \
* | \ \ \ \ automergeSergey Glukhov2011-10-052-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-052-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Add InnoDB UNIV_SYNC_DEBUG assertions to rw-lock code.Marko Mäkelä2011-10-054-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rw_lock_x_lock_func(): Assert that the thread is not already holding the lock in a conflicting mode (RW_LOCK_SHARED). rw_lock_s_lock_func(): Assert that the thread is not already holding the lock in a conflicting mode (RW_LOCK_EX).
* | | | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-10-055-3/+48
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Bug#11747970 34660: CRASH WHEN FEDERATED TABLE LOSES CONNECTION DURING ↵Sergey Glukhov2011-10-055-3/+48
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSERT ... SELECT Problematic query: insert ignore into `t1_federated` (`c1`) select `c1` from `t1_local` a where not exists (select 1 from `t1_federated` b where a.c1 = b.c1); When this query is killed in another connection it could lead to crash. The problem is follwing: An attempt to obtain table statistics for subselect table in killed query fails with an error. So JOIN::optimize() for subquery is failed but it does not prevent further subquery evaluation. At the first subquery execution JOIN::optimize() is called (see subselect_single_select_engine::exec()) and fails with an error. 'executed' flag is set to TRUE and it prevents further subquery evaluation. At the second call JOIN::optimize() does not happen as 'JOIN::optimized' is TRUE and in case of uncacheable subquery the 'executed' flag is set to FALSE before subquery evaluation. So we loose 'optimize stage' error indication (see subselect_single_select_engine::exec()). In other words 'executed' flag is used for two purposes, for error indication at JOIN::optimize() stage and for an indication of subquery execution. And it seems it's wrong as the flag could be reset. mysql-test/r/error_simulation.result: test case mysql-test/t/error_simulation.test: test case sql/item_subselect.cc: added new flag subselect_single_select_engine::optimize_error which is used for error detection which could happen at optimize stage. sql/item_subselect.h: added new flag subselect_single_select_engine::optimize_error sql/sql_select.cc: test case
* | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Correct the ChangeLogMarko Mäkelä2011-10-041-3/+4
| | | | |
| * | | | Merge to current mysql-5.1unknown2011-10-041-22/+51
| |\ \ \ \
* | \ \ \ \ Merge with current mysql-5.5unknown2011-10-041-27/+54
|\ \ \ \ \ \
| * \ \ \ \ \ Upmerge of a merge changeset - empty.Joerg Bruehe2011-10-040-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge to main.Joerg Bruehe2011-10-041-22/+51
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge to main.Joerg Bruehe2011-10-041-27/+54
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ↵Joerg Bruehe2011-10-041-27/+54
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DOES NOT WORK Upmerge from 5.1 to 5.5
| | | * | | | | | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ↵Joerg Bruehe2011-10-041-22/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DOES NOT WORK Change the RPM spec file so that each RPM "obsoletes" the corresponding RPMs of all (other) configurations, so a "server" RPM of any configuration can replace the "server" RPM of any other configuration on a "rpm -U".