summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
Commit message (Expand)AuthorAgeFilesLines
* merge from 5.2unknown2012-08-241-10/+18
|\
| * Merge from 5.1.unknown2012-08-241-10/+18
| |\
| | * MDEV-382: Incorrect quotingunknown2012-08-241-10/+18
* | | Merge with 5.2.Michael Widenius2011-12-111-4/+9
|\ \ \ | |/ /
| * | Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+9
| |\ \ | | |/
| | * Merge with MySQL 5.1.60Michael Widenius2011-11-231-2/+5
| | |\
| | | * Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-10-311-1/+2
| | | * merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-2/+4
| | | |\
| | | | * Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-2/+4
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | |\ \ \ | | | |/ /
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | | * auto-mergeIgnacio Galarza2009-03-191-11/+8
| | | | |\
| | | | | * Merge from dev tree.Alexey Kopytov2009-02-141-2/+2
| | | | | |\
* | | | | | | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-281-2/+2
* | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | post review changes 2Sergei Golubchik2011-05-191-1/+1
* | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-4/+37
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-4/+37
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail andMartin Hansson2011-01-131-4/+37
| | |/ / / /
| | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-2/+3
* | | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-9/+9
* | | | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM...Sergei Golubchik2010-10-241-2/+2
* | | | | | MWL#36: Add a mysqlbinlog option to change the used databaseSergey Petrunya2009-10-241-0/+3
* | | | | | After mergeAlexander Ivanov2009-10-171-4/+0
* | | | | | MWL#36: Add a mysqlbinlog option to change the used database.Alexander Ivanov2009-10-161-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Removed not used declarationsMichael Widenius2009-10-131-8/+0
* | | | | | MWL#36: Add a mysqlbinlog option to change the used database.Alexander Ivanov2009-10-161-9/+0
|/ / / / /
* | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+86
|\ \ \ \ \ | |/ / / /
| * | | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+73
| * | | | Bug#45168: assertion with convert() and empty set valueMartin Hansson2009-06-161-3/+12
| * | | | Fix for bug#44743: Join in combination with concat does not always workRamil Kalimullin2009-05-211-0/+3
* | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-4/+64
* | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | auto-mergeIgnacio Galarza2009-03-171-11/+8
| |\ \ \ \
| * \ \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-2/+2
* | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-11/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge from dev tree.Alexey Kopytov2009-02-141-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge into dev tree.Alexey Kopytov2009-02-101-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Fix for bug #21205: Different number of digits for float/double/real in --ps-...Alexey Kopytov2009-01-281-2/+2
| | | |/ /
| * | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.Alexey Kopytov2009-02-131-9/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix for bug #41868: crash or memory overrun with concat + upper,Alexey Kopytov2009-02-101-9/+6
| | | |/ | | |/|
| * | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.Alexey Kopytov2009-02-061-10/+10
| |\ \ \
| | * | | Temporarily reverted patch for bug #41868 as it was causing problems in PB.Alexey Kopytov2009-02-061-10/+10
| * | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.Alexey Kopytov2009-02-051-10/+10
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fix for bug #41868: crash or memory overrun with concat + upper, date_formatAlexey Kopytov2009-02-031-10/+10
| | |/
| | * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2007-12-191-2/+2
| | |\
* | | | Fixed wrong test for extra_ip_sock that caused mysqld to die on Mac if --extr...Michael Widenius2009-04-081-2/+2
|/ / /
* | | Bug#23924 general_log truncates queries with character set introducers.unknown2008-02-291-0/+62
View Lorry Controller Status