Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-24 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -2/+2 |
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -1/+1 |
* | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -43/+23 |
|\ \ \ | |/ / | |||||
| * | | thd_rnd service | Sergei Golubchik | 2017-03-10 | 1 | -1/+5 |
| * | | cleanup: generalize my_sha1.cc | Sergei Golubchik | 2017-03-10 | 1 | -23/+22 |
|/ / | |||||
* | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron... | Sergei Golubchik | 2014-05-13 | 1 | -2/+2 |
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | Do the partial merge of WL#5602 correctly: | Sergei Golubchik | 2013-12-09 | 1 | -40/+15 |
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -42/+73 |
|/ | |||||
* | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -0/+1 |
|\ | |||||
| * | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+2 |
| |\ | |||||
| | * | auto mere mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2012-04-06 | 1 | -1/+1 |
| | |\ | |/ / | |||||
| | * | Bug #13934049: 64884: LOGINS WITH INCORRECT PASSWORD ARE ALLOWED | Georgi Kodinov | 2012-04-06 | 1 | -1/+1 |
* | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | mdev-212 sporadic main.connect failures in 5.3 | Sergei Golubchik | 2012-04-04 | 1 | -1/+1 |
* | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | after merge fixes | Sergei Golubchik | 2011-11-28 | 1 | -2/+2 |
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -17/+21 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -17/+21 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -17/+18 |
| | | |\ \ | |||||
* | | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -15/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge of mysql-5.1 into mysql-5.5. | Davi Arnaut | 2011-05-30 | 1 | -15/+17 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Bug#12563279: REGRESSION IN HANDLING PRE-4.1 AUTHENTICATION PACKET | Davi Arnaut | 2011-05-30 | 1 | -15/+17 |
| | |/ / / / | |||||
| * | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -6/+6 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -41/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -6/+6 |
| | |_|/ | |/| | | |||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -8/+45 |
| |\ \ \ | | |/ / | |||||
| * | | | Moved randomize and my_rnd under mysys | unknown | 2007-10-09 | 1 | -35/+7 |
* | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Manual merge. | Alexey Kopytov | 2009-06-01 | 1 | -8/+45 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug #44767: invalid memory reads in password() and | Alexey Kopytov | 2009-05-27 | 1 | -8/+45 |
* | | Merge mysql.com:/home/my/mysql-5.0 | unknown | 2007-01-27 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-01-22 | 1 | -3/+4 |
| |\ | |||||
| | * | Fixed compiler warnings detected by option -Wshadow and -Wunused: | unknown | 2006-12-15 | 1 | -3/+4 |
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0 | unknown | 2006-12-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | my_strtoll10-x86.s: | unknown | 2006-12-31 | 1 | -1/+1 |
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0 | unknown | 2006-12-23 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Many files: | unknown | 2006-12-23 | 1 | -2/+1 |
| |/ |