summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-3/+7
|\
| * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-3/+7
| |\
| | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-3/+7
| | |\
| | | * Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0Tor Didriksen2012-07-261-3/+7
* | | | merge from 5.2unknown2012-08-241-0/+1
|\ \ \ \ | |/ / /
| * | | Merge from 5.1.unknown2012-08-241-0/+1
| |\ \ \ | | |/ /
| | * | MDEV-382: Incorrect quotingunknown2012-08-241-0/+1
* | | | Merge with 5.2.Michael Widenius2011-12-111-4/+8
|\ \ \ \ | |/ / /
| * | | Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+8
| |\ \ \ | | |/ /
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | |\ \ | | | |/
| | | * Updated/added copyright headersKent Boortz2011-07-031-0/+3
| | | |\
| | | * \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \
| | | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | 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
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#48053 String::c_ptr has a race and/or does an invalid Magne Mahre2011-02-171-0/+3
| | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail andMartin Hansson2011-01-131-0/+10
| | | |_|/ / | | |/| | |
* | | | | | 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
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-191-3/+7
* | | | merge with 5.1Sergei Golubchik2010-10-251-1/+1
|\ \ \ \ | |/ / /
| * | | 5.1.51 mergeSergei Golubchik2010-10-191-1/+1
| |\ \ \ | | |/ /
| | * | Bug #55424: convert_tz crashes when fed invalid dataGleb Shchepa2010-08-061-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
|\ \ \ | |/ /
| * | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+16
* | | Fix Valgrind errors seen in buildbot.unknown2009-04-081-0/+5
|/ /
* | Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-08-111-1/+1
|\ \ | |/
| * Bug#38296 (low memory crash with many conditions in a query)Marc Alff2008-08-111-1/+1
* | Bug#23924 general_log truncates queries with character set introducers.unknown2008-02-291-0/+3
* | Merge mysql.com:/home/my/mysql-5.0unknown2007-01-271-1/+2
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-221-1/+2
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-151-1/+2
| | |\
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:unknown2006-12-151-1/+2
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-231-2/+1
|\ \ \ \ | |/ / /
| * | | Many files:unknown2006-12-231-2/+1
| |/ /