Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -2/+1 |
|\ | |||||
| * | MDEV-7814 Assertion `args[0]->fixed' fails in Item_func_conv_charset::Item_fu... | Alexander Barkov | 2015-04-15 | 1 | -1/+0 |
* | | MDEV-6044 MySQL BUG#12735829 - SPACE() FUNCTION WARNING REFERS TO REPEAT() IN... | Alexander Barkov | 2014-09-04 | 1 | -0/+10 |
* | | MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 context | Alexander Barkov | 2014-09-01 | 1 | -1/+4 |
* | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -0/+15 |
|\ \ | |/ | |||||
| * | MDEV-5745 analyze MySQL fix for bug#12368495 | Alexander Barkov | 2014-07-28 | 1 | -0/+15 |
* | | Moving implementation of INET_ATON() INET_NTOA() into | Alexander Barkov | 2014-05-30 | 1 | -15/+0 |
* | | 5.5 merge | Sergei Golubchik | 2014-03-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | 5.3 merge | Sergei Golubchik | 2014-03-25 | 1 | -1/+1 |
| |\ | |||||
| | * | MDEV-5783 Assertion `0' failed in make_sortkey(SORTPARAM*, uchar*, uchar*) on... | Alexander Barkov | 2014-03-23 | 1 | -1/+1 |
* | | | MDEV-5840: group_concat( column_json(dynamic_column )) return empty result | unknown | 2014-03-13 | 1 | -0/+1 |
* | | | WEIGHT_STRING fix: correct Item_func_weight_string::eq() method | Sergei Golubchik | 2014-02-03 | 1 | -0/+9 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -2/+0 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -2/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | merge 5.3 -> 5.5 | Alexander Barkov | 2014-01-28 | 1 | -2/+0 |
| | |\ \ | | | |/ | |||||
* | | | | Do the partial merge of WL#5602 correctly: | Sergei Golubchik | 2013-12-09 | 1 | -12/+5 |
* | | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -0/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | CURRENT_ROLE() function | Sergei Golubchik | 2013-10-18 | 1 | -0/+22 |
* | | | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -0/+20 |
* | | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -0/+43 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -0/+43 |
* | | | | merge 10.0-base -> 10.0 | unknown | 2013-09-26 | 1 | -17/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge 5.5 -> 10.0-base | unknown | 2013-09-25 | 1 | -17/+15 |
| |\ \ \ | | |/ / | |||||
| | * | | merge 5.3 -> 5.5 | unknown | 2013-09-25 | 1 | -15/+13 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-5039: incorrect Item_func_regex::update_used_tables() | unknown | 2013-09-25 | 1 | -15/+13 |
* | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 1 | -0/+21 |
* | | | | MDEV-4841 Wrong character set of ADDTIME() and DATE_ADD() | Alexander Barkov | 2013-08-22 | 1 | -1/+0 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -8/+15 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixed typo. | unknown | 2013-07-04 | 1 | -1/+1 |
| * | | | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -5/+12 |
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-4332 Increase username length from 16 characters | Sergei Golubchik | 2013-04-18 | 1 | -2/+4 |
* | | | | | MDEV-4402 A function to visualize histograms data. | unknown | 2013-04-20 | 1 | -0/+16 |
* | | | | | MDEV-26: Global transaction ID. First alpha release. | unknown | 2013-04-15 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | MDEV-26. Intermediate commit. | unknown | 2013-02-11 | 1 | -0/+11 |
| | |_|/ / | |/| | | | |||||
* | | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -23/+17 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -19/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 5.2 merge | Sergei Golubchik | 2013-03-26 | 1 | -19/+1 |
| | |\ \ | |||||
| | | * \ | 5.1 merge | Sergei Golubchik | 2013-03-26 | 1 | -19/+1 |
| | | |\ \ | |||||
| | | | * | | MDEV-4289 Assertion `0' fails in make_sortkey with GROUP_CONCAT, MAKE_SET, GR... | Sergei Golubchik | 2013-03-18 | 1 | -19/+1 |
| * | | | | | MDEV-4272 fix. | unknown | 2013-03-14 | 1 | -4/+16 |
* | | | | | | MDEV-3873: post-merge fix. | unknown | 2013-02-04 | 1 | -1/+1 |
* | | | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -13/+16 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -13/+16 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery | unknown | 2012-12-28 | 1 | -13/+15 |