Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix for BUG#35570 "CHECKSUM TABLE unreliable if LINESTRING field (same conten... | unknown | 2008-04-02 | 1 | -0/+15 |
| * | | | | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it | unknown | 2008-02-11 | 1 | -0/+10 |
| * | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -6/+6 |
* | | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-04-27 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-04-20 | 1 | -0/+69 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Bug #51327 MyISAM table is automatically repaired on ALTER | Jon Olav Hauglid | 2010-04-15 | 1 | -0/+33 |
* | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge fix for BUG51866 to mysql-5.1-bugteam. | Sergey Vojtovich | 2010-03-25 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | BUG#51866 - crash with repair by sort and fulltext keys | Sergey Vojtovich | 2010-03-25 | 1 | -0/+4 |
* | | | | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -49/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 1 | -49/+49 |
| * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-20 | 1 | -0/+2 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | BUG#47444 - --myisam_repair_threads>1can result in all | Sergey Vojtovich | 2010-03-12 | 1 | -0/+19 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge fix for BUG51307 to 5.1-bugteam. | Sergey Vojtovich | 2010-03-10 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | BUG#51307 - widespread corruption with partitions and | Sergey Vojtovich | 2010-03-02 | 1 | -0/+33 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Fix for bug#51304: checksum table gives different results | Ramil Kalimullin | 2010-02-28 | 1 | -0/+17 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge fix for BUG48438 to mysql-5.1-bugteam. | Sergey Vojtovich | 2010-02-12 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | BUG#48438 - crash with error in unioned query against merge | Sergey Vojtovich | 2010-02-12 | 1 | -0/+13 |
* | | | | | | | | | | BUG#49628 - corrupt table after legal SQL, LONGTEXT column | Sergey Vojtovich | 2010-02-12 | 1 | -0/+13 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Auto-merge. | Ramil Kalimullin | 2009-12-17 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix for bug#49465: valgrind warnings and incorrect live checksum... | Ramil Kalimullin | 2009-12-17 | 1 | -0/+15 |
* | | | | | | | | A follow-up to fix for | Sergey Vojtovich | 2009-10-27 | 1 | -0/+6 |
* | | | | | | | | Disabled part of test for BUG#47073 until additional fix is pushed. | Sergey Vojtovich | 2009-10-15 | 1 | -7/+0 |
* | | | | | | | | BUG#47073 - valgrind errs, corruption,failed repair of partition, | Sergey Vojtovich | 2009-10-09 | 1 | -0/+28 |