summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Fix some compiler warnings.unknown2009-12-061-1/+2
| * | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-162-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-255-6/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-163-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-123-7/+6
* | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-044-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-292-18/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Cleanup after bild team push.Vladislav Vaintroub2010-07-252-2/+11
| * | | | | | | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+3
| * | | | | | | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-2/+0
* | | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Bug#53463: YaSSL patch appears to be revertedDavi Arnaut2010-07-281-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-202-18/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-18/+8
* | | | | | | | | | | | | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-07-192-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | CMakeLists.txtKent Boortz2010-06-232-1/+2
* | | | | | | | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-1512-127/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-1/+1
| * | | | | | | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-159-102/+5
| * | | | | | | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-083-24/+24
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Unset the execute bit where it's not needed.Davi Arnaut2010-07-033-0/+0
* | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-0212-57/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-0212-57/+63
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | mergeDaniel Fischer2010-06-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ MergeDaniel Fischer2010-04-216-7/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-101-0/+2
* | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-106-38/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |