Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+2 |
|\ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -4/+4 |
| |\ | |||||
| * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -4/+1 |
* | | | | Fixed after-merge failures found by buildbot | Michael Widenius | 2011-05-03 | 1 | -2/+3 |
* | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -3/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -3/+3 |
| |/ / | |||||
* | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -5/+11 |
* | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | Bug#22320: my_atomic-t unit test fails | Davi Arnaut | 2010-07-05 | 1 | -2/+1 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -13/+22 |
|\ \ \ | |/ / | |||||
| * | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash | Magnus BlÄudd | 2009-10-06 | 1 | -1/+1 |
| * | | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -2/+10 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
* | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -0/+10 |
* | | | Merged 5.1 maria with 5.1 maria team tree. Automerge. | Michael Widenius | 2008-10-11 | 1 | -6/+5 |
|\ \ \ | |||||
| * | | | Implement conditional building correctly. | Sergei Golubchik | 2008-10-01 | 1 | -6/+5 |
* | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Bug#37003 Tests sporadically crashes with embedded server | Davi Arnaut | 2008-06-18 | 1 | -1/+1 |
* | | | WL#3064 - waiting threads - wait-for graph and deadlock detection | Sergei Golubchik | 2008-07-29 | 1 | -1/+1 |
* | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Makefile.am: | unknown | 2008-03-28 | 1 | -1/+1 |
* | | | Added wrapper for chmod(): my_chmod() | unknown | 2008-01-03 | 1 | -1/+1 |
* | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -3/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | Moved randomize and my_rnd under mysys | unknown | 2007-10-09 | 1 | -0/+1 |
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-04 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | WL#3072 - Maria recovery | unknown | 2007-06-26 | 1 | -1/+1 |
| * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -2/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak | unknown | 2007-04-16 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | Pagecache integration for review. | unknown | 2007-04-04 | 1 | -1/+2 |
| | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -2/+5 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria | unknown | 2007-02-02 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | postreview changes for page cache and pre review commit for loghandler | unknown | 2007-02-02 | 1 | -1/+1 |
| | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -2/+5 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -3/+7 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | Maria - WL#3134 Key cache to Page cache conversion | unknown | 2006-11-16 | 1 | -55/+0 |
| | | | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2006-09-20 | 1 | -1/+2 |
| | | | | |\ \ | |||||
| | | | | | * | | amd64 atomic ops | unknown | 2006-08-10 | 1 | -1/+2 |
| | | | | * | | | Maria, very minor changes. | unknown | 2006-09-20 | 1 | -1/+2 |
| | | | | * | | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria | unknown | 2006-08-14 | 1 | -1/+58 |
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | | * | | The pagae cache added. | unknown | 2006-07-06 | 1 | -1/+57 |
* | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50 | unknown | 2007-11-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Bug #20748: Configuration files should not be read more than once | unknown | 2007-11-07 | 1 | -1/+1 |
* | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build | unknown | 2007-03-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Makefile.am, CMakeLists.txt: | unknown | 2007-03-12 | 1 | -1/+1 |
* | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build | unknown | 2007-03-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build | unknown | 2007-03-12 | 1 | -1/+1 |
| |\ \ \ \ \ |