summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changed names of statistic variables and counting matches instaed of ↵unknown2012-02-2212-65/+65
| | | | rejected rows.
* lp:923429 Crash in decimal_cmp on using UNIX_TIMESTAMP with a wrongly ↵Sergei Golubchik2012-02-214-13/+20
| | | | | | formatted timestamp UNIX_TIMESTAMP() can be null, and returns null for invalid values
* Merge with 5.2Michael Widenius2012-02-211-1/+1
|\
| * Automatic merge with 5.1Michael Widenius2012-02-211-1/+1
| |\
| | * Fixed suppression expression.Michael Widenius2012-02-211-1/+1
| | |
* | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-217-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings found by buildbot Makefile.am: Removed extra empty line cmd-line-utils/libedit/sys.h: Fixed that strndup() doesn't give compiler warnings mysql-test/Makefile.am: Fixes for 'make distcheck' plugin/auth_pam/auth_pam.c: Ensure that prototype for strndup() is included on linux sql/share/Makefile.am: Fixes for 'make distcheck' storage/innodb_plugin/btr/btr0sea.c: Fixed compiler warning support-files/Makefile.am: Fixes for 'make distcheck'
* | | fix forSergei Golubchik2012-02-201-1/+0
| | | | | | | | | | | | | | | | | | "relocation R_X86_64_PC32 against `handler_index_cond_check' can not be used when making a shared object; recompile with -fPIC" don't use visibility=hidden for external functions
* | | Automatic mergeMichael Widenius2012-02-2146-332/+941
|\ \ \
| * \ \ Automatic mergeMichael Widenius2012-02-211-1/+1
| |\ \ \ | | |/ /
| | * | Fixed wrong test caseMichael Widenius2012-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | mysql-test/suite/innodb_plugin/t/innodb_gis.test: Don't run test if innodb_plugin isn't used.
| * | | Automatic mergeMichael Widenius2012-02-212-12/+18
| |\ \ \ | | |/ /
| | * | Merge with 5.1Michael Widenius2012-02-212-4/+4
| | |\ \ | | | |/
| | | * Automatic mergeMichael Widenius2012-02-213-127/+11
| | | |\
| | | | * More general handling of memory loss in dlclose (backported from 5.2)Michael Widenius2012-02-213-127/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed supression in mysql-test-run so it also works on windows. mysql-test/mysql-test-run.pl: Fixed supression so it also works on windows. mysql-test/valgrind.supp: More general handling of memory loss in dlclose (backported from 5.2) sql/signal_handler.cc: Added newlines around link to how to do bug reports
| | * | | Automatic mergeMichael Widenius2012-02-211-0/+6
| | |\ \ \
| | | * | | Added missing signal values to signal_handler.ccMichael Widenius2012-02-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/signal_handler.cc: Added missing signal values.
| | * | | | mergeVladislav Vaintroub2012-02-203-10/+15
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix compilation on Windows, and various Windows related mistakes introduced byVladislav Vaintroub2012-02-201-8/+14
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | "safe exception patch". Remove misleading comments suggesting about signal() Windows, the routine here is part of a exception handler, and sig parameter is an exception code.
| * | | | Merge with MariaDB 5.2Michael Widenius2012-02-2144-328/+931
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge with 5.1Michael Widenius2012-02-202-2/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Fixed compiler warningsMichael Widenius2012-02-202-2/+1
| | | |
| | * | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-2039-302/+846
| | |\ \ | | | |/
| | | * Merge with MYSQL 5.1.61Michael Widenius2012-02-2037-297/+837
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed README with link to source Merged InnoDB change to XtraDB README: Added information of where to find MariaDB code storage/archive/ha_archive.cc: Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
| | | | * Fixes required to build on AIXKaren Langford2012-01-114-6/+6
| | | | |
| | | | * Post push fix for merge.test and mysqlcheck.test on windowsMattias Jonsson2011-12-153-3/+9
| | | | |
| | | | * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-12-159-3/+56
| | | | |\
| | | | | * Bug #13117023: Innodb increments handler_read_key when it should notAnnamalai Gurusami2011-12-137-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The counter handler_read_key (SSV::ha_read_key_count) is incremented incorrectly. The mysql server maintains a per thread system_status_var (SSV) object. This object contains among other things the counter SSV::ha_read_key_count. The purpose of this counter is to measure the number of requests to read a row based on a key (or the number of index lookups). This counter was wrongly incremented in the ha_innobase::innobase_get_index(). The fix removes this increment statement (for both innodb and innodb_plugin). The various callers of the innobase_get_index() was checked to determine if anybody must increment this counter (if they first call innobase_get_index() and then perform an index lookup). It was found that no caller of innobase_get_index() needs to worry about the SSV::ha_read_key_count counter.
| | | | | * Bug#13418887 ERROR IN DIAGNOSTIC FUNCTION PAGE_REC_PRINT()Marko Mäkelä2011-12-123-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When printing information about a ROW_FORMAT=REDUNDANT record, pass the correct flag to rec_get_next_offs(). rb:821 approved by Jimmy Yang
| | | | * | mergeMattias Jonsson2011-12-144-0/+40
| | | | |\ \
| | | | | * \ mergeMattias Jonsson2011-12-145-0/+49
| | | | | |\ \
| | | | | | * | Bug#12361113: CRASH WHEN "LOAD INDEX INTO CACHE" WITH TOOMattias Jonsson2011-12-125-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMALL KEY CACHE The server crashed on division by zero because the key cache was not initialized and the block length was 0 which was used in a division. The fix was to not allow CACHE INDEX if the key cache was not initiallized. Thus never try LOAD INDEX INTO CACHE for an uninitialized key cache. Also added some windows files/directories to .bzrignore.
| | | | * | | | merge 5.1->5.1-security.Georgi Kodinov2011-12-1243-329/+1555
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-push fix: build break on windows/optimized
| | | | | * | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-307-242/+620
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_segfault is the signal handler code of mysqld. however, it makes calls to potentially unsafe functions localtime_r, fprintf, fflush. include/my_stacktrace.h: Add safe versions of itoa() write() and snprintf(). libmysqld/CMakeLists.txt: Move signal handler to separate file. mysys/stacktrace.c: Remove unsafe function calls. sql/CMakeLists.txt: Move signal handler to separate file. sql/Makefile.am: Move signal handler to separate file. sql/mysqld.cc: Move signal handler to separate file. sql/signal_handler.cc: Remove unsafe function calls.
| | | | | * | | Build broken for gcc 4.5.1 in optimized mode.Tor Didriksen2011-11-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readline.cc: In function char* batch_readline(LINE_BUFFER*): readline.cc:60:9: error: out_length may be used uninitialized in this function log.cc: In function int find_uniq_filename(char*): log.cc:1857:8: error: number may be used uninitialized in this function
| | | | | * | | Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGVNirbhay Choubey2011-11-292-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH MYISAM_USE_MMAP ENABLED MySQL server can crash due to segmentation fault when started with myisam_use_mmap. The reason behind this being, while making a request to unmap (munmap) the previously mapped memory (mmap), the size passed was 7 bytes larger than the size requested at the time of mapping. This can eventually unmap the adjacent memory mapped block, belonging to some other memory-map pool. Hence the subsequent call to mmap can map a region which was still a valid memory mapped area. Fixed by removing the extra 7-byte margin which was erroneously added to the size, used for unmappping. storage/myisam/mi_close.c: Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGV WITH MYISAM_USE_MMAP ENABLED Added a condition to call _mi_unmap_file() in case of compressed records. mi_munmap_file() is called otherwise. storage/myisam/mi_packrec.c: Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGV WITH MYISAM_USE_MMAP ENABLED mi_dynmap_file() function, after successfully executing mmap, stores the total size in info->s->mapped_length variable. Now, if mi_dynmap_file() is invoked with a size with an extra 7-byte margin (MEMMAP_EXTRA_MARGIN), the margin will eventually also get stored in mapped_length. So, un-mapping function can simply use the value stored in mapped_length in order to unmap the previously mapped region.
| | | | | * | | BUG#11751793 - 42784: ARCHIVE TABLES CAUSE 100% CPU USAGEAshish Agarwal2011-11-233-9/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AND HANG IN SHOW TABLE STATUS. ISSUE: Table corruption due to concurrent queries. Different threads running insert and check query leads to table corruption. Not properly locked, rows are inserted in between check query. SOLUTION: In check query mutex lock is acquired for a longer time to handle concurrent insert and check query. NOTE: Additionally we backported the fix for CHECKSUM issue(bug#11758979).
| | | | | * | | Disabling main.query_cache_28249.test since this test failsJon Olav Hauglid2011-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sporadically on 5.1. See Bug#12584161. Test runs successfully on 5.5/trunk, so this changeset will be null-merged.
| | | | * | | | auto-merge mysql-5.1->mysql-5.5Georgi Kodinov2011-11-045-4/+12
| | | | |\ \ \ \
| | | | * \ \ \ \ Empty merge from mysql-5.1.Alexander Nozdrin2011-10-270-0/+0
| | | | |\ \ \ \ \
| | | | * | | | | | Raise version number after cloning 5.1.60Karen Langford2011-10-261-1/+1
| | | | | | | | | |
| | | * | | | | | | mergeVladislav Vaintroub2012-02-111-14/+21
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | mtr runs only "big" tests, if --big-test is repeated twiceSergei Golubchik2012-01-252-2/+10
| | | | | | | | | | |
| | | * | | | | | | | report innodb_file_per_table, innodb_flush_log_at_trx_commit, ↵Sergei Golubchik2012-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_flush_method
| | * | | | | | | | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria ↵Michael Widenius2012-02-203-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkpoint execution" This happend when you have more than 1024 open Aria tables during checkpoint. mysql-test/mysql-test-run.pl: Fixed that variable names are consistent between external and internal server. mysql-test/suite/maria/suite.pm: Test for aria-block-size instead of 'aria' as 'aria' is not set for embedded server. This should be ok for aria tests, as aria is never disabled for these. storage/maria/ma_checkpoint.c: Fixed bug when there are more than 1024 open Aria tables during checkpoint.
| | * | | | | | | | | Fixed LP bug #933117.Igor Babaev2012-02-163-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was fixed with the code back-ported from the patch for LP bug 800184 pushed into mariadb-5.3.
| * | | | | | | | | | Fixed issue found by buildbotMichael Widenius2012-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/innodb/t/innodb_bug51920.test: Add another possible connect error
* | | | | | | | | | | BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, ↵Sergey Petrunya2012-02-203-1/+149
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STRAIGHT_JOIN - In mi_rkey(), do correct handling of case where mi_yield_and_check_if_killed() detects that the thread was killed (all other similar functions in MyISAM/Aria have slightly different code and do not have this problem). - Also fixed assignment in DBUG_ASSERT - this is 2nd variant of the fix: = make .result file smaller = run KILLable statements in a separate connection, otherwise we could end up trying to KILL the final "DROP TABLE" statement
* | | | | | | | | | MergeSergey Petrunya2012-02-204-1/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | BUG#933407: Valgrind warnings in mark_as_null_row with ↵Sergey Petrunya2012-02-204-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | materialization+semijoin, STRAIGHT_JOIN, impossible WHERE - In return_zero_rows(), don't call mark_as_null_row() for semi-join materialized tables, because 1) they may have been already freed, and 2)there is no real need to call mark_as_null_row() for them.