summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mdev-212 sporadic main.connect failures in 5.3Sergei Golubchik2012-04-041-1/+1
| | | | | don't cast implicitly an int to a char, when a boolean value is desired.
* Merge in deleted fixesMichael Widenius2012-04-0411-65/+101
|\
| * Fixed test cases that changed as part of fixing bugs with record count and ↵Michael Widenius2012-04-045-35/+35
| | | | | | | | partitioning
| * Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with ↵Michael Widenius2012-04-046-30/+66
|/ | | | | | | | | | | | | | | | | | | | | CSV table, TEXT field" The main problem was a bug in CSV where it provided wrong statistics (it claimed the table was empty when it wasn't) I also fixed wrong freeing of blob's in the CSV handler. (Any call to handler::read_first_row() on a CSV table with blobs would fail) mysql-test/r/csv.result: Added new test case mysql-test/r/partition_innodb.result: Updated test results after fixing bug with impossible partitions and const tables mysql-test/t/csv.test: Added new test case sql/sql_select.cc: Cleaned up code for handling of partitions. Fixed also a bug where we didn't threat a table with impossible partitions as a const table. storage/csv/ha_tina.cc: Allocate blobroot onces.
* Fixed bug lp:967914 "CHECK TABLE persistently reports table corruption after ↵Michael Widenius2012-03-303-1/+25
| | | | | | | | | | | | | removing Aria logs" Fixed that repair removes the 'table is moved' mark. mysql-test/suite/maria/r/maria-autozerofill.result: Test case for lp:967914 mysql-test/suite/maria/t/maria-autozerofill.test: Test case for lp:967914 storage/maria/ha_maria.cc: Fixed that repair removes the 'table is moved' mark.
* fix the test case for windows: replace_result \\ /Sergei Golubchik2012-03-291-0/+3
|
* make the code compile againSergei Golubchik2012-03-291-1/+1
|
* Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-2812-15/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that check/optimize/anaylze did not zerofill the table before they started to work on it. Added one more element to not often used function handler::auto_repair() to allow handler to decide when to auto repair. mysql-test/suite/maria/r/maria-autozerofill.result: Test case for lp:944422 mysql-test/suite/maria/t/maria-autozerofill.test: Test case for lp:944422 sql/ha_partition.cc: Added argument to auto_repair() sql/ha_partition.h: Added argument to auto_repair() sql/handler.h: Added argument to auto_repair() sql/table.cc: Let auto_repair() decide which errors to trigger auto-repair storage/archive/ha_archive.h: Added argument to auto_repair() storage/csv/ha_tina.h: Added argument to auto_repair() storage/maria/ha_maria.cc: Give better error & warning messages for auto-repaired tables. storage/maria/ha_maria.h: Added argument to auto_repair() Always auto-repair in case of moved table. storage/maria/ma_open.c: Remove special handling of HA_ERR_OLD_FILE (this is now handled in auto_repair()) storage/myisam/ha_myisam.h: Added argument to auto_repair()
* lp:933959 Assertion `0' failed in net_end_statement(THD*) on concurrent ↵Sergei Golubchik2012-03-211-0/+2
| | | | | | SELECT FROM I_S.INNODB_SYS_INDEXES and ALTER TABLE Workaround: report a generic error if an I_S plugin failed silently.
* Fix access to uninitialized variable in innodb error message in case ↵Vladislav Vaintroub2012-03-152-2/+2
| | | | WriteFile() fails.
* restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-144-231/+13
| | | | | | use vsnprintf() use write() on windows, not WriteFile or fwrite() localtime_r is still a problem
* LP953714: Fix formatting of the crash messages in signal/exception handlerVladislav Vaintroub2012-03-122-12/+8
|
* Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fieldsMichael Widenius2012-02-243-3/+64
| | | | | | | | | | | | Problem was a crash in internal temporary (Maria) files when row length exceeded 65535 mysql-test/suite/maria/r/maria3.result: Added test case mysql-test/suite/maria/t/maria3.test: Added test case storage/maria/ma_open.c: Added support for row length > 65535. This fixes crash when using tables with longer row lengths.
* Fixed suppression expression.Michael Widenius2012-02-211-1/+1
|
* 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
* | 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.
* Fixed compiler warningsMichael Widenius2012-02-202-2/+1
|
* 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
|\ \ \ \ \ \ \
| * | | | | | | A recent change in the server protocol code broke SSL connection for some ↵Vladislav Vaintroub2012-02-111-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client libraries. Protocol documentation (http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol) says that initial packet sent by client if client wants SSL, consists of client capability flags only (4 bytes or 2 bytes edependent on protocol versionl). Some clients happen to send more in the initial SSL packet (C client, Python connector), while others (Java, .NET) follow the docs and send only client capability flags. A change that broke Java client was a newly introduced check that frst client packet has 32 or more bytes. This is generally wrong, if client capability flags contains CLIENT_SSL. Also, fixed the code such that read max client packet size and charset in the first packet prior to SSL handshake. With SSL, clients do not have to send this info, they can only send client flags. This is now fixed such that max packet size and charset are not read prior to SSL handshake, in case of SSL they are read from the "complete" client authentication packet after SSL initialization.
* | | | | | | | 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 bug #848652.Igor Babaev2011-12-293-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of this bug was the same as for bug 902356 fixed for 5.3.
* | | | | | | | Fixes lp:907049 "Server started with skip-aria crashes on an attempt to ↵Michael Widenius2011-12-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect to it" sql/sql_parse.cc: Only call ha_maria::implicit_commit if aria is enabled
* | | | | | | | new "./configure --disable-distribution" optionSergei Golubchik2011-12-122-12/+56
| | | | | | | |
* | | | | | | | Fix GCC build failure in PBXT in some cases/platforms.unknown2011-12-121-4/+4
| | | | | | | |
* | | | | | | | Fixed valgrind problem: reference on deleted memory of temporary table name.unknown2011-12-112-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed previous patch of this problem.
* | | | | | | | Added suppressionsMichael Widenius2011-12-033-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed feedback_plugin_send to not generate a random number of lines. mysql-test/t/feedback_plugin_send.test: Don't print more than 4 lines (sometimes there are 6 feedback lines in the log...) mysql-test/valgrind.supp: Added suppression for failure on work support-files/compiler_warnings.supp: Suppress warning from xtradb
* | | | | | | | mergeVladislav Vaintroub2011-12-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | mergeVladislav Vaintroub2011-12-015-12/+13
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Fixed that --with-libedit --without-readline worksMichael Widenius2011-12-015-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed buildbot failures (compiler warnings, failing tests) cmd-line-utils/libedit/map.c: Fixed compiler warning cmd-line-utils/libedit/terminal.c: Fixed compiler warning cmd-line-utils/libedit/tty.c: Fixed compiler warning configure.in: Fixed that --with-libedit --without-readline works mysql-test/suite/innodb_plugin/t/innodb_misc1.test: Fixed test that failed when characterset was missing