Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ | |/ / | |||||
| * | | cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced; | Sergei Golubchik | 2014-06-03 | 1 | -0/+1 |
* | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 12 | -0/+12 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 12 | -0/+12 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 12 | -0/+12 |
* | | | MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and t... | Alexander Barkov | 2014-03-07 | 1 | -3/+13 |
* | | | MDEV-4603 mysql_stmt_reset returns "commands out of sync" error | unknown | 2014-03-06 | 1 | -0/+104 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 8 | -10/+18 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 8 | -10/+18 |
| |\ \ \ | | |/ / | |||||
| | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 8 | -10/+18 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 8 | -10/+18 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed compiler errors and warnings | Michael Widenius | 2013-12-02 | 1 | -1/+1 |
* | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -0/+2 |
| |\ \ \ | | |/ / |