summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.1Michael Widenius2011-11-301-1/+1
|\
| * Fixed compiler warningsMichael Widenius2011-11-301-1/+1
* | Merge with MariaDB 5.1Michael Widenius2011-11-2414-28/+67
|\ \ | |/
| * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2114-28/+67
| |\
| | * Updated/added copyright headersKent Boortz2011-06-3014-28/+67
| | |\
| | | * Updated/added copyright headersKent Boortz2011-06-3013-26/+39
* | | | merge 5.2Vladislav Vaintroub2011-03-101-2/+2
|\ \ \ \
| * \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-2/+2
| | |\ \ \ | | | |/ /
| | | * | MergeKent Boortz2010-12-291-2/+2
| | | |\ \ | | | | |/
| | | | * - Added/updated copyright headersKent Boortz2010-12-281-2/+2
* | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-2/+0
|/ / / /
* | | | mergeVladislav Vaintroub2010-12-062-4/+0
|\ \ \ \ | |/ / /
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-062-4/+0
* | | | mergeVladislav Vaintroub2010-12-021-1/+1
|\ \ \ \ | |/ / /
| * | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+0
* | | | merge with 5.1Michael Widenius2010-11-301-3/+0
|\ \ \ \ | |/ / /
| * | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
* | | | merge with 5.1Sergei Golubchik2010-09-112-6/+0
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-272-6/+0
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-3/+0
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-37/+37
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-37/+37
| |\ \ \ | | |/ /
| | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-37/+37
| * | | force the generation of mysqlmanager.map file Sergei Golubchik2010-07-241-0/+2
* | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+2
|\ \ \ \ | |/ / /
| * | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+2
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-15/+15
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-15/+15
| |\ \ \ | | |/ /
| | * | Recommit of Bug#49447.Staale Smedseng2010-02-041-15/+15
* | | | fixes for windows buildsSergei Golubchik2010-04-022-2/+2
* | | | pluggable auth with plugin examplesSergei Golubchik2010-03-292-3/+4
|/ / /
* | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-044-6/+6
|\ \ \ | |/ /
| * | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-183-5/+5
| * | Manual merge.Davi Arnaut2009-12-181-1/+1
| |\ \ | | |/
| | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-172-2/+2
* | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+12
|\ \ \ | |/ /
| * | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-131-0/+12
| |\ \ | | |/
| | * Bug#46013: rpl_extraColmaster_myisam fails on pb2Davi Arnaut2009-08-131-0/+12
| | * Merge from 5.0-btStaale Smedseng2009-06-291-2/+2
| | * mergingAlexey Botchkov2009-04-281-2/+1
| | |\
| | | * Bug#25058 ignored return codes in memory allocation functionsAlexey Botchkov2008-11-211-2/+1
* | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-256-6/+12
|\ \ \ \ | |/ / /
| * | | auto-mergeIgnacio Galarza2009-03-193-2/+8
| |\ \ \
| | * | | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-273-2/+8
| * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-134-4/+4
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-1013-35/+62
| | |/
* | | post-review fixesSergei Golubchik2009-01-151-1/+1
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-382/+0
|\ \ \ | |/ /
| * | mergeVladislav Vaintroub2008-09-011-382/+0
| |\ \ | | |/