Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | MDEV-8715 - Obsolete sql_alloc() in favor of THD::alloc() and thd_alloc() | Sergey Vojtovich | 2015-11-26 | 1 | -3/+3 |
|/ / | |||||
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | MDEV-8805 - Assertion `!m_ordered_rec_buffer' failed in | Aditya A | 2015-10-28 | 1 | -0/+1 |
* | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-09-01 | 1 | -1/+1 |
* | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-08-27 | 1 | -4/+5 |
* | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-08-27 | 1 | -1/+1 |
* | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -4/+5 |
* | | 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 | -0/+1 |
|\ \ | |/ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -4/+1 |
|\ \ | |/ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-09-16 | 1 | -4/+1 |
| |\ | |||||
| | * | MDEV-6605 Multiple Clients Inserting Causing Error: Failed to read auto-incre... | Sergei Golubchik | 2014-09-08 | 1 | -4/+1 |
* | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -9/+0 |
* | | | cleanup: remove table->status from some engines | Sergei Golubchik | 2014-10-01 | 1 | -3/+0 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+9 |
|/ / | |||||
* | | post-fix for the merge of "Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONE... | Sergei Golubchik | 2014-05-08 | 1 | -0/+1 |
* | | merge of "Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONED TABLES" | Sergei Golubchik | 2014-05-08 | 1 | -122/+55 |
* | | 5.5 merge | Sergei Golubchik | 2014-03-26 | 1 | -44/+102 |
|\ \ | |/ | |||||
| * | move file->position() down, to make sure it's executed only when | Sergei Golubchik | 2014-03-25 | 1 | -6/+7 |
| * | MDEV-5177: ha_partition and innodb index intersection produce fewer rows (MyS... | Sergey Petrunya | 2014-03-11 | 1 | -44/+101 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -7/+67 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -8/+67 |
| |\ \ | | |/ | |||||
| | * | Post-merge fixes: merge MariaDB's fix for MDEV-5177 and MDEV-5555 | Sergey Petrunya | 2014-02-17 | 1 | -17/+7 |
| | * | Merge | Sergey Petrunya | 2014-02-17 | 1 | -2/+59 |
| | |\ | |||||
| | | * | MDEV-5177: ha_partition and innodb index intersection produce fewer rows (MyS... | Sergey Petrunya | 2014-02-17 | 1 | -2/+59 |
| | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -11/+24 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | backport of Bug#17401628 | Mattias Jonsson | 2013-11-20 | 1 | -4/+7 |
| | | * | Bug#17588348: INDEX MERGE USED ON PARTITIONED TABLE | Aditya A | 2013-11-05 | 1 | -7/+17 |
* | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -4/+4 |
* | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -14/+14 |
|\ \ \ \ | |||||
| * | | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -14/+14 |
* | | | | | mysql 5.6 partitioning bugfix: doubly-reported error | Sergei Golubchik | 2014-02-03 | 1 | -0/+3 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -4/+21 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -4/+21 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-5421 Assertion `! is_set()' fails on INSERT IGNORE when a table has no p... | Sergei Golubchik | 2014-01-23 | 1 | -1/+1 |
| | * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -3/+20 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #16051817 GOT ERROR 124 FROM STORAGE ENGINE | Aditya A | 2013-10-21 | 1 | -3/+20 |
| | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #11766851 QUERYING I_S.PARTITIONS CHANGES THE CARDINALITY OF THE | Aditya A | 2013-07-29 | 1 | -1/+1 |
* | | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 | Sergei Golubchik | 2013-11-28 | 1 | -40/+612 |
* | | | | typo fix in ha_partition::rnd_pos(), status wasn't updated | Sergei Golubchik | 2013-11-27 | 1 | -1/+1 |
* | | | | merge 10.0-base -> 10.0 | unknown | 2013-10-29 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge 5.5->10.0-base | unknown | 2013-10-29 | 1 | -0/+1 |
| |\ \ \ | | |/ / |