Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Monty | 2018-01-01 | 1 | -9/+0 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.1' into 10.2 | Vicențiu Ciorbaru | 2017-12-22 | 1 | -9/+0 |
| |\ | |||||
| | * | MDEV-14265 - RPMLint warning: shared-lib-calls-exit | Sergey Vojtovich | 2017-12-19 | 1 | -9/+0 |
* | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -9/+4 |
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-03-31 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | MDEV-11752 Unsafe strmov - function definition in include/m_string.h | Sergei Golubchik | 2017-03-10 | 1 | -0/+2 |
* | | | MDEV-10141: Add support for INTERSECT (and common parts for EXCEPT) | Oleksandr Byelkin | 2017-03-14 | 1 | -0/+6 |
|/ / | |||||
* | | MDEV-10138 Support for decimals up to 38 digits | Monty | 2016-06-22 | 1 | -4/+4 |
|/ | |||||
* | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -8/+0 |
|\ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -8/+0 |
* | | cleanup: move safe_str*() from sql_acl.cc to m_string.h | Sergei Golubchik | 2014-10-10 | 1 | -0/+11 |
|/ | |||||
* | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -2/+4 |
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
|\ | |||||
| * | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -1/+1 |
* | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
* | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -0/+9 |
| |_|/ |/| | | |||||
* | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmake | Sergei Golubchik | 2012-07-31 | 1 | -5/+1 |
* | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Upmerge the AIX compile fix into 5.5. | Joerg Bruehe | 2012-02-16 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| | * | Compile fix needed for AIX, | Joerg Bruehe | 2012-01-19 | 1 | -1/+3 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -5/+7 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -6/+19 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -6/+19 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+9 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | merge 5.0-security => 5.1-security | Tor Didriksen | 2011-07-15 | 1 | -0/+9 |
| | | | |\ \ | |||||
| | | | | * | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL | Tor Didriksen | 2011-07-15 | 1 | -0/+9 |
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -6/+10 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+2 |
| | | | |\ \ \ | |||||
| | | | | * | | | BUG 11763056 - 55721: AIX 5.1.50 build failing, cannot locate bzero | Davi Arnaut | 2011-05-27 | 1 | -1/+1 |
* | | | | | | | | 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/+4 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -69/+6 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+3 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+3 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -16/+3 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 1 | -15/+0 |
| * | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-11-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Bug#57994: Compiler flag change build error : my_redel.c | Davi Arnaut | 2010-11-20 | 1 | -1/+1 |
| * | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-11-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Bug#57994: Compiler flag change build error : my_redel.c | Davi Arnaut | 2010-11-17 | 1 | -2/+2 |
| * | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-11-16 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -1/+3 |
* | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -6/+0 |