summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-05-261-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Use one err file for each master msvensson@neptunus.(none)2005-05-251-2/+2
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@mysql.com2005-05-269-28/+99
|\ \ \ \ \ \ \ \
| * | | | | | | | Corrected merge error in 'mysql-test/r/select.result': two test blocks insert...joerg@mysql.com2005-05-261-6/+6
| * | | | | | | | Mergejoerg@mysql.com2005-05-261-11/+206
| * | | | | | | | Manual merge.joerg@mysql.com2005-05-269-225/+101
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-242-0/+47
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-05-242-0/+47
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | Additions for --add-drop-databasebrian@zim.(none)2005-05-202-0/+47
| | * | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-242-0/+30
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-182-0/+30
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2005-05-182-0/+30
| | | | |\ \ \ \ \ \
| | | | | * | | | | | union.result:Sinisa@sinisa.nasamreza.org2005-04-262-0/+30
| | * | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-05-242-0/+15
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Added a test case for Bug#8009.jani@ua141d10.elisa.omakaista.fi2005-05-242-0/+15
| | * | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-05-243-21/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | removed unneeded reserved_win_names testcasereggie@mdk10.(none)2005-05-243-21/+0
| | | |/ / / / / / / / /
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-05-263-0/+132
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | BUG#9879 delimiter command discrepancy (4.1 vs. 5.0, mysql vs. mysqltest)msvensson@neptunus.(none)2005-05-173-0/+132
* | | | | | | | | | | | | init_db.sql:kent@mysql.com2005-05-261-2/+6
* | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-buildkent@mysql.com2005-05-262-0/+223
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug #10838 CREATE TABLE produces strange DEFAULT valuetulin@mysql.com2005-05-252-0/+223
* | | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0acurtis@xiphis.org2005-05-244-22/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix after mergeacurtis@xiphis.org2005-05-242-8/+22
| * | | | | | | | | | | | | Mergeacurtis@xiphis.org2005-05-244-21/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@xiphis.org2005-05-242-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.acurtis@xiphis.org2005-05-242-0/+24
| | * | | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-243-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | * | | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-234-0/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-192-21/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | CSC#4944: Adding File_size to output of SHOW BINARY lOGSlars@mysql.com2005-05-192-21/+21
* | | | | | | | | | | | | | Manual merge of patch fixing several trigger related bugs with main tree.dlenev@mysql.com2005-05-242-0/+227
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for bugs:dlenev@brandersnatch.localdomain2005-05-242-0/+227
* | | | | | | | | | | | | | Merge gluh@gluh:/home/gluh/release/mysql-5.0-buildgluh@mysql.com2005-05-242-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix for bug #10659: information_schema_db fail on Mac OSgluh@gluh.mysql.r18.ru2005-05-242-2/+4
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1gbichot@bk-internal.mysql.com2005-05-243-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | BUG# 9148 Denial of servicereggie@mdk10.(none)2005-05-233-1/+17
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | join_outer.test, join_outer.result:igor@rurik.mysql.com2005-05-212-0/+41
* | | | | | | | | | | | range.result, range.test:igor@rurik.mysql.com2005-05-212-0/+116
* | | | | | | | | | | | fixed conflictsreggie@mdk10.(none)2005-05-204-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | BUG# 9148: Denial of servicereggie@mdk10.(none)2005-05-204-0/+22
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fixed BUG#10537: Server crashes while loading data file into table throughpem@mysql.comhem.se2005-05-202-0/+16
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-05-202-1/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add missing test resultmonty@mysql.com2005-05-202-1/+15
* | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-05-202-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | do not try to use equal field from outer query as field of local join (BUG#6384)bell@sanja.is.com.ua2005-05-202-4/+18
* | | | | | | | | | | | Merge gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0-buildgluh@gluh.mysql.r18.ru2005-05-203-15/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | addition of "REFERENCED_TABLE_SCHEMA",gluh@gluh.mysql.r18.ru2005-05-203-15/+26
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-05-202-0/+364
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | after mergeserg@serg.mylan2005-05-191-0/+126