summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Fix comp_errr crash ( fprintf crashes wheb uninitialized string is passed)Vladislav Vaintroub2011-05-211-0/+1
* Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e...Michael Widenius2011-05-211-11/+73
* Small CMake fixes :Vladislav Vaintroub2011-05-151-8/+8
* Merge with MariaDB 5.1Michael Widenius2011-05-032-2/+31
|\
| * Merge with MySQL 5.1.57/58Michael Widenius2011-05-022-2/+31
| |\
| | * Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-281-1/+30
| | * BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LI...Mayank Prasad2011-03-111-1/+1
| | * MergeKent Boortz2010-12-2947-4/+740
| | |\
| | | * - Added/updated copyright headersKent Boortz2010-12-2847-4/+740
* | | | CMake fixes for buildbot/MSI package building and signing:Vladislav Vaintroub2011-03-281-10/+16
* | | | Merge with base 5.2Michael Widenius2011-03-231-1/+1
|\ \ \ \
| * | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-181-1/+1
* | | | | merge 5.2Vladislav Vaintroub2011-03-107-5/+16
|\ \ \ \ \ | |/ / / /
| * | | | Automatic merge with 5.2 to fix compiler failure on FreeBSDMichael Widenius2011-03-041-1/+1
| |\ \ \ \ | | |/ / /
| | * | | typo (in the yassl error message) fixedSergei Golubchik2011-03-011-1/+1
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-286-4/+15
| |\ \ \ \ | | |/ / /
| | * | | Fixed compiler warningsMichael Widenius2011-02-252-3/+3
| | * | | fixes for solaris 10Sergei Golubchik2011-01-263-0/+11
| | * | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-1/+1
* | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-292-13/+17
|/ / / /
* | | | 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
|\ \ \ \ | |/ / /