summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-12-061-2/+0
|\
| * Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-2/+0
* | merge with 5.1Michael Widenius2010-11-3012-35/+15
|\ \ | |/
| * Fixed compiler and gmake warningsMichael Widenius2010-11-297-24/+0
| * Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-274-6/+24
| * Merge with MySQL 5.1.53Michael Widenius2010-11-254-5/+10
| |\
* | \ Merge MariaDB 5.1->5.2unknown2010-11-192-3/+5
|\ \ \ | |/ /
| * | MWL#74: Shared libmysqld.so library.unknown2010-11-171-2/+4
| * | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th...Michael Widenius2010-11-071-1/+1
* | | fixes for windowsSergei Golubchik2010-10-262-1/+4
* | | Automatic mergeMichael Widenius2010-10-013-3/+4
|\ \ \
| * | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-243-3/+4
* | | | merge with 5.1Sergei Golubchik2010-09-1111-67/+63
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-2711-67/+63
| |\ \ | | |/
| | * Bug#53463: YaSSL patch appears to be revertedDavi Arnaut2010-07-281-1/+1
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-18/+8
| | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-0212-57/+63
* | | Automerge with 5.1Michael Widenius2010-08-251-2/+2
|\ \ \ | |/ /
| * | Fixed compiler warnings from Windows compilerMichael Widenius2010-08-111-2/+2
* | | Merge with MariaDB 5.1.49Michael Widenius2010-08-0521-100/+115
|\ \ \ | |/ /
| * | Fixed compiler warningsMichael Widenius2010-08-042-4/+5
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-0221-100/+114
| |\ \ | | |/
| | * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-106-38/+41
| | * Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-091-1/+9
| | |\
| | | * Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-091-1/+9
| | * | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-0815-61/+64
| | |\ \ | | | |/
| | | * Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-0815-61/+64
* | | | 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-014-4/+7
|\ \ \ \ | |/ / /
| * | | Automerge latest fixes from trunk into 5.1.46 release branch.unknown2010-05-261-1/+1
| |\ \ \
| * | | | (Hopefully) better fix for Windows warning on redefined TAILQ_EMPTY;unknown2010-04-281-1/+4
| * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-283-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-223-3/+3
* | | | | mergedSergei Golubchik2010-05-151-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fix includes in libevent to support vpath buildsSergei Golubchik2010-05-151-1/+1
| |/ / /
* | | | Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-052-2/+0
|\ \ \ \ | |/ / /
| * | | Fix a bunch of Windows warningsBo Thorsen2010-04-211-1/+0
| * | | Remove unnecessary redefinition of TAILQ_EMPTYbo.thorsen2010-04-091-1/+0
* | | | fixes for windows buildsSergei Golubchik2010-04-023-5/+3
* | | | Merge with 5.1Michael Widenius2010-04-012-2/+2
|\ \ \ \ | |/ / /
| * | | Removed compiler warningMichael Widenius2010-03-302-2/+2
* | | | mergedSergei Golubchik2010-03-151-46/+42
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-46/+42
| |\ \ \ | | |/ /
| | * | Auto-merge.Ramil Kalimullin2010-01-132-55/+69
| | |\ \ | | | |/
| | | * Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSLRamil Kalimullin2010-01-132-55/+69
* | | | merge 5.1->5.2unknown2010-02-016-58/+78
|\ \ \ \ | |/ / /
| * | | Changed version number from RC to stableMichael Widenius2010-01-291-1/+1
| |\ \ \ | | |/ /
| * | | Merge with fixes for compiler warnings and 2 fixed test casesMichael Widenius2010-01-281-1/+1
| |\ \ \
| * | | | YaSSL cert info buffer overflow fixSergei Golubchik2010-01-272-49/+67
| |/ / /