Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -8/+7 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -8/+7 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -8/+7 |
| | |\ | |||||
| | | * | reduce code duplication a littlemariadb-5.5.54 | Sergei Golubchik | 2016-12-22 | 1 | -8/+7 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -13/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10435 crash with bad stat tables. | Alexey Botchkov | 2016-12-09 | 1 | -13/+1 |
* | | | | Use sql_mode_t for sql_mode. | Monty | 2016-10-05 | 1 | -3/+3 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 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 |
* | | | | Removed TABLE->sort to make it possible to have multiple active calls to | Monty | 2016-03-22 | 1 | -2/+3 |
|/ / / | |||||
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -2/+3 |
* | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -3/+1 |
* | | | MDEV-7281 EVENT: CREATE OR REPLACE | Alexander Barkov | 2015-02-27 | 1 | -4/+14 |
|/ / | |||||
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -6/+6 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+4 |
|\ \ | |||||
| * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -3/+3 |
| * | | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -1/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | MDEV-4332 Increase username length from 16 characters | Sergei Golubchik | 2013-04-18 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ... | Michael Widenius | 2013-04-17 | 1 | -1/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -2/+8 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -2/+8 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -2/+8 |
| | |\ | |||||
| | | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -2/+8 |
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -5/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -5/+0 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -8/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Switch automaticly to statement based replication for statements that can't g... | Michael Widenius | 2012-09-04 | 1 | -8/+3 |
| |/ / | |||||
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -3/+4 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -13/+34 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -13/+34 |
| | |\ \ | |||||
| | | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -13/+34 |
| | | |\ \ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -14/+32 |
| | | | |\ \ | |||||
* | | | | \ \ | merge | Sergei Golubchik | 2011-11-03 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -4/+4 |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -10/+14 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -6/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -6/+4 |
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -3/+4 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | |