summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2Michael Widenius2011-05-1656-245/+592
|\
| * Small CMake fixes :Vladislav Vaintroub2011-05-156-34/+25
| * merge2Vladislav Vaintroub2011-05-141-1/+1
| |\
| | * Fix compile error on Unixes Vladislav Vaintroub2011-05-141-1/+1
| * | mergeVladislav Vaintroub2011-05-148-2/+31
| |\ \ | | |/
| | * Fix bugs found by application verifier : Vladislav Vaintroub2011-05-142-1/+7
| | * LPBUG#782223 : Memory released by Query_cache::resize() or Query_cache::free(...Vladislav Vaintroub2011-05-141-0/+12
| | * Fix PBXT bugs found while testing with Application Verifier : Vladislav Vaintroub2011-05-144-0/+12
| | * LPBUG#782269 : Fixed double initialization of condition variables in PBXT.Vladislav Vaintroub2011-05-131-1/+0
| * | Made test-unit run in parlallel. This was achived by having all aria tests th...Michael Widenius2011-05-1321-135/+329
| |/
| * mergeVladislav Vaintroub2011-05-128-22/+137
| |\
| | * mergeVladislav Vaintroub2011-05-122-3/+104
| | |\
| | | * Windows build : Make win\config.js optional in 5.1Vladislav Vaintroub2011-05-121-1/+92
| | | * Fix check_table_file_presence:Vladislav Vaintroub2011-05-121-2/+12
| | * | db_name can change case, so we need copy of it for case insensitive FS.Oleksandr Byelkin2011-05-121-2/+8
| | |/
| | * Bugfix: New table creation/renaming block added if old encoded table present.unknown2011-05-117-20/+119
| * | small enhancement of the create table options feature:Sergei Golubchik2011-05-108-47/+58
| * | Fix Windows embedded warningsVladislav Vaintroub2011-05-102-4/+4
| * | Cygwin-specific klugde to workaround missing TEMP/TMP variables.Vladislav Vaintroub2011-05-101-0/+1
| * | Automatic merge Mariadb 5.1->5.2.unknown2011-05-093-0/+7
| |\ \ | | |/
| | * Fix buildbot failure in rpl_stop_slave.test.unknown2011-05-093-0/+7
* | | Added more asserts to find out how maria.maria-big could have failed in build...Michael Widenius2011-05-163-4/+13
* | | Fixed test differences on windowsMichael Widenius2011-05-131-3/+3
* | | Merge with dynamic column codeMichael Widenius2011-05-1281-731/+8047
|\ \ \
| * | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233)Michael Widenius2011-05-128-19/+124
| * | | automatic mergeMichael Widenius2011-05-119-10/+48
| |\ \ \
| | * | | Fixed a memory overrun in dynamic columns when sending in a mailformed (too s...Michael Widenius2011-05-113-1/+23
| | * | | Fixed compiler warnings and test cases problems found by buildbotMichael Widenius2011-05-119-9/+25
| * | | | Fix compile error by changing #include <mysys_priv.h> to #include "mysys_pri...Vladislav Vaintroub2011-05-111-11/+18
| |/ / /
| * | | Fixed all reported bugs for dynamic columns.Michael Widenius2011-05-118-3/+102
| * | | Merge with main 5.3Michael Widenius2011-05-0896-1672/+3690
| |\ \ \
| * | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-0872-720/+7778
* | | | | Merge with MariaDB 5.2Michael Widenius2011-05-10639-4494/+11584
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Make event stop code even more robust.Michael Widenius2011-05-091-1/+8
| * | | mysqltest: Write command to be executed to the log BEFORE executing the command.Michael Widenius2011-05-093-8/+39
| * | | Automatic mergeMichael Widenius2011-05-0810-6/+113
| |\ \ \
| | * \ \ Automatic merge with 5.1Michael Widenius2011-05-0810-6/+113
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Reverted unittest/unit.pl back to Test::Harness as some of our build machines...Michael Widenius2011-05-062-16/+12
| | | * | Speed up pbxt.range test a bitMichael Widenius2011-05-052-0/+5
| | | * | Improved 'make test-unit' time slightlyMichael Widenius2011-05-058-9/+115
| * | | | Fix effect of recent mismerge (it made default pid file name ".pid" instea...Vladislav Vaintroub2011-05-071-8/+9
| |/ / /
| * | | Automatic mergeMichael Widenius2011-05-046-9/+22
| |\ \ \
| | * \ \ Automatic merge with 5.1Michael Widenius2011-05-047-10/+23
| | |\ \ \ | | | |/ /
| | | * | Automatic mergeMichael Widenius2011-05-041-0/+6
| | | |\ \
| | | | * | Fixed build errors on centos5-amd64-minimal, where we compile with very few c...Michael Widenius2011-05-046-9/+22
| | | * | | Fixed build errors on centos5-amd64-minimal, where we compile with very few c...Michael Widenius2011-05-045-9/+16
| | | |/ /
| * | | | mergeVladislav Vaintroub2011-05-041-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mergeVladislav Vaintroub2011-05-043-1/+3
| | |\ \ \
| | | * | | Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2Vladislav Vaintroub2011-05-042-0/+2
| | | * | | Avoid mtr warning on Windows during startup Vladislav Vaintroub2011-05-041-1/+1