Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | dirty merge | Oleksandr Byelkin | 2019-02-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-03 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.1 into 10.1 | Marko Mäkelä | 2019-02-02 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-01-28 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Crude "auto-load-data-local-infile" modemariadb-5.5.63 | Sergei Golubchik | 2019-01-27 | 1 | -1/+1 |
* | | | | | MDEV-14792 INSERT without column list into table with explicit versioning col... | Aleksey Midenkov | 2018-01-01 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | small plugin API related fixes | Sergei Golubchik | 2017-03-10 | 1 | -0/+4 |
| |/ / | |||||
* | | | MDEV-11066 use MySQL terminology for "virtual columns" | Sergei Golubchik | 2016-12-12 | 1 | -0/+6 |
* | | | MDEV-10421 duplicate CHECK CONSTRAINTs. | Alexey Botchkov | 2016-09-06 | 1 | -0/+1 |
* | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 1 | -1/+4 |
* | | | MDEV-9293 Connector/C integration | Vladislav Vaintroub | 2016-08-19 | 1 | -4/+1 |
* | | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -1/+1 |
|/ / | |||||
* | | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() | Oleksandr Byelkin | 2015-09-06 | 1 | -2/+2 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | MDEV-7419 Function cli_safe_read not exportedmariadb-5.5.42 | Sergei Golubchik | 2015-02-13 | 1 | -0/+6 |
* | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | MDEV-6671 mysql_server_end breaks OpenSSL | Sergei Golubchik | 2015-01-19 | 1 | -0/+1 |
* | | Client attributes | unknown | 2013-10-03 | 1 | -0/+2 |
* | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+8 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+4 |
| |\ \ | | |/ | |||||
| | * | MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic plugins | Sergei Golubchik | 2013-06-13 | 1 | -0/+1 |
| | * | MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN | Sergei Golubchik | 2013-06-11 | 1 | -1/+3 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5 | Georgi Kodinov | 2012-07-05 | 1 | -1/+2 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-18 | 1 | -3/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ... | Michael Widenius | 2013-04-17 | 1 | -2/+2 |
| * | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -6/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-3868 : windows client compilation issues | Vladislav Vaintroub | 2012-11-20 | 1 | -6/+5 |
| * | | | MDEV-3802. Millisecond timeout support in non-blocking client library. | unknown | 2012-10-12 | 1 | -0/+1 |
* | | | | MDEV-3802: Millisecond timeout support in non-blocking client library + fix i... | unknown | 2012-10-12 | 1 | -0/+1 |
* | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -3/+3 |
* | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -2/+6 |
|/ / / | |||||
* | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -3/+154 |
|\ \ \ | |||||
| * | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -25/+20 |
| * | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -3/+157 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | |