Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 38 | -141/+177 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 38 | -141/+177 |
| |\ | |||||
| | * | 2nd fix for Bug #55713 innochecksum is NOT built with large file support ena... | unknown | 2011-08-17 | 1 | -1/+0 |
| | * | fix for bug 55713 innochecksum is NOT built with large file support enabled | unknown | 2011-08-16 | 1 | -6/+1 |
| | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 5 | -17/+44 |
| | |\ | |||||
| | | * | Merge mysql-5.0 -> mysql-5.1 | Vasil Dimov | 2011-06-29 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Bug #12696083 FIX OUTDATED COPYRIGHT NOTICES IN INNODB RELATED CLIENT TOOLS | Vasil Dimov | 2011-06-29 | 1 | -1/+1 |
| | | * | | Bug#12657095 YASSL ERROR MESSAGE CONTAINS TYPO | Jon Olav Hauglid | 2011-06-17 | 1 | -1/+1 |
| | | * | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -8/+10 |
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 38 | -130/+137 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 13 | -15/+30 |
| | | | |/ | | | |/| | |||||
* | | | | | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -8/+8 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 2 | -2/+31 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 2 | -2/+31 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -1/+30 |
| | * | | | BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LI... | Mayank Prasad | 2011-03-11 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge | Kent Boortz | 2010-12-29 | 47 | -4/+740 |
| | |\ \ | | | |/ | |||||
| | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 47 | -4/+740 |
* | | | | CMake fixes for buildbot/MSI package building and signing: | Vladislav Vaintroub | 2011-03-28 | 1 | -10/+16 |
* | | | | Merge with base 5.2 | Michael Widenius | 2011-03-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+1 |
* | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 7 | -5/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automatic merge with 5.2 to fix compiler failure on FreeBSD | Michael Widenius | 2011-03-04 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | typo (in the yassl error message) fixed | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 6 | -4/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 2 | -3/+3 |
| | * | | | fixes for solaris 10 | Sergei Golubchik | 2011-01-26 | 3 | -0/+11 |
| | * | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -1/+1 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 2 | -13/+17 |
|/ / / / | |||||
* | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 12 | -35/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 7 | -24/+0 |
| * | | | Fixed compiler warnings and a compilation failure on windows | Michael Widenius | 2010-11-27 | 4 | -6/+24 |
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 4 | -5/+10 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -3/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -2/+4 |
| * | | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -1/+1 |
* | | | | fixes for windows | Sergei Golubchik | 2010-10-26 | 2 | -1/+4 |
* | | | | Automatic merge | Michael Widenius | 2010-10-01 | 3 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 3 | -3/+4 |
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 11 | -67/+63 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 11 | -67/+63 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#53463: YaSSL patch appears to be reverted | Davi Arnaut | 2010-07-28 | 1 | -1/+1 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 2 | -18/+8 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 12 | -57/+63 |
* | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler warnings from Windows compiler | Michael Widenius | 2010-08-11 | 1 | -2/+2 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 21 | -100/+115 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 2 | -4/+5 |