summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes after comments from last push:Michael Widenius2009-11-3016-80/+99
* Automatic mergeMichael Widenius2009-11-3059-214/+254
|\
| * Ignore temporary directoryMichael Widenius2009-11-301-0/+1
| * Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-3052-210/+231
| * Added protection around usage of thd->mysys_varMichael Widenius2009-11-266-3/+21
| * Fix for Bug #48357 SHOW BINLOG EVENTS: Wrong offset or I/O errorMichael Widenius2009-11-261-4/+4
* | Apply the strict aliasing patch from http://lists.mysql.com/commits/89843Bo Thorsen2009-11-261-4/+4
|/
* Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build)...Michael Widenius2009-11-262-29/+7
* Automatic mergeMichael Widenius2009-11-255-8/+19
|\
| * Added error handling for my_seek() & my_tell() failuresMichael Widenius2009-11-075-8/+19
* | Safety change to ensure read/black trees (used with heap tables) works on 64 ...Michael Widenius2009-11-164-9/+9
* | Merge MariaDB 5.1.39 release, including XtraDB 8 merge, into MariaDB 5.1 trunk.unknown2009-11-14324-27751/+32131
|\ \
| * | XtraDB 8 after-merge fix: Fix windows build.unknown2009-11-141-1/+1
| * | XtraDB 8 after-merge fixes: fix forgotten manual merge of patch file.unknown2009-11-143-4/+6
| * | XtraDB 8 after-merge fix: Add missing header to `make dist`.unknown2009-11-131-0/+1
| * | Merge XtraDB 8.unknown2009-11-132-3/+2
| |\ \
| | * | Fix double declaration of Makefile variable for FederatedX.unknown2009-11-101-1/+0
| | * | Apply Monty's fix for warning about wrong FEDERATED typecode.unknown2009-11-101-2/+2
| * | | Merge XtraDB 8 into MariaDB.unknown2009-11-13318-27743/+32121
| |\ \ \ | | |/ / | |/| |
| | * | Sync with rev. 107Aleksandr Kuzminsky2009-09-305-4/+115
| | * | Sync with rev.105Aleksandr Kuzminsky2009-09-2343-181/+2436
| | * | sync with rev.96Aleksandr Kuzminsky2009-09-07320-28375/+30766
| * | | Bump revision number for MariaDB 5.1.39 release.unknown2009-11-071-1/+1
| | |/ | |/|
* | | Fixed typos of --engine help text.Hakan Kuecuekyilmaz2009-11-111-2/+2
|\ \ \ | |/ / |/| |
| * | Fixed typos of --engine help text.Hakan Kuecuekyilmaz2009-11-111-2/+2
|/ /
* | Result file update for new FederatedXunknown2009-11-071-3/+3
* | Merge 5.1-release branch into MariaDB trunk.unknown2009-11-063-0/+15
|\ \
| * | Fix running test suite from installed package.unknown2009-11-052-0/+10
| * | libevent fixup required for Debian 4 (Etch)Arjen Lentz2009-10-311-0/+5
* | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-06148-1039/+6248
|\ \ \
| * | | Fixed problem with schema tables and DECIMALMichael Widenius2009-11-021-0/+6
| * | | When running with --skip-safemalloc, still do some basic, but cheap, overrun ...unknown2009-10-161-0/+3
| * | | After-merge fixes for MySQL 5.1.39 merge.unknown2009-10-163-4/+4
| * | | Merge with latest MariaDB 5.1 trunk.unknown2009-10-1571-813/+1618
| |\ \ \
| * \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-15145-1040/+6241
| |\ \ \ \
| | * | | | Install mysqld.libJonathan Perkin2009-09-041-0/+1
| | * | | | Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-039-20/+58
| | |\ \ \ \
| | * \ \ \ \ null merge of 5.0 fixes backported from 5.1Georgi Kodinov2009-09-020-0/+0
| | |\ \ \ \ \
| | | * | | | | Backported the --parallel=str option from mtr2 for backward compatibilityGeorgi Kodinov2009-09-021-0/+3
| | | * | | | | mergeGeorgi Kodinov2009-09-021-0/+2
| | | |\ \ \ \ \
| | | | * \ \ \ \ mergeGeorgi Kodinov2009-09-022-7/+11
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | moved version to 5.0-mainGeorgi Kodinov2009-09-021-1/+1
| | * | | | | | | fixed a valgrind warning in partition_pruningGeorgi Kodinov2009-09-021-0/+1
| | * | | | | | | automergeGeorgi Kodinov2009-09-022-8/+16
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Manual merge.Davi Arnaut2009-09-021-7/+10
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Post-merge fix. Observe C declaration placement rules.Davi Arnaut2009-09-021-7/+9
| | | | |/ / / / /
| | | | * | | | | auto-mergeTatiana A. Nurnberg2009-08-317-161/+97
| | | | |\ \ \ \ \
| | | * | | | | | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
| | * | | | | | | | fixed a valgrind warning in partitioning codeGeorgi Kodinov2009-09-021-0/+1
| | |/ / / / / / /
| | * | | | | | | Fixed win32 compilation warningsGeorgi Kodinov2009-09-022-1/+3