summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Expand)AuthorAgeFilesLines
* This changeset belongs tounknown2006-08-1617-1211/+4615
* Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-08-112-2/+28
|\
| * After merge fix.unknown2006-08-071-1/+1
| * BUG#14770 - LOAD DATA INFILE doesn't respect default values forunknown2006-08-0215-38/+38
| * BUG #15133 "unique index with nullable value not accepted in federated table"unknown2006-07-251-0/+27
* | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-08-105-1/+108
|\ \
| * \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-08-105-1/+108
| |\ \
| | * | Bug#18775 - Temporary table from alter table visible to other threadsunknown2006-08-032-35/+40
| | * | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2006-08-023-0/+86
| | |\ \
| | | * | Bug#18775 - Temporary table from alter table visible to other threadsunknown2006-08-023-0/+86
| | * | | BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"unknown2006-07-271-1/+1
| | * | | Merge chilla.local:/home/mydev/mysql-5.1-amergeunknown2006-07-261-0/+16
| | |\ \ \
| | | * | | Bug#19939unknown2006-07-201-0/+16
* | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-mergeunknown2006-08-103-5/+16
|\ \ \ \ \ \
| * | | | | | after merge updateunknown2006-08-102-1/+8
| * | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-08-092-4/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix for bug#20701 BINARY keyword should be forbidden in stored routinesunknown2006-08-092-4/+15
| | * | | | | Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursi...unknown2006-08-041-0/+7
* | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergeunknown2006-08-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-08-022-1/+35
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-021-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-4.1unknown2006-08-021-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | bug 20317 (test fails in embedded for different number of threads isunknown2006-07-031-1/+1
| * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-0215-11/+401
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-mergeunknown2006-08-091-0/+146
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-08-041-0/+141
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix Bug #18559 "log tables cannot change engine, andunknown2006-08-031-0/+141
| * | | | | | | | | | | | Fix Bug #20139 Infinite loop after "FLUSH" and "LOCK tabX, general_log"unknown2006-08-031-0/+5
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergeunknown2006-08-094-4854/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-283-4854/+16
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-releaseunknown2006-07-273-4854/+16
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)unknown2006-07-211-0/+7
| | | * | | | | | | | | | | A fix and a test case for Bug#21002 "Derived table not selecting from a unknown2006-07-193-4854/+16
| * | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/global-41unknown2006-07-261-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | / / / / / / / | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-231-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix for #16327: invalid TIMESTAMP values retrievedunknown2006-05-171-0/+7
| | * | | | | | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1unknown2006-07-185-0/+102
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfootunknown2006-08-082-0/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge bk://anubis/mysql-5.0-enginesunknown2006-07-212-0/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-181-1/+0
| | * | | | | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-07-181-0/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-171-0/+38
| | * | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-181-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-111-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Bug #17766: The server accepts to create MERGE tables which cannot workunknown2006-07-111-0/+12
| | * | | | | | | | | | | | | | | | Bug #17608: String literals lost during INSERT query on FEDERATED tableunknown2006-07-121-0/+13
* | | | | | | | | | | | | | | | | | Manual merge resolve, part 6 of 6+unknown2006-08-031-7/+0
* | | | | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-aunknown2006-08-031-31/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | 5.0 -> 5.1 manual merge, part 5 of 5 (or more?)unknown2006-08-031-31/+41
* | | | | | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-cunknown2006-08-031-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |