summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039msvensson@neptunus.(none)2006-10-191-2/+13
|\
| * Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039msvensson@neptunus.(none)2006-10-181-2/+13
| |\
| | * Bug#17039 Cursor with procedure crashes clientmsvensson@neptunus.(none)2006-09-071-2/+13
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016cmiller@zippy.cornsilk.net2006-10-172-3/+3
|\ \ \
| * | | Fix previous bad patch for Bug#14262.cmiller@zippy.cornsilk.net2006-10-172-1/+2
| * | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-143-2/+21
| |\ \ \
| * \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-10-131-0/+1
| |\ \ \ \
| * | | | | Merge fix-up.cmiller@zippy.cornsilk.net2006-10-131-1/+14
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-10-138-121/+175
| |\ \ \ \ \
| * \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-10-124-76/+220
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintkaa@polly.local2006-10-123-66/+203
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-123-66/+203
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50tsmith/tim@siva.hindu.god2006-10-114-12/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Revert patch for bug #19764, which did not work with prepared statements.tsmith/tim@siva.hindu.god2006-10-114-12/+3
| | * | | | | | | | Merge naruto.:C:/cpp/bug21811/my50-bug21811Kristofer.Pettersson@naruto.2006-10-112-10/+17
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50tsmith/tim@siva.hindu.god2006-10-094-3/+12
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug #19764: SHOW commands end up in the slow log as table scanstsmith/tim@siva.hindu.god2006-10-034-3/+12
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-10-1714-199/+438
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2006-10-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254ramil/ram@myoffice.izhnet.ru2006-10-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254ramil/ram@mysql.com/myoffice.izhnet.ru2006-10-131-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same ...ramil/ram@mysql.com/myoffice.izhnet.ru2006-10-131-0/+1
| | | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-runtimemsvensson@neptunus.(none)2006-10-032-21/+27
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mockturtle.local2006-10-032-21/+27
| | | | | |\ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1-rplmsvensson@neptunus.(none)2006-10-031-0/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-4.1.b8663bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-031-0/+20
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Bug#8663 cant use bgint unsigned as input to castbar@mysql.com2006-06-141-0/+20
| | | | * | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-10-0316-58/+101
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.cornsilk.net2006-09-294-9/+38
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintjimw@rama.(none)2006-09-2810-32/+36
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305iggy@rolltop.ignatz42.dyndns.org2006-09-281-4/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.cornsilk.net2006-09-283-11/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-10-062-6/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-062-6/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-10-041-6/+27
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024iggy@rolltop.ignatz42.dyndns.org2006-10-041-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintcmiller@zippy.cornsilk.net2006-10-138-124/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Additional patch for 5.1 commit for Bug#14262.cmiller@zippy.cornsilk.net2006-10-123-21/+20
| | * | | | | | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262cmiller@zippy.cornsilk.net2006-10-118-121/+186
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Bug #14262: SP: DROP PROCEDURE|VIEW (maybe more) write to binlog too late \cmiller@zippy.cornsilk.net2006-10-038-108/+177
| * | | | | | | | | | | | | | | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my51-bug11655kaa@polly.local2006-10-123-66/+203
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-121-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1kaa@polly.local2006-10-121-4/+6
| | * | | | | | | | | | | | | | | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-113-66/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-113-66/+201
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Fixes a number of problems with time/datetime <-> string conversion functions:kaa@polly.local2006-10-043-66/+201
| * | | | | | | | | | | | | | | | | | | | | | | | Merge naruto.:C:/cpp/bug21811/my51-bug21811Kristofer.Pettersson@naruto.2006-10-112-3/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | BUG#21811 Odd casting with date + INTERVAL arithmeticKristofer.Pettersson@naruto.2006-10-111-1/+12
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge naruto.:C:/cpp/bug21811/my50-bug21811Kristofer.Pettersson@naruto.2006-10-041-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | / / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Bug#21811 Odd casting with date + INTERVAL arithmeticKristofer.Pettersson@naruto.2006-10-022-10/+17