Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -21/+26 |
|\ | |||||
| * | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -6/+4 |
| |\ | |||||
| | * | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -6/+4 |
* | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 |
* | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -2/+3 |
| * | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-10-20 | 1 | -2/+1 |
| |\ \ \ | |||||
| | * | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -2/+1 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -38/+36 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -1/+1 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -34/+34 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -6/+6 |
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -33/+33 |
| | |\ \ | | | |/ | |||||
| * | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -5/+6 |
| |/ / | |||||
| * | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -4/+4 |
| |\ \ | |||||
| | * \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -4/+4 |
| | |\ \ | |||||
| * | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -4/+2 |
| |/ / / | |||||
| * | | | Fixed bug #47455 - a failure with main.myisam_crash_before_flush_keys.test | Igor Babaev | 2009-09-19 | 1 | -1/+4 |
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -6/+6 |
| |\ \ \ | |||||
| * \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings by adding casts and changing variable types | unknown | 2008-01-11 | 1 | -4/+4 |
| * | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -19/+17 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | WL#3071 Maria checkpoint, WL#3072 Maria recovery | unknown | 2007-11-16 | 1 | -2/+0 |
| | * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -17/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -17/+17 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -17/+17 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -17/+17 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2006-08-10 | 1 | -0/+1 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | amd64 atomic ops | unknown | 2006-08-10 | 1 | -0/+1 |
| | | | | | * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 | unknown | 2006-05-24 | 1 | -17/+16 |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | | | |||||
| | | | | | | * | | | | | | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -17/+16 |
* | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -1/+0 |
* | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -31/+9 |
* | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -15/+2 |
* | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -5/+2 |
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -33/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -33/+33 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | A follow-up on WL#5154 and WL#5182: remove forgotten options. | Alexander Nozdrin | 2010-03-03 | 1 | -7/+0 |
* | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ... | Alexey Botchkov | 2009-10-09 | 1 | -1/+3 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-11-25 | 1 | -0/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -43/+43 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -1/+1 |
* | | | | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-03 | 1 | -3/+3 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Bug#43940 64-bit windows myisamchk doesn't support key_buffer_size > 4G | Sergey Glukhov | 2009-05-27 | 1 | -5/+5 |
* | | | | | | | | | | merging with 5.0 bugteam tree | Anurag Shekhar | 2009-04-09 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Bug #38103 myisamchk: --help output incomplete | Anurag Shekhar | 2009-02-24 | 1 | -0/+1 |
| |_|_|_|_|_|_|/ |/| | | | | | | |