summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\
| * Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\
| | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | merge with 5.3Sergei Golubchik2011-10-191-22/+56
|\ \ \ \
| * \ \ \ Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
| |\ \ \ \
| | * | | | post review changes 2Sergei Golubchik2011-05-191-1/+1
| * | | | | Removed some alias warningsMichael Widenius2011-05-181-2/+3
| * | | | | Merge with dynamic column codeMichael Widenius2011-05-121-0/+12
| |\ \ \ \ \
| | * | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-0/+12
| | * | | | | Fixed high-impact Windows 64bit warnings (at least 4000 of them)Vladislav Vaintroub2011-02-191-1/+1
| | * | | | | Merge with 5.1-release.Michael Widenius2010-12-061-3/+7
| | |\ \ \ \ \
| | * | | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-0/+9
| * | | | | | | fix noisy warnings in header filesVladislav Vaintroub2011-05-041-1/+1
| * | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+13
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge with alias as StringMichael Widenius2011-02-281-18/+39
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-0/+9
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-18/+30
| * | | | | | | | merge with 5.1Michael Widenius2010-11-301-3/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-3/+7
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
* | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-5/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge from 5.1Magne Mahre2011-02-171-0/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Bug#48053 String::c_ptr has a race and/or does an invalid Magne Mahre2011-02-171-0/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge of fix for Bug#58165.Martin Hansson2011-01-131-0/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail andMartin Hansson2011-01-131-0/+10
| | | |_|/ / | | |/| | |
| * | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-191-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-191-3/+7
| * | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-2/+6
| * | | | | automerge 5.1-security --> 5.5-security (bug 55424)Gleb Shchepa2010-08-151-1/+1
| |\ \ \ \ \ | | |/ / / /
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+0
* | | | | | merge.Sergei Golubchik2010-11-251-1/+22
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge with 5.1Sergei Golubchik2010-10-251-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 5.1.51 mergeSergei Golubchik2010-10-191-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM...Sergei Golubchik2010-10-241-1/+13
| * | | | | MWL#36: Add a mysqlbinlog option to change the used databaseSergey Petrunya2009-10-241-0/+4
| * | | | | MWL#36: Add a mysqlbinlog option to change the used database.Alexander Ivanov2009-10-161-0/+4
| |/ / / /
| * | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-0/+16
| |\ \ \ \
| * | | | | Fix Valgrind errors seen in buildbot.unknown2009-04-081-0/+5
* | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | Bug #55424: convert_tz crashes when fed invalid dataGleb Shchepa2010-08-061-1/+1
| | |/ / | |/| |
* | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-1/+1
* | | | A fix for Bug#11918 "SP does not accept variables in LIMIT clause"Konstantin Osipov2010-04-141-0/+1
* | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+8
* | | | Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-4/+0
|\ \ \ \
| * | | | Bug #33544: UDF_INIT member decimals initialized wrong with unknown2008-03-051-4/+0
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+5
|\ \ \ \ \
| * | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+5
| | |/ / / | |/| | |
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-0/+5
|/ / / /
* | | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+16
| |/ / |/| |