Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | 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 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | 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 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 5 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix build error in some configs. | unknown | 2009-03-13 | 1 | -1409/+0 | |
| * | | | | | | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 43 | -3/+20153 | |
| * | | | | | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 2 | -3/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 2 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge main 5.1 branch -> 5.1-build (team tree). | Joerg Bruehe | 2008-10-04 | 4 | -482/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 4 | -482/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 4 | -55/+51 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -2/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | handshake.cpp: | unknown | 2008-01-11 | 3 | -1/+16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/data0/mysqldev/users/serg/mysql-5.0-release | unknown | 2008-01-11 | 3 | -1/+16 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Bugs fixed: | unknown | 2008-01-07 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-16 | 3 | -7/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). | Alexander Nozdrin | 2010-08-12 | 3 | -7/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-04 | 4 | -7/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-07-29 | 2 | -18/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Cleanup after bild team push. | Vladislav Vaintroub | 2010-07-25 | 2 | -2/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 2 | -2/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Bug#53463: YaSSL patch appears to be reverted | Davi Arnaut | 2010-07-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 2 | -18/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 2 | -18/+8 | |
* | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-07-19 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | CMakeLists.txt | Kent Boortz | 2010-06-23 | 2 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 12 | -127/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 9 | -102/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 3 | -24/+24 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | Unset the execute bit where it's not needed. | Davi Arnaut | 2010-07-03 | 3 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 12 | -57/+63 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 12 | -57/+63 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | merge | Daniel Fischer | 2010-06-18 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge | Daniel Fischer | 2010-04-21 | 6 | -7/+81 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Add components to INSTALL, some eraly Wix support | Vladislav Vaintroub | 2010-02-10 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 6 | -38/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |