summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-291-1/+1
|\
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-281-1/+1
| |\
| | * Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-271-1/+1
| | |\
| | | * Fix my_system_gmt_sec function declaration to be same as definitionmsvensson@neptunus.(none)2006-11-231-1/+1
* | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-11-282-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-11-171-2/+2
| |\ \ \
| | * \ \ Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot/hf@deer.(none)2006-11-081-2/+2
| | |\ \ \
| | | * | | bug #19491 (5.0-related additional fixes)holyfoot/hf@mysql.com/deer.(none)2006-11-061-2/+2
| * | | | | Merge mysql.com:/home/hf/work/mysql-5.0-mrgholyfoot/hf@deer.(none)2006-11-171-0/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgholyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+2
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+2
| | | |\ \ \
| | | | * | | Bug #19216: Client crashes on long SELECTgkodinov/kgeorge@macbook.gmz2006-11-131-0/+2
| | | * | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1petr/cps@outpost.site2006-11-101-9/+115
| | | |\ \ \ \
| | | * \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@shellback.(none)2006-10-121-0/+2
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintkaa@polly.local2006-10-111-22/+69
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-22/+69
| | | | |\ \ \ \ \
* | | | | \ \ \ \ \ 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
| | |\ \ \ \ | | | |_|_|/ | | |/| | |