summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optunknown2008-03-2116-33/+35
|\
| * Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-03-2117-32/+34
| |\
| | * Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)unknown2008-03-2117-32/+34
* | | Merge host.loc:/home/uchum/work/5.0-optunknown2008-03-200-0/+0
|\ \ \ | |/ /
| * | Merge host.loc:/home/uchum/work/PA/5.0-opt-34763unknown2008-03-204-10/+49
| |\ \
* | \ \ Merge host.loc:/home/uchum/work/PA/5.0-opt-34763unknown2008-03-204-10/+49
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed bug #34763.unknown2008-03-144-10/+49
| * | | Merge host.loc:/home/uchum/work/5.0-optunknown2008-03-070-0/+0
| |\ \ \
| | * \ \ Merge host.loc:/home/uchum/work/PP/5.0-opt-34620unknown2008-02-293-0/+51
| | |\ \ \
* | | \ \ \ Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-03-190-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge kaamos.(none):/data/src/opt/bug34512/my50unknown2008-03-193-1/+25
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge kaamos.(none):/data/src/opt/bug34512/my51unknown2008-03-193-1/+25
|\ \ \ \ \ \
| * \ \ \ \ \ Merge kaamos.(none):/data/src/opt/bug34512/my50unknown2008-03-193-1/+25
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix for bug #34512: CAST( AVG( double ) AS DECIMAL )unknown2008-03-063-1/+25
* | | | | | | Merge kaamos.(none):/data/src/opt/bug34650/my51unknown2008-03-196-267/+80
|\ \ \ \ \ \ \
| * | | | | | | Fix for bug #34650: Test suite without cluster fails on Mac OS Xunknown2008-03-076-267/+80
| |/ / / / / /
* | | | | | | Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTSunknown2008-03-181-0/+2
* | | | | | | Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashesunknown2008-03-143-4/+34
* | | | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-03-130-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresunknown2008-03-131-1/+4
* | | | | | | Fixed test failures caused by insufficient cleanups in the tests forunknown2008-03-122-2/+2
* | | | | | | Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-optunknown2008-03-122-3/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mhansson@bk-internal:/home/bk/mysql-5.1-optunknown2008-03-112-3/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #34367: sql/sql_show.cc: create_schema_table should handle unknown2008-03-072-3/+29
* | | | | | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-03-121-7/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Re-enabled the test for mysql_insert_id() after merging from main.unknown2008-03-121-7/+1
* | | | | | | | | Post-merge fix.unknown2008-03-121-2/+2
* | | | | | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-03-121-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge kaamos.(none):/data/src/opt/mysql-4.1-optunknown2008-03-120-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/mysql-4.1unknown2008-03-127-46/+124
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/mysql-5.0unknown2008-03-1281-398/+1334
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-12117-713/+2026
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-03-113-4/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-03-107-14/+74
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-03-101-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/opt/bug34889/my50unknown2008-03-082-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-03-074-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-03-063-3/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | BUG#34945: "ref_or_null queries that are null_rejecting and have a null value...unknown2008-03-033-3/+67
| * | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optunknown2008-03-111-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bug #32801 wait_timeout.test fails randomlyunknown2008-03-031-1/+0
| * | | | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2008-03-107-14/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/misc/mysql/34749/50-34749unknown2008-03-107-14/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Bug#34749: Server crash when using NAME_CONST() with an aggregate functionunknown2008-02-287-14/+74
| * | | | | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2008-03-101-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/misc/mysql/29645/50-29645unknown2008-03-101-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Bug#29645: Link failure when using the embedded serverunknown2008-02-251-1/+3
| * | | | | | | | | | | | | | | | | | Merge kaamos.(none):/data/src/opt/bug34889/my51unknown2008-03-081-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/opt/bug34889/my50unknown2008-03-081-0/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Fix for bug #34889: mysql_client_test::test_mysql_insert_id test fails unknown2008-03-052-1/+18