Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove libmysql/ | Sergei Golubchik | 2016-09-12 | 1 | -4922/+0 |
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -9/+4 |
|\ | |||||
| * | MDEV-10034 Embedded server crashes on CREATE TABLE in PS protocol | Sergei Golubchik | 2016-05-07 | 1 | -9/+4 |
* | | MDEV-10138 Support for decimals up to 38 digits | Monty | 2016-06-22 | 1 | -1/+1 |
* | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
|\ | |||||
| * | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | Fixes needed to compile with musl C library | Monty | 2016-02-07 | 1 | -2/+4 |
* | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -2/+12 |
|\ \ | |/ | |||||
| * | MDEV-7871 Tests fail massively on "Assertion `status_var.memory_used == 0'" w... | Alexey Botchkov | 2015-06-15 | 1 | -2/+12 |
* | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -2/+1 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 1 | -0/+17 |
| |\ |/ / | |||||
| * | MDEV-7419 Function cli_safe_read not exportedmariadb-5.5.42 | Sergei Golubchik | 2015-02-13 | 1 | -0/+17 |
* | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | MDEV-6671 mysql_server_end breaks OpenSSL | Sergei Golubchik | 2015-01-19 | 1 | -1/+2 |
* | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -2/+6 |
|\ \ | |/ | |||||
| * | mysql-5.5.38 merge | Sergei Golubchik | 2014-06-03 | 1 | -2/+6 |
| |\ | |||||
| | * | BUG#18080920: CRASH; MY_REALLOC_STR DEREFERENCES NEGATIVE VALUE | Nisha Gopalakrishnan | 2014-04-24 | 1 | -1/+5 |
* | | | MDEV-4603 mysql_stmt_reset returns "commands out of sync" error | unknown | 2014-03-06 | 1 | -17/+16 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -14/+14 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to di... | Alexey Botchkov | 2013-11-25 | 1 | -2/+2 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -5/+5 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -5/+7 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -5/+3 |
| |\ \ \ \ |/ / / / / | | | _ / | | | / | |||||
| * | | | Merging from 5.3 | Alexander Barkov | 2013-07-08 | 1 | -5/+3 |
| |\ \ \ | |||||
| | * | | | MDEV-4667 DATE('string') incompability between mysql and mariadb | Sergei Golubchik | 2013-07-03 | 1 | -5/+3 |
| | * | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | |\ \ \ | |||||
| | | * \ \ | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | | |\ \ \ | |||||
| | | | * \ \ | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | | | |\ \ \ | |||||
* | | | | \ \ \ | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+8 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Bug #14553380 MYSQL C API LIBRARY EXITS AT NET_CLEAR AT NET_SERV.CC:223 | Venkata Sidagam | 2013-01-10 | 1 | -1/+8 |
| | * | | | | | merge 5.1 => 5.5 | Tor Didriksen | 2012-11-01 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TEST | Tor Didriksen | 2012-11-01 | 1 | -1/+1 |
| | | | |_|_|/ | | | |/| | | | |||||
* | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
* | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+4 |
|/ / / / / / | |||||
* | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -4/+5 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge bug#13708485 5.1->5.5 | Georgi Kodinov | 2012-06-29 | 1 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -4/+4 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+2 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | |