summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL->MariaDBSergey Petrunya2009-09-081190-17715/+268606
|\
| * Apply changes from mysql-5.1.38-release clone:Jonathan Perkin2009-08-241-1/+40
| * Upmerge a merge changeset from 5.0 to 5.1, no code change involved.Joerg Bruehe2009-08-210-0/+0
| |\
| | * Merge the correction for the bug#37098 fix into 5.0-buildJoerg Bruehe2009-08-201-2/+2
| | |\
| * | \ automerge the correction for bug#37098 into 5.1-buildJoerg Bruehe2009-08-201-1/+1
| |\ \ \
| | * \ \ Merge the correction to the bug#37098 fix from 5.0 to 5.1.Joerg Bruehe2009-08-201-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Get rid of manual pages which aren't used.Joerg Bruehe2009-08-201-2/+2
| * | | | Upmerge 5.0-build into 5.1-buildJoerg Bruehe2009-08-130-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge main 5.0 with 5.0-build,Joerg Bruehe2009-08-110-0/+0
| | |\ \ \
| | | * \ \ Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-111-45/+45
| | | |\ \ \
| | | | * | | Fix tree name.Davi Arnaut2009-08-111-1/+1
| | | | * | | Update test case result due to mis-merge.Davi Arnaut2009-08-111-45/+45
| | | |/ / /
| | * | | | Correct a merge error that happened during a backport for 5.0.82sp1:Joerg Bruehe2009-08-112-143/+0
| | |/ / /
| | * | | Raise version number after cloning 5.0.85unknown2009-08-111-2/+2
| | * | | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-104-10/+58
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Mergeunknown2009-08-102-0/+143
| | |\ \ \
| | | * | | Backport into build-200907211706-5.0.82sp1MySQL Build Team2009-07-213-3/+172
| | | * | | Backport into build-200907211706-5.0.82sp1MySQL Build Team2009-07-213-0/+65
| | | * | | Backport into build-200907211706-5.0.82sp1MySQL Build Team2009-07-213-2/+18
| | | * | | Backport into build-200907211706-5.0.82sp1MySQL Build Team2009-07-213-0/+46
| | | * | | Set version number for mysql-5.0.82sp1 releaseunknown2009-07-211-1/+1
| | * | | | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-0469-277/+1531
| | |\ \ \ \
| * | \ \ \ \ Merge main 5.1 into 5.1-buildJoerg Bruehe2009-08-135-3/+5
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Ignore auto-generated file: libmysqld/examples/mysqltest.ccAlexander Nozdrin2009-08-121-0/+1
| | * | | | | Fix 5.1 build error.Alexander Nozdrin2009-08-122-2/+2
| | * | | | | Raise version number after cloning 5.1.38unknown2009-08-121-1/+1
| | * | | | | Disable main.index_merge_innodb with InnoDB plugin. The test case isSergey Vojtovich2009-08-121-0/+1
| * | | | | | Create separate vardirs during collections test runs.Daniel Fischer2009-08-122-6/+6
| |/ / / / /
| * | | | | merge fix to define __NT__ on WindowsVladislav Vaintroub2009-08-111-3/+3
| |\ \ \ \ \
| | * | | | | Always compile with __NT__ on windows. in 5.1 itthis #define isVladislav Vaintroub2009-08-111-3/+3
| * | | | | | Merge from mysql-5.1-bugteam.Davi Arnaut2009-08-1116-33/+1616
| |\ \ \ \ \ \
| | * | | | | | Update README.Davi Arnaut2009-08-111-2/+1247
| | * | | | | | Manual merge.Davi Arnaut2009-08-104-8/+40
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug#45010: invalid memory reads during parsing some strange statementsDavi Arnaut2009-08-073-8/+43
| | * | | | | | MergeMartin Hansson2009-08-104-13/+118
| | |\ \ \ \ \ \
| | | * | | | | | Bug#46454: MySQL wrong index optimisation leads to incorrect result & crashesMartin Hansson2009-08-074-13/+118
| | * | | | | | | Auto-mergeIgnacio Galarza2009-08-061-2/+15
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Bug #27535 Installing Windows service with --defaults-file option - quotation...Ignacio Galarza2009-08-061-2/+15
| | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge from mysql-5.0.Davi Arnaut2009-08-044-5/+49
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | * | | | | | Fix for BUG#45816 - assertion failure with index containing double Satya B2009-08-064-2/+39
| | * | | | | | Bug #45630 rpl_trigger.test causes valgrind failures within nptl_pthread_ex...unknown2009-08-061-0/+108
| | * | | | | | Merge approved bug fixJim Winstead2009-08-051-6/+49
| | |\ \ \ \ \ \
| | | * | | | | | Not all of the necessary tests for multi-byte support in readlineJim Winstead2009-07-311-6/+49
| * | | | | | | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-11452-334/+221187
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Fixed build failure on Win.Sergey Vojtovich2009-08-041-0/+1
| | * | | | | | | Added fsp0types.h to source distribution.Sergey Vojtovich2009-07-311-0/+1
| | * | | | | | | Update to innoplug-1.0.4.Sergey Vojtovich2009-07-30104-1173/+5341
| | * | | | | | | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-14388-3521/+9440
| | |\ \ \ \ \ \ \
| | * | | | | | | | This patch pretends to fix run-time symbols clash on Solaris:Sergey Vojtovich2009-07-091-3/+5
| | * | | | | | | | On Solaris shared objects must be linked from PIC code.Sergey Vojtovich2009-07-031-3/+6