summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Revert earlier change that removes warnings, but breaks Windows compilation.unknown2010-01-072-5/+2
* Removed compiler warningsMichael Widenius2010-01-063-6/+9
* Fix some compiler warnings.unknown2009-12-061-1/+2
* Merge with MySQL 5.1, with following additions:unknown2009-11-162-2/+1
|\
| * Bug#47867 compiler warning _WIN32_WINNT macro redefinitionMagnus Blåudd2009-10-061-1/+0
| * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-232-2/+2
* | Merge 5.1-release branch into MariaDB trunk.unknown2009-11-061-0/+5
|\ \
| * | libevent fixup required for Debian 4 (Etch)Arjen Lentz2009-10-311-0/+5
* | | Added federatedx storage engineMichael Widenius2009-10-301-0/+2
* | | Fixed compiler warning messageMichael Widenius2009-10-264-1/+11
|/ /
* | Make sure to use the correct location for config.h when generating event-conf...Peter Lieverdink2009-09-301-2/+2
* | Post-merge fixesSergey Petrunya2009-09-154-6/+5
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-156-8/+8
|\ \
| * | Fix most Compiler warnings seen in buildbot.unknown2009-09-036-9/+16
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-086-3/+17
|\ \ \ | |/ / |/| / | |/
| * Merge from 5.0Staale Smedseng2009-06-294-1/+15
| |\
| | * Merge from 5.0-btStaale Smedseng2009-06-294-1/+15
| | * auto-mergeIgnacio Galarza2009-03-191-0/+11
| | |\
| | | * Bug#39370: wrong output for error code 153Chad MILLER2009-02-241-0/+11
| * | | Fix incorrect filename in verbose output of innochecksum. (Bug #44484,Jim Winstead2009-05-051-1/+1
| * | | Make help text for perror more accurate. (Bug #34574)Jim Winstead2009-04-281-1/+1
* | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-255-6/+6
|\ \ \ \ | |/ / /
| * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-135-6/+6
| |\ \ \ | | |/ /
| | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-109-23/+23
| | |/
* | | Fix build error in some configs.unknown2009-03-131-1409/+0
* | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-1343-3/+20153
* | | Merge with base MySQL 5.1Michael Widenius2009-02-152-3/+4
|\ \ \ | |/ /
| * | Bug#41612: resolve_stack_dump does not decode 5.1 stack traceDavi Arnaut2008-12-191-1/+2
| * | Replace C++ comment in a header file. Thanks, Alik!Chad MILLER2008-12-081-2/+2
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-102-2/+3
|\ \ \ | |/ / |/| |
| * | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+6
| |\ \
| | * \ Merge main 5.1 branch -> 5.1-build (team tree).Joerg Bruehe2008-10-044-482/+2
| | |\ \
| * | \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-104-482/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Added versioning of Maria indexMichael Widenius2008-06-261-2/+2
| * | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-284-55/+51
| |\ \ \ \
| * \ \ \ \ Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ handshake.cpp:unknown2008-01-113-1/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge janus.mylan:/data0/mysqldev/users/serg/mysql-5.0-releaseunknown2008-01-113-1/+16
| | |\ \ \ \ \ \ \
| * | | | | | | | | Bugs fixed:unknown2008-01-071-0/+1
* | | | | | | | | | Addendum to the fix for bug #39178: Server crash in YaSSL Georgi Kodinov2008-12-021-0/+1
* | | | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-271-2/+38
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Bug#34825 perror on windows doesn't know about win32 error codesSergey Glukhov2008-11-271-2/+38
| * | | | | | | | | Auto merge 5.0-build -> 5.0-bugteamTimothy Smith2008-09-101-1/+6
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | Update to change for bug 39178. Revert error-handling change, perhapsChad MILLER2008-11-201-1/+1
* | | | | | | | | | | Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \Chad MILLER2008-11-1811-97/+275
* | | | | | | | | | | Auto merge 5.1-build -> 5.1-bugteamTimothy Smith2008-09-101-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-271-1/+6
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-251-1/+6
* | | | | | | | | Fix "make dist" error - remove Visual Studio project files from Vladislav Vaintroub2008-09-012-3/+2
View Lorry Controller Status