summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-10-172-1/+2
|\
| * Fix previous bad patch for Bug#14262.cmiller@zippy.cornsilk.net2006-10-172-1/+2
* | Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50tsmith/tim@siva.hindu.god2006-10-162-2/+10
|\ \ | |/ |/|
| * Bug #19764: SHOW commands end up in the slow log as table scanstsmith/tim@siva.hindu.god2006-10-122-2/+10
* | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-143-2/+21
|\ \
| * \ Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0svoj@mysql.com/april.(none)2006-10-081-1/+1
| |\ \
| | * | After merge fix.svoj@mysql.com/april.(none)2006-10-081-1/+1
| * | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@may.pils.ru2006-10-083-2/+21
| |\ \ \ | | |/ /
| | * | Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-061-1/+14
| | |\ \
| | | * \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-061-1/+14
| | | |\ \
| | | | * | BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329)svoj@mysql.com/april.(none)2006-10-061-1/+14
| | | * | | Addition to fix for bug#10974. Fixed spelling.svoj@mysql.com/april.(none)2006-10-061-1/+1
| | * | | | Addition to fix for bug#10974. Fixed spelling.svoj@mysql.com/april.(none)2006-10-061-1/+1
| | * | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-051-0/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-051-0/+6
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | BUG#21381 - Engine not notified about multi-table UPDATE IGNOREsvoj@mysql.com/april.(none)2006-10-051-0/+6
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/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 svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@mysql.com/april.(none)2006-10-028-21/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1gkodinov@dl145s.mysql.com2006-09-284-9/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-09-271-3/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-09-201-3/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | BUG#10974 - No error message if merge table based on union of innodb, memorysvoj@mysql.com/april.(none)2006-09-202-2/+9
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bug #14262: SP: DROP PROCEDURE|VIEW (maybe more) write to binlog too late \cmiller@zippy.cornsilk.net2006-10-038-108/+177
* | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | 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/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 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Bug#21811 Odd casting with date + INTERVAL arithmeticKristofer.Pettersson@naruto.2006-10-022-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 neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-10-062-6/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
View Lorry Controller Status