Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -3/+11 |
|\ | |||||
| * | Auto-merge from upstream 5.1-bugteam | Timothy Smith | 2009-01-08 | 1 | -1/+8 |
| |\ | |||||
| | * | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge main 5.1 into 5.1-build | Joerg Bruehe | 2008-12-10 | 1 | -108/+168 |
| | | |\ | |||||
| | | * \ | Merge from mysql-5.1.30-release | unknown | 2008-11-27 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| | * | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-24 | 1 | -0/+7 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Bug#41456 SET PASSWORD hates CURRENT_USER() | Sergey Glukhov | 2008-12-24 | 1 | -0/+7 |
| * | | | | | Fix a few problems after latest bunch of InnoDB snapshot changes: | Timothy Smith | 2009-01-08 | 1 | -2/+3 |
| |/ / / / | |||||
* | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -28/+33 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge with base MySQL-5.1-maria | Michael Widenius | 2008-12-03 | 1 | -116/+13 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -116/+14 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -15/+9 |
| |/ / / / | |||||
| * | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -21/+74 |
| |\ \ \ \ | |||||
| * | | | | | wt_thd_lazy_init(), per-thread deadlock search depths and timeouts | Sergei Golubchik | 2008-08-08 | 1 | -1/+14 |
| * | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -57/+139 |
| |\ \ \ \ \ | |||||
| * | | | | | | No more 'have_maria' variable, use information schema.engines. | unknown | 2008-04-24 | 1 | -1/+0 |
| * | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -6/+6 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it | unknown | 2008-02-11 | 1 | -1/+1 |
| * | | | | | | | midding DBUG_RETURN | unknown | 2008-02-07 | 1 | -1/+2 |
| * | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -0/+100 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed compiler warnings by adding casts and changing variable types | unknown | 2008-01-11 | 1 | -1/+1 |
| * | | | | | | | | Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work | unknown | 2008-01-11 | 1 | -1/+1 |
| * | | | | | | | | after merge | unknown | 2007-12-28 | 1 | -9/+1 |
| * | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -8/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixes to merge. | unknown | 2007-12-20 | 1 | -6/+13 |
| | * | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -6/+6 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | make maria more pluggable | unknown | 2007-10-12 | 1 | -167/+0 |
| | | * | | | | | | | | remove maria_* variables from the server, declare them in ha_maria.cc | unknown | 2007-10-06 | 1 | -23/+2 |
| | | * | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -2/+190 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Merged with mysql-5.1 main tree. | unknown | 2007-07-02 | 1 | -7/+7 |
| | | | * | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -2/+190 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Fixed dubug info. | unknown | 2007-04-18 | 1 | -6/+5 |
| | | | | * | | | | | | | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak | unknown | 2007-04-16 | 1 | -2/+174 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | Pagecache integration for review. | unknown | 2007-04-04 | 1 | -2/+174 |
| | | | | * | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -3/+37 |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | |||||
| | | | | | * | | | | | | | | merge of recent MyISAM changes into Maria. | unknown | 2006-12-20 | 1 | -0/+2 |
| | | | | | * | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -3/+35 |
| | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -3/+37 |
| | | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2006-10-13 | 1 | -2/+2 |
| | | | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2006-09-20 | 1 | -2/+2 |
| | | | | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2006-08-10 | 1 | -2/+2 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | | * | | | | | | | | amd64 atomic ops | unknown | 2006-08-10 | 1 | -2/+2 |
| | | | | | | | * | | | | | | | | | | | Merge of recent MyISAM changes into Maria. Testsuite passes as much | unknown | 2006-10-11 | 1 | -2/+2 |
| | | | | | | | * | | | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-10-10 | 1 | -1/+35 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / | |||||
| | | | | | | | | * | | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -1/+35 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / / | |||||
| | | | | | | | | | * | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -1/+35 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 | unknown | 2006-05-24 | 1 | -1/+35 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | * | | | | | | | | | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -1/+35 |
* | | | | | | | | | | | | | | | | | | | | | merged bug 37339 to 5.1-bugteam | Georgi Kodinov | 2008-11-28 | 1 | -15/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |