Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -10/+17 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| |\ | |||||
* | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -5/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -5/+0 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -7/+7 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+5 |
| |\ \ | | |/ | |||||
| | * | Bug#48327: Some crashes specific to FreeBSD ("embedded") | Davi Arnaut | 2010-07-16 | 1 | -2/+5 |
| * | | Fixed compiler warnings | Michael Widenius | 2010-06-16 | 1 | -1/+1 |
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -2/+37 |
| |\ \ | | |/ | |||||
| * | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -6/+3 |
| |\ \ | |||||
| * \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -15/+17 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -10/+10 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -1/+1 |
| | * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -9/+9 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -9/+9 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Fixes after review of guilhem of block record patch | unknown | 2007-04-19 | 1 | -4/+4 |
| | | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -5/+5 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -5/+5 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -5/+5 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -5/+5 |
| | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 | unknown | 2006-05-24 | 1 | -5/+5 |
| | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -5/+5 |
* | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -14/+0 |
* | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -2/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | BUG#51868 - crash with myisam_use_mmap and partitioned | Sergey Vojtovich | 2010-03-22 | 1 | -2/+29 |
* | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | BUG#49628 - corrupt table after legal SQL, LONGTEXT column | Sergey Vojtovich | 2010-02-12 | 1 | -0/+8 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -21/+22 |
* | | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -5/+5 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Bug #47139 Test "merge" crashes in "embedded" run | Alexey Botchkov | 2009-11-11 | 1 | -2/+5 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -6/+3 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Bug#38848 myisam_use_mmap causes widespread myisam corruption on windows | Narayanan V | 2009-04-09 | 1 | -3/+3 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-03-28 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2008-02-27 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-11-26 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -4/+4 |
| | | |/ / / / / / / / | |||||
* | | | | | | | | | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/... | unknown | 2008-03-07 | 1 | -15/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Bug#33222 - myisam-table drops rows when column is added | unknown | 2008-01-14 | 1 | -15/+17 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> | unknown | 2008-02-18 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge mysql.com:/home/hf/work/31305/my50-31305 | unknown | 2007-11-12 | 1 | -0/+68 |
|/ / / / / / / / | |||||
* | | | | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris | unknown | 2007-08-13 | 1 | -18/+18 |
|/ / / / / / / |