Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -29/+68 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -29/+68 |
| |\ | |||||
| | * | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -1/+1 |
| | * | Fixed "Packets out of order" warning message on stdout in clients, | Monty | 2016-08-21 | 1 | -29/+68 |
* | | | MDEV-8931: (server part of) session state tracking | Oleksandr Byelkin | 2016-08-31 | 1 | -1/+0 |
* | | | MDEV-9058: protocol: COM_MULTI command (part 2) | Oleksandr Byelkin | 2016-03-18 | 1 | -5/+17 |
|/ / | |||||
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-01-25 | 1 | -5/+15 |
|\ \ | |/ | |||||
| * | Cleanup of slave code: | Monty | 2016-01-03 | 1 | -5/+15 |
* | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-09-01 | 1 | -8/+9 |
|/ | |||||
* | MDEV-8014 MariaDB client can hang in an infinite loop | Sergei Golubchik | 2015-05-03 | 1 | -1/+1 |
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+0 |
* | Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance ... | Michael Widenius | 2014-07-19 | 1 | -12/+31 |
* | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -8/+8 |
* | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -2/+2 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -1/+1 |
| |\ | |||||
| | * | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB' | Praveenkumar Hulakund | 2013-10-09 | 1 | -1/+7 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -4/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -4/+11 |
| |/ / | |||||
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -14/+53 |
* | | | More fixes | Michael Widenius | 2012-08-17 | 1 | -16/+14 |
|/ / | |||||
* | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 1 | -0/+1 |
* | | Threadpool : Rest of monty's review | Vladislav Vaintroub | 2012-01-27 | 1 | -2/+2 |
* | | Fix valgrind errors with network timeouts. | Vladislav Vaintroub | 2011-12-29 | 1 | -2/+0 |
* | | Fix LP#909414: Valgrind warnings in threadpool code | Vladislav Vaintroub | 2011-12-29 | 1 | -0/+2 |
* | | Small adjustements to threadpool | Vladislav Vaintroub | 2011-12-18 | 1 | -0/+4 |
* | | Initial threadpool implementation for MariaDB 5.5 | Vladislav Vaintroub | 2011-12-08 | 1 | -2/+2 |
* | | fixes for windows | Sergei Golubchik | 2011-10-21 | 1 | -1/+1 |
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+7 |
|\ \ | |||||
| * \ | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -12/+2 |
| |\ \ | |||||
| | * \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -12/+2 |
| | |\ \ | |||||
| | | * \ | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -12/+2 |
| | | |\ \ | |||||
| | * | \ \ | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -2/+4 |
| * | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+11 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -1/+11 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge to get make String reallocation faster | Michael Widenius | 2010-11-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -2/+2 |
| | |/ / / / | |||||
* | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -44/+36 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -12/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | weave merge from mysql-5.1 to mysql-5.5 | Georgi Kodinov | 2011-02-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 1 | -1/+1 |
| * | | | | | Auto-merge mysql-5.1 -> mysql-5.5 for bug#58887. | Dmitry Shulga | 2011-01-11 | 1 | -11/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed Bug#58887 - server not throwing "Packet too large" error | Dmitry Shulga | 2011-01-11 | 1 | -11/+1 |