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 |
* | | | | MDEV-17387 MariaDB Server giving wrong error while executing select query fro... | Alexander Barkov | 2018-11-09 | 1 | -0/+5 |
* | | | | Cleanup: renaming methods make_field(Send_field*) to make_send_field(..) | Alexander Barkov | 2018-04-05 | 1 | -1/+1 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2018-02-08 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * \ | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+1 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Correct TRASH() macro usage | Sergei Golubchik | 2018-01-22 | 1 | -1/+1 |
* | | | | | | Changed database, tablename and alias to be LEX_CSTRING | Monty | 2018-01-30 | 1 | -2/+2 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | MDEV-12011 sql_mode=ORACLE: cursor%ROWTYPE in variable declarations | Alexander Barkov | 2017-04-05 | 1 | -0/+4 |
* | | | | | MDEV-10141: Add support for INTERSECT (and common parts for EXCEPT) | Oleksandr Byelkin | 2017-03-14 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Fixed bug mdev-11081. | Igor Babaev | 2016-11-21 | 1 | -1/+1 |
* | | | | MDEV-8718 - Obsolete sql_strmake() in favor of THD::strmake() and thd_strmake() | Sergey Vojtovich | 2015-11-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -0/+37 |
|\ \ \ | |/ / | |||||
| * | | MDEV-7040: Crash in field_conv, memcpy_field_possible, part#2 | Sergei Petrunia | 2015-08-03 | 1 | -0/+37 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 1 | -0/+4 |
* | | | MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP RO | Sergey Vojtovich | 2015-05-13 | 1 | -3/+3 |
* | | | MDEV-7006 MDEV-7007: SET STATEMENT and slow log | Oleksandr Byelkin | 2015-03-12 | 1 | -0/+1 |
|/ / | |||||
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-4978 - Server cursor is broken with blobs in the select list, | Sergey Vojtovich | 2013-09-06 | 1 | -1/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix for bug lp:1039277 "Crash in sql_cache.cc". | Michael Widenius | 2012-08-21 | 1 | -0/+2 |
* | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+4 |
|/ / | |||||
* | | 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 |
| | | |\ \ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | |\ \ | |||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -2/+2 |
| * | | | | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 1 | -8/+10 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | - Release build: Fix compiler warning about unused variable | Sergey Petrunya | 2011-04-30 | 1 | -4/+6 |
| | * | | | | | | | | Rename JOIN::top_jtrange_tables to top_join_tab_count | Sergey Petrunya | 2011-03-27 | 1 | -2/+2 |
| | * | | | | | | | | MWL#90: Address review feedback part #14 | Sergey Petrunya | 2011-03-27 | 1 | -4/+4 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | |