Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 6 | -8/+8 |
|\ \ \ | |||||
| * | | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 6 | -9/+16 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 6 | -3/+17 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 4 | -1/+15 |
| |\ \ | | |/ | |||||
| | * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 4 | -1/+15 |
| | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -0/+11 |
| | |\ | |||||
| | | * | Bug#39370: wrong output for error code 153 | Chad MILLER | 2009-02-24 | 1 | -0/+11 |
| * | | | Fix incorrect filename in verbose output of innochecksum. (Bug #44484, | Jim Winstead | 2009-05-05 | 1 | -1/+1 |
| * | | | Make help text for perror more accurate. (Bug #34574) | Jim Winstead | 2009-04-28 | 1 | -1/+1 |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 5 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 5 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 9 | -23/+23 |
| | |/ |