summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+1
|\
| * Automerge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+2
| |\
| * | Backport WL#4098 from 6.0.Alexander Nozdrin2009-10-211-0/+1
* | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+2
|\ \ \ | | |/ | |/|
| * | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-211-0/+2
| |/
* | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-0/+7
* | Backport of:Konstantin Osipov2009-10-161-4/+0
* | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-131-3/+2
* | Backport to 5.4 the following changesets:Konstantin Osipov2009-10-091-5/+5
|/
* Bug#27430 "Crash in subquery code when in PS and table DDL changed afterkostja@bodhi.(none)2008-05-201-2/+22
* Fix for Bug #27944 Filtering THD::client capabilitiesandrey@whirlpool.hristov.com2008-03-251-0/+31
* Bug#34655 Compile errordavi@mysql.com/endora.local2008-02-281-2/+2
* Merge station.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@station.2007-12-141-6/+9
|\
| * Merge mysql.com:/home/hf/work/mrg/my50-mrgholyfoot/hf@hfmain.(none)2007-12-011-6/+5
| |\
| | * Merge mysql.com:/home/hf/work/mrg/my41-mrgholyfoot/hf@hfmain.(none)2007-11-301-5/+5
| | |\
| | | * Bug #31900 Wrong confusing comment in mysql_com.h header file.holyfoot/hf@mysql.com/hfmain.(none)2007-11-261-5/+5
| * | | Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-optgkodinov/kgeorge@magare.gmz2007-11-271-0/+4
| |\ \ \ | | |/ /
| | * | Bug #30355: Incorrect ordering of UDF resultsgkodinov/kgeorge@magare.gmz2007-11-271-0/+4
* | | | Bug#12713 "Error in a stored function called from a SELECT doesn't kostja@bodhi.(none)2007-12-121-10/+9
|/ / /
* | | Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDSevgen@moonbone.local2007-11-131-0/+1
* | | Remove an unused variable that was there since the first implementationkostja@bodhi.(none)2007-10-151-1/+1
* | | Add 'extension' field to all client library structures to make them extensiblemonty@mysql.com/nosik.monty.fi2007-07-301-12/+15
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-051-7/+7
|\ \ \
| * | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-7/+7
* | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-05-251-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Bug #26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-251-0/+2
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-0/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-0/+3
* | | Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with m...gluh@mysql.com/eagle.(none)2007-04-031-2/+6
* | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ | |/ /
| * | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-09-281-4/+1
| |\ \
* | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-1/+1
* | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-09-291-4/+4
|\ \ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-09-281-4/+4
| |\ \ \ \
| | * \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-281-4/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix for bug #22227: ulong not defined for client libraryramil/ram@mysql.com/myoffice.izhnet.ru2006-09-221-4/+4
* | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@gluh.(none)2006-09-281-4/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | after merge fixgluh@mysql.com/gluh.(none)2006-09-271-1/+1
| * | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1gluh@mysql.com/gluh.(none)2006-09-271-3/+0
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Patch for bug#21432 is revertedgluh@mysql.com/gluh.(none)2006-09-271-3/+0
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani/jamppa@production.mysql.com2006-09-251-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed result file. Blob width 8192 changed to 16777216.jani@ua141d10.elisa.omakaista.fi2006-09-221-1/+1
* | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-131-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | after merge fixgluh@mysql.com/gluh.(none)2006-09-071-1/+1
| * | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-mergegluh@mysql.com/gluh.(none)2006-09-071-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | Bug#20393 User name truncation in mysql clientgluh@mysql.com/gluh.(none)2006-08-301-0/+3
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-311-0/+6
| |\ \ \
| * \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-08-301-2/+4
| |\ \ \ \
* | \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-011-2/+4
|\ \ \ \ \ \