Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 21 | -100/+114 |
| |\ | |||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 6 | -38/+41 |
| | * | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| | |\ | |||||
| | | * | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| | * | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-08 | 15 | -61/+64 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-08 | 15 | -61/+64 |
* | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+2 |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 4 | -4/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Automerge latest fixes from trunk into 5.1.46 release branch. | unknown | 2010-05-26 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | (Hopefully) better fix for Windows warning on redefined TAILQ_EMPTY; | unknown | 2010-04-28 | 1 | -1/+4 |
| * | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 3 | -3/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug #43414 Parenthesis (and other) warnings compiling | Staale Smedseng | 2010-02-22 | 3 | -3/+3 |
* | | | | | merged | Sergei Golubchik | 2010-05-15 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | fix includes in libevent to support vpath builds | Sergei Golubchik | 2010-05-15 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Automerge mariadb 5.1 -> mariadb 5.2 | unknown | 2010-05-05 | 2 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 1 | -1/+0 |
| * | | | Remove unnecessary redefinition of TAILQ_EMPTY | bo.thorsen | 2010-04-09 | 1 | -1/+0 |
* | | | | fixes for windows builds | Sergei Golubchik | 2010-04-02 | 3 | -5/+3 |
* | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 2 | -2/+2 |
* | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -46/+42 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -46/+42 |
| |\ \ \ | | |/ / | |||||
| | * | | Auto-merge. | Ramil Kalimullin | 2010-01-13 | 2 | -55/+69 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL | Ramil Kalimullin | 2010-01-13 | 2 | -55/+69 |
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 6 | -58/+78 |
|\ \ \ \ | |/ / / | |||||
| * | | | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with fixes for compiler warnings and 2 fixed test cases | Michael Widenius | 2010-01-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | YaSSL cert info buffer overflow fix | Sergei Golubchik | 2010-01-27 | 2 | -49/+67 |
| |/ / / | |||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -5/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | merge | Georgi Kodinov | 2009-11-20 | 1 | -5/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#48864: MySQL fails to compile on 64 bit Fedora 12 | Georgi Kodinov | 2009-11-18 | 1 | -5/+7 |
| | | * | Fix for BUG#18828 - If InnoDB runs out of undo slots, | Satya B | 2009-07-17 | 1 | -0/+1 |
| * | | | Revert earlier change that removes warnings, but breaks Windows compilation. | unknown | 2010-01-07 | 2 | -5/+2 |
| * | | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 3 | -6/+9 |
* | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 5 | -6/+9 |
|/ / / | |||||
* | | | Fix some compiler warnings. | unknown | 2009-12-06 | 1 | -1/+2 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 2 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Bug#47867 compiler warning _WIN32_WINNT macro redefinition | Magnus BlÄudd | 2009-10-06 | 1 | -1/+0 |
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 2 | -2/+2 |
* | | | Merge 5.1-release branch into MariaDB trunk. | unknown | 2009-11-06 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | libevent fixup required for Debian 4 (Etch) | Arjen Lentz | 2009-10-31 | 1 | -0/+5 |
* | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -0/+2 |
* | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 4 | -1/+11 |
|/ / / | |||||
* | | | Make sure to use the correct location for config.h when generating event-conf... | Peter Lieverdink | 2009-09-30 | 1 | -2/+2 |
* | | | Post-merge fixes | Sergey Petrunya | 2009-09-15 | 4 | -6/+5 |