Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup: s/const CHARSET_INFO/CHARSET_INFO/ | Sergei Golubchik | 2014-12-04 | 1 | -4/+4 |
* | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -1/+3 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-11-19 | 1 | -1/+3 |
| |\ | |||||
| | * | MDEV-7019 String::chop() is wrong and may potentially crash (MySQL bug#56492) | Alexander Barkov | 2014-11-10 | 1 | -1/+3 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -2/+21 |
|\ \ \ | |/ / | |||||
| * | | - MDEV-6695 Bad column name for UCS2 string literals | Alexander Barkov | 2014-09-04 | 1 | -1/+1 |
| * | | Moving Item::str_value from public to protected. | Alexander Barkov | 2014-09-03 | 1 | -1/+1 |
| * | | MDEV-6679 Different optimizer plan for "a BETWEEN 'string' AND ?" and "a BETW... | Alexander Barkov | 2014-09-02 | 1 | -0/+9 |
| * | | MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 context | Alexander Barkov | 2014-09-01 | 1 | -0/+10 |
* | | | bugs in sys_var::val_* code | Sergei Golubchik | 2014-10-10 | 1 | -4/+6 |
|/ / | |||||
* | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | mysql-5.5.38 merge | Sergei Golubchik | 2014-06-03 | 1 | -0/+3 |
| |\ | |||||
| | * | Bug #18359924: INNODB AND MYISAM CORRUPTION ON PREFIX INDEXES | Georgi Kodinov | 2014-04-10 | 1 | -0/+3 |
* | | | make append_query_string() more usable: | Sergei Golubchik | 2014-03-26 | 1 | -0/+3 |
* | | | remove append_escaped(), use String::append_for_single_quote() instead | Sergei Golubchik | 2014-03-26 | 1 | -0/+9 |
* | | | small cleanup in sql_acl.cc: | Sergei Golubchik | 2014-03-26 | 1 | -1/+1 |
* | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -0/+32 |
|\ \ \ | |||||
| * \ \ | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -0/+32 |
| |\ \ \ | |||||
| | * \ \ | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -0/+32 |
| | |\ \ \ | |||||
| | | * \ \ | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-27 | 1 | -0/+32 |
| | | |\ \ \ | |||||
| | | | * | | | EXPLAIN DELETE for MariaDB | Sergey Petrunya | 2013-02-12 | 1 | -0/+32 |
* | | | | | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | Merging my_convert() from 10.0-serg | Alexander Barkov | 2013-08-01 | 1 | -3/+7 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -2/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -2/+3 |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -2/+3 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE | Venkatesh Duggirala | 2013-03-12 | 1 | -1/+2 |
| | | |\ \ | |||||
| | | | * | | BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE | Venkatesh Duggirala | 2013-03-12 | 1 | -1/+2 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -0/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -0/+10 |
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | |||||
| | * | | | The bug | Alexander Barkov | 2013-05-08 | 1 | -0/+10 |
* | | | | | String::append_for_single_quote() should signal OOM condition, | Sergei Golubchik | 2013-04-19 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -7/+20 |
* | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -4/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -4/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | merge 5.1 => 5.5 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0 | Tor Didriksen | 2012-07-26 | 1 | -3/+7 |
* | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | merge from 5.2 | unknown | 2012-08-24 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge from 5.1. | unknown | 2012-08-24 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -0/+1 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+8 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -0/+3 |
| | | | |\ \ | |||||
* | | | | | | | always use sql/sql_string.* files, never - client/sql_string.* | Sergei Golubchik | 2011-12-15 | 1 | -4/+0 |
* | | | | | | | fix new String:realloc* variants always to zero-terminate the string | Sergei Golubchik | 2011-12-14 | 1 | -2/+15 |