summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-271-6/+70
|\
| * Added some missing DBUG_RETURNmonty@mysql.com/nosik.monty.fi2006-11-231-6/+70
* | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-222-6/+6
|\ \ | |/
| * Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-202-6/+6
| * Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rtanozdrin/alik@alik.2006-11-072-21/+71
| |\
| | * Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-10-121-21/+69
| | |\
| | | * Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-121-21/+69
| | | |\
* | | | \ Merge alik.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@alik.2006-11-072-21/+71
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1-maintmsvensson@shellback.(none)2006-10-121-0/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-10-121-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-121-0/+2
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is calledmsvensson@shellback.(none)2006-10-121-0/+2
| * | | | | | Merge polly.local:/tmp/maint/bug11655/my51-bug11655kaa@polly.local2006-10-121-21/+69
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-111-21/+69
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-21/+69
| | | |\ \ \ \
| | | | * | | | Fixes a number of problems with time/datetime <-> string conversion functions:kaa@polly.local2006-10-041-22/+69
* | | | | | | | Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191petr/cps@owlet.local2006-11-011-10/+115
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191petr/cps@mysql.com/owlet.local2006-11-011-10/+115
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"petr/cps@mysql.com/owlet.local2006-11-011-9/+115
| | | |_|_|/ | | |/| | |
* | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@gluh.(none)2006-09-281-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1gluh@mysql.com/gluh.(none)2006-09-271-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Patch for bug#21432 is revertedgluh@mysql.com/gluh.(none)2006-09-271-3/+3
* | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-131-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-mergegluh@mysql.com/gluh.(none)2006-09-071-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Bug#20393 User name truncation in mysql clientgluh@mysql.com/gluh.(none)2006-08-301-3/+3
| | * | | Bug#7192 Specify --with-collation doesn't work for connections?bar@mysql.com/bar.intranet.mysql.r18.ru2006-08-111-2/+31
| | | |/ | | |/|
* | | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527iggy@rolltop.ignatz42.dyndns.org2006-08-281-3/+5
|\ \ \ \ | |/ / /
| * | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_m...cmiller@zippy.cornsilk.net2006-08-251-3/+5
| |\ \ \
| | * | | Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \cmiller@zippy.cornsilk.net2006-08-251-3/+5
* | | | | Merge zim.(none):/home/brian/mysql/dep-5.1brian@zim.(none)2006-08-141-1/+1
|\ \ \ \ \
| * | | | | Removed warnings for Windows build issues. Edited Windows README to remove re...brian@zim.(none)2006-08-141-1/+1
* | | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-122-30/+43
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-031-29/+40
| |\ \ \ \
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-29/+40
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | A fix and a test case for Bug#15752 "Lost connection to MySQL server kostja@bodhi.local2006-07-241-29/+40
| | | |/ /
| * | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-07-241-1/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-07-231-1/+3
| | |\ \ \
| | | * | | Fix for bug #19370: DateTime datatype in MySQL has two bugs in itramil/ram@mysql.com/myoffice.izhnet.ru2006-07-121-1/+3
| | | |/ /
* | | | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-281-3/+33
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-1/+2
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-131-1/+2
| | |\ \
| | | * | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-1/+2
| * | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b7192bar@mysql.com2006-07-071-2/+31
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Bug#7192 Specify --with-collation doesn't work for connections?bar@mysql.com2006-06-301-2/+31
| | |/ /
* | | | Merge chilla.local:/home/mydev/mysql-5.0-mmergeingo/mydev@chilla.local2006-07-201-0/+7
|\ \ \ \ | |/ / /
| * | | client.c:kent@mysql.com2006-07-031-0/+7
* | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-07-101-1/+1
|\ \ \ \ | |/ / /
| * | | mergingholyfoot@mysql.com2006-06-261-37/+49
| |\ \ \ | | |/ /
* | | | Merge chilla.local:/home/mydev/mysql-5.0-ateamingo@chilla.local2006-07-061-36/+48
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/mydev/mysql-4.1-bug14400ingo@mysql.com2006-07-051-36/+48
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /