| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -554/+526 |
| * | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+38 |
| | |\ | |||||
| * | \ | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+37 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-19 | 1 | -1/+37 |
| | |\ \ | | |/ | |/| | |||||
| | | * | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-17 | 1 | -1/+39 |
| * | | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 1 | -0/+1 |
| * | | | merge 5.5 | Vladislav Vaintroub | 2012-02-27 | 1 | -5/+43 |
| |\ \ \ | |||||
| | * \ \ | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -5/+43 |
| | |\ \ \ | |||||
| | | * | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -7/+1 |
| | | * | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -5/+54 |
| * | | | | | further reduce diffs to 5.5, monty review | Vladislav Vaintroub | 2012-01-24 | 1 | -5/+6 |
| * | | | | | merge | Vladislav Vaintroub | 2012-01-24 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo) | Sergei Golubchik | 2012-01-17 | 1 | -2/+0 |
| | * | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+3 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -4/+8 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -4/+8 |
| | | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -14/+17 |
| | | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | | |||||
| | | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -14/+17 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -14/+14 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | | | | Initial threadpool implementation for MariaDB 5.5 | Vladislav Vaintroub | 2011-12-08 | 1 | -5/+78 |
| |/ / / / / / / | |||||
| * | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| * | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| | * | | | | | Fix bugs found by application verifier : | Vladislav Vaintroub | 2011-05-14 | 1 | -1/+6 |
| | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -20/+29 |
| | |\ \ \ \ | | |/ / / | |||||
| | * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -30/+90 |
| | |\ \ \ \ | |||||
| | * | | | | | Took care of mysql test suite failures on Windows. | Igor Babaev | 2009-09-24 | 1 | -0/+13 |
| | * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -7/+15 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -0/+18 |
| * | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -13/+15 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -14/+16 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | FIONREAD is located in sys/filio.h on Solaris. | Davi Arnaut | 2011-04-29 | 1 | -2/+6 |
| * | | | | | | A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONS | Alexander Nozdrin | 2011-04-08 | 1 | -1/+29 |
| * | | | | | | Merging with mysql-5.5-stage. | Mats Kindahl | 2010-08-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | WL#5363: Thread Pool Service Interface | Mats Kindahl | 2010-06-07 | 1 | -0/+4 |
| * | | | | | | | Fix for Bug#52923 (Inadequate documentation of "Can't get hostname for your a... | Alexander Nozdrin | 2010-05-21 | 1 | -3/+11 |
| |/ / / / / / | |||||
| * | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -7/+14 |
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -20/+29 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Bug#47571 : idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-20 | 1 | -20/+29 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 1 | -32/+222 |
| |\ \ \ \ \ | |||||
| | * | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 1 | -32/+222 |
| * | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -0/+24 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Backport the implementation of vio_pending from 6.0-codebase. | Konstantin Osipov | 2009-11-21 | 1 | -0/+24 |
| * | | | | | | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -8/+158 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -8/+158 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | | * | | | | The FIONREAD macro could expand to a expression which | Davi Arnaut | 2009-11-10 | 1 | -1/+2 |
| | | * | | | | Backport of Bug#41860 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -7/+116 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |