Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-11082 mysql_client_test: test_ps_query_cache fails with group-concat-max... | Elena Stepanova | 2016-10-19 | 1 | -0/+3 |
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fix free() after my_malloc() (should be my_free()). | Kristian Nielsen | 2016-09-24 | 1 | -1/+1 |
* | | | | MDEV-11082: Fix mysql_client_test.c (by Elena) | Nirbhay Choubey | 2016-12-19 | 1 | -0/+3 |
* | | | | store/show vcols as item->print() | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | | MDEV-7145: Delayed replication | Kristian Nielsen | 2016-10-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | MDEV-7145: Delayed replication, fixing test failures. | Kristian Nielsen | 2016-10-14 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-subm | Sergei Golubchik | 2016-09-21 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0 | Oleksandr Byelkin | 2016-08-16 | 1 | -3/+3 |
| | | * | | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0 | Oleksandr Byelkin | 2016-08-15 | 1 | -4/+5 |
* | | | | | After-review changes | Sergei Golubchik | 2016-09-12 | 2 | -43/+2 |
* | | | | | Add C/C as a submodule in libmariadb/ | Sergei Golubchik | 2016-09-12 | 1 | -5/+7 |
* | | | | | MDEV-9293 - Use MariaDB's Connector/C in server | Vladislav Vaintroub | 2016-08-25 | 4 | -34/+55 |
|/ / / / | |||||
* | | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 4 | -55/+34 |
* | | | | MDEV-9293 Connector/C integration | Vladislav Vaintroub | 2016-08-19 | 4 | -34/+55 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -7/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -7/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci | Sergei Golubchik | 2016-04-24 | 1 | -7/+7 |
* | | | | Cleanups: | Monty | 2016-04-05 | 1 | -2/+3 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 3 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 3 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 3 | -6/+6 |
* | | | | Merge branch '10.1' into 10.2 | Monty | 2016-02-06 | 1 | -0/+49 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-5273 Prepared statement doesn't return metadata after prepare. | Alexey Botchkov | 2016-01-28 | 1 | -0/+14 |
| * | | | MDEV-5273 Prepared statement doesn't return metadata after prepare. | Alexey Botchkov | 2016-01-28 | 1 | -0/+7 |
| * | | | MDEV-5273 Prepared statement doesn't return metadata after prepare. | Alexey Botchkov | 2016-01-28 | 1 | -0/+7 |
| * | | | MDEV-5273 Prepared statement doesn't return metadata after prepare. | Alexey Botchkov | 2016-01-28 | 1 | -0/+7 |
| * | | | MDEV-5273 Prepared statement doesn't return metadata after prepare. | Alexey Botchkov | 2016-01-28 | 1 | -1/+6 |
| * | | | MDEV-5273 Prepared statement doesn't return metadata after prepare. | Alexey Botchkov | 2016-01-26 | 1 | -0/+9 |
* | | | | MDEV-9117: Client Server capability negotiation for MariaDB specific function... | Oleksandr Byelkin | 2016-02-02 | 1 | -2/+5 |
* | | | | Fix client unit test to drop all used tables. | Oleksandr Byelkin | 2016-02-02 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 2 | -0/+9 |
|\ \ \ | |/ / | |||||
| * | | Fixes to get all test to run on MacosX Lion 10.7 | Monty | 2015-11-29 | 2 | -0/+9 |
* | | | add missing DBUG_RETURN-s | Sergei Golubchik | 2015-11-16 | 1 | -1/+1 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s... | Oleksandr Byelkin | 2015-09-04 | 1 | -3/+19 |
* | | | remove a google specific script | Sergei Golubchik | 2015-04-08 | 1 | -119/+0 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -0/+119 |
|/ / | |||||
* | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 2 | -2/+2 |
| |\ | |||||
| | * | Changing the copyright headers a bit to be complaint with the standards | Murthy Narkedimilli | 2014-08-27 | 2 | -2/+2 |
* | | | 5.5.40+ merge | Sergei Golubchik | 2014-10-09 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5120 Test suite test maria-no-logging fails | Sergei Golubchik | 2014-10-02 | 1 | -5/+5 |
* | | | MDEV-6647 MariaDB CLI client doesnt show CREATE INDEX progress | Sergei Golubchik | 2014-09-10 | 1 | -1/+19 |
* | | | Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance ... | Michael Widenius | 2014-07-19 | 1 | -1/+103 |
* | | | MDEV-5995 MySQL Bug#12750920: EMBEDDED SERVER START/STOP. | Alexey Botchkov | 2014-06-11 | 2 | -11/+175 |
* | | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -0/+1 |
|\ \ \ | |/ / |