summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.1Michael Widenius2012-04-045-35/+35
|\
| * Merge in deleted fixesMichael Widenius2012-04-0411-65/+101
| |\
| | * Fixed test cases that changed as part of fixing bugs with record count and pa...Michael Widenius2012-04-045-35/+35
* | | Merge with 5.1Michael Widenius2012-04-046-30/+66
|\ \ \ | | |/ | |/|
| * | Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CS...Michael Widenius2012-04-046-30/+66
| |/
* | MDEV-209 SET PASSWORD in 5.2 does not update user's auth pluginSergei Golubchik2012-04-021-0/+2
* | mergeSergei Golubchik2012-03-301-1/+1
|\ \
| * | mdev-205 don't install libevent headersSergei Golubchik2012-03-301-1/+1
| |/
* | Automatic mergeMichael Widenius2012-03-303-1/+25
|\ \ | |/
| * Fixed bug lp:967914 "CHECK TABLE persistently reports table corruption after ...Michael Widenius2012-03-303-1/+25
* | mergeSergei Golubchik2012-03-292-1/+4
|\ \ | |/
| * fix the test case for windows: replace_result \\ /Sergei Golubchik2012-03-291-0/+3
| * make the code compile againSergei Golubchik2012-03-291-1/+1
* | Merge with 5.1Michael Widenius2012-03-2812-15/+92
|\ \ | |/
| * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-2812-15/+92
* | mergeSergei Golubchik2012-03-217-233/+17
|\ \ | |/
| * lp:933959 Assertion `0' failed in net_end_statement(THD*) on concurrent SELEC...Sergei Golubchik2012-03-211-0/+2
| * Fix access to uninitialized variable in innodb error message in case WriteFil...Vladislav Vaintroub2012-03-152-2/+2
| * restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-144-231/+13
* | test suite for LP bug#694450unknown2012-03-142-0/+37
* | mergeVladislav Vaintroub2012-03-122-12/+8
|\ \ | |/
| * LP953714: Fix formatting of the crash messages in signal/exception handlerVladislav Vaintroub2012-03-122-12/+8
* | LP952607: Do not show MySQL services preinstalled by Dell in the upgrade wizardVladislav Vaintroub2012-03-121-1/+38
* | Fixed LP bug #930814.Igor Babaev2012-03-093-2/+29
* | Added test case for lp:905782 "Assertion `pageno < ((1ULL) << 40)' failed at ...Michael Widenius2012-03-092-10/+20
* | Added ucs2 test moved from maria3.test. (MDEV-167)unknown2012-03-092-0/+80
* | Fixed LP bug #884175.Igor Babaev2012-03-083-2/+88
* | mergeVladislav Vaintroub2012-03-062-3/+8
|\ \
| * | LP947631: Uninstall wipes HeidiSQL settings, even if HeidiSQL is installed pr...Vladislav Vaintroub2012-03-062-3/+8
* | | Return original checksum value inside the test.unknown2012-03-012-47/+7
|/ /
* | Automatic mergeMichael Widenius2012-02-288-29/+80
|\ \
| * | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-288-29/+80
* | | Fixed LP bug #939866.Igor Babaev2012-02-251-0/+9
* | | Fix of LP bug:938518 (also LP bug:791761 and LP bug:806955)unknown2012-02-253-10/+137
|/ /
* | Automatic mergeMichael Widenius2012-02-243-3/+64
|\ \ | |/
| * Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fieldsMichael Widenius2012-02-243-3/+64
* | Back-ported the fix and test cases for bugs #59487 and #43368 fromIgor Babaev2012-02-227-5/+289
* | Automatic merge with 5.1Michael Widenius2012-02-211-1/+1
|\ \ | |/
| * Fixed suppression expression.Michael Widenius2012-02-211-1/+1
* | Fixed wrong test caseMichael Widenius2012-02-211-0/+1
* | 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
* | | Automatic mergeMichael Widenius2012-02-211-0/+6
|\ \ \
| * | | Added missing signal values to signal_handler.ccMichael Widenius2012-02-211-0/+6
| * | | Merge with 5.1Michael Widenius2012-02-202-2/+1
| |\ \ \ | | | |/ | | |/|
* | | | mergeVladislav Vaintroub2012-02-203-10/+15
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix compilation on Windows, and various Windows related mistakes introduced byVladislav Vaintroub2012-02-201-8/+14
| |/
| * Fixed compiler warningsMichael Widenius2012-02-202-2/+1
* | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-2039-302/+846
|\ \ | |/