Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -0/+11 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -0/+11 |
| |\ | |||||
| | * | MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with disabled | Sergey Vojtovich | 2015-06-09 | 1 | -0/+11 |
* | | | MDEV-6137 better help for SET/ENUM sysvars | Sergei Golubchik | 2014-06-19 | 1 | -4/+4 |
|/ / | |||||
* | | Check for duplicate index (port from mysql) | unknown | 2013-09-20 | 1 | -0/+5 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix test failure in myisam.test: | Sergey Petrunya | 2013-07-08 | 1 | -2/+2 |
* | | | Added some fixes that should make MyISAM & Aria REPAIR work with more than 4G... | Michael Widenius | 2013-05-10 | 1 | -2/+2 |
* | | | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
* | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -24/+5 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -24/+5 |
| |\ | |||||
* | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 1 | -1/+1 |
|/ / | |||||
* | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | BUG#11756869: Merge from mysql-5.1 to mysql-5.5 | Ashish Agarwal | 2012-02-02 | 1 | -0/+13 |
| |\ | |||||
| | * | BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAIN | Ashish Agarwal | 2012-02-02 | 1 | -0/+13 |
| | |\ | |||||
| | | * | BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAIN | Ashish Agarwal | 2012-02-01 | 1 | -0/+13 |
| * | | | Merge. | Sergey Vojtovich | 2011-10-21 | 1 | -0/+24 |
| |\ \ \ | | |/ / | |||||
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -0/+24 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -0/+24 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+24 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | * | | | BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN | Sergey Vojtovich | 2011-10-20 | 1 | -0/+24 |
| | | | | |/ | | | | |/| | |||||
* | | | | | | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -3/+3 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Made the optimizer switch for index condition pushdown set to 'on' by default. | Igor Babaev | 2011-11-21 | 1 | -3/+3 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed a cost estimation bug introduced into in the function best_access_path | Igor Babaev | 2011-09-30 | 1 | -1/+25 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -8/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Set the default to be mrr=off,mrr_sort_keys=off: | Sergey Petrunya | 2011-07-08 | 1 | -3/+3 |
| * | | | | | Merge: Make EXPLAIN better at displaying MRR/BKA | Sergey Petrunya | 2011-04-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 1 | -1/+1 |
| * | | | | | | merge | Vladislav Vaintroub | 2011-03-29 | 1 | -0/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | lp:702084 - myisam_block_size is not reported in SHOW GLOBAL VARIABLES | Sergei Golubchik | 2011-03-28 | 1 | -0/+6 |
| | |/ / / | |||||
| * | | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -3/+3 |
| * | | | | Fixed bug #52636. | Igor Babaev | 2010-09-28 | 1 | -1/+1 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -11/+43 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -0/+100 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.1.46 after-merge fixes: must FLUSH TABLES before copying .frm. | unknown | 2010-05-02 | 1 | -0/+1 |
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+99 |
| | |\ \ | | | |/ | |||||
| * | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -0/+61 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+15 |
| | |\ \ | |||||
| | * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+46 |
| | |\ \ \ | |||||
| * | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -5/+5 |
| |/ / / / | |||||
| * | | | | A change of direction for fix 10 csets ago: | Sergey Petrunya | 2009-09-18 | 1 | -1/+1 |
| * | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+27 |
| |\ \ \ \ | |||||
| * | | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -0/+6 |
| * | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+22 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -0/+182 |
| |\ \ \ \ \ \ \ |