Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -0/+20 |
|\ | |||||
| * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -0/+20 |
| |\ | |||||
| | * | MDEV-14786: Server crashes in Item_cond::transform on 2nd execution of SP que... | Oleksandr Byelkin | 2018-01-23 | 1 | -0/+20 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-01-02 | 1 | -5/+46 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-01-02 | 1 | -5/+46 |
| |\ \ | | |/ | |||||
| | * | MDEV-10657: incorrect result returned with binary protocol (prepared statements) | Oleksandr Byelkin | 2017-12-27 | 1 | -2/+46 |
* | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2017-11-09 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | MDEV-14164: Unknown column error when adding aggregate to function in oracle ... | Oleksandr Byelkin | 2017-11-09 | 1 | -2/+4 |
* | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-... | Oleksandr Byelkin | 2017-08-16 | 1 | -2/+2 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-... | Oleksandr Byelkin | 2017-07-18 | 1 | -1/+3 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | Fixed bug mdev-12099. | Igor Babaev | 2017-02-27 | 1 | -0/+3 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Fixed bug mdev-11161. | Igor Babaev | 2016-11-11 | 1 | -0/+2 |
* | | | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) | Sergey Vojtovich | 2015-08-21 | 1 | -1/+1 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -1/+4 |
| |\ \ | | |/ | |||||
| | * | MDEV-8018: main.multi_update fails with --ps-protocol | Oleksandr Byelkin | 2015-04-22 | 1 | -1/+3 |
* | | | MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP RO | Sergey Vojtovich | 2015-05-13 | 1 | -1/+1 |
* | | | MDEV-7951 - sql_alloc() takes 0.25% in OLTP RO | Sergey Vojtovich | 2015-05-13 | 1 | -1/+1 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | MDEV-7260: Crash in get_best_combination when executing multi-table UPDATE wi... | unknown | 2015-02-11 | 1 | -0/+3 |
* | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -4/+14 |
|\ \ \ | |/ / | |||||
| * | | MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML f... | Michael Widenius | 2015-01-29 | 1 | -4/+14 |
* | | | cleanup: comments referring to non-extistent Item classes | Sergei Golubchik | 2014-12-04 | 1 | -1/+1 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -3/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-6785 Wrong result on 2nd execution of PS with aggregate function, FROM S... | Sergei Golubchik | 2014-11-18 | 1 | -2/+0 |
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1 | Sergei Golubchik | 2014-10-16 | 1 | -5/+3 |
|\ \ \ | |/ / | |||||
| * | | crash in main.views (and other view + PS tests) | Sergei Golubchik | 2014-08-07 | 1 | -0/+2 |
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -5/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-6441: memory leak | unknown | 2014-07-31 | 1 | -5/+1 |
* | | | MDEV-334: Backport of UNION ALL optimization from mysql-5.7. | Igor Babaev | 2014-10-14 | 1 | -2/+2 |
|/ / | |||||
* | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -6/+11 |
|\ \ | |/ | |||||
| * | 5.3 merge | Sergei Golubchik | 2014-06-02 | 1 | -6/+11 |
| |\ | |||||
| | * | MDEV-6251: SIGSEGV in query optimizer (in set_check_materialized with MERGE v... | unknown | 2014-06-02 | 1 | -6/+11 |
| | * | 5.2 merge | Sergei Golubchik | 2014-03-16 | 1 | -1/+1 |
| | |\ | |||||
| | | * | mysql-5.1.73 merge | Sergei Golubchik | 2014-03-15 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
* | | | | | 5.5 merge | Sergei Golubchik | 2014-03-26 | 1 | -20/+30 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3-merge | Sergei Golubchik | 2014-03-16 | 1 | -20/+30 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-5740: Assertion `!derived->first_select()->exclude_from_table_unique_tes... | unknown | 2014-03-07 | 1 | -20/+30 |
* | | | | | merge 10.0-base ->10.0 | unknown | 2014-02-05 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |