| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -5/+5 |
| * | merge. | Sergei Golubchik | 2010-11-25 | 1 | -82/+34 |
| |\ | |||||
| | * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -0/+1 |
| | | |\ | |||||
| | * | \ | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -5/+25 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -5/+25 |
| | | |\ \ | |||||
| | * | \ \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | * | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -82/+21 |
| | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -4/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -14/+0 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -0/+14 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+14 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -2/+2 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 1 | -1/+2 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Added client functions: | Michael Widenius | 2009-10-02 | 1 | -0/+12 |
| | * | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fix two missing DBUG_RETURN. | unknown | 2009-04-21 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -43/+88 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -24/+31 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | Fix mysql_client_test failure introduced by a patch for Bug#47485. | Dmitry Shulga | 2010-09-09 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | | Auto-merge from mysql-5.1-bugteam. | Dmitry Shulga | 2010-09-07 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Fixed bug #47485 - mysql_store_result returns a not NULL result set | Dmitry Shulga | 2010-09-07 | 1 | -2/+4 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -7/+0 |
| * | | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -41/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -24/+22 |
| | * | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -10/+2 |
| | * | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -8/+8 |
| * | | | | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-07-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fix what is probably the result of a bad merge. No functional change. | Davi Arnaut | 2010-07-06 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -1/+0 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Automerge. | Alexey Kopytov | 2010-07-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Automerge. | Alexey Kopytov | 2010-07-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from 5.1. | Alexey Kopytov | 2010-07-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Bug#54667: Unnecessary signal handler redefinition | Alexey Kopytov | 2010-07-01 | 1 | -1/+1 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Automerge | Staale Smedseng | 2010-06-30 | 1 | -4/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | / / / / / / / / / / / / | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Bug #53899 Wrong mysql_stmt_errno() after connection loss with | Staale Smedseng | 2010-06-30 | 1 | -4/+24 |
| | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -38/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-18 | 1 | -34/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -34/+20 |
| | * | | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-24 | 1 | -4/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |