summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed some dsp files.unknown2006-06-236-5/+21
* Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-06-222-0/+87
|\
| * Added a test case for bug #18359.unknown2006-06-222-0/+87
* | Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-06-223-1/+52
|\ \ | |/
| * Fixed bug #20076.unknown2006-06-223-1/+19
* | Post-merge fix.unknown2006-06-221-6/+1
* | Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-06-212-4/+12
|\ \ | |/
| * Modified the test case for bug 16674 to have the sameunknown2006-06-212-4/+12
* | Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-06-213-9/+138
|\ \ | |/
| * Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2006-06-213-9/+138
| |\
| | * Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2006-06-203-9/+138
| | |\
| | | * Fixed bug #16674.unknown2006-06-203-9/+138
* | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-06-2218-22/+175
|\ \ \ \
| * \ \ \ Manual mergeunknown2006-06-220-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-223-13/+73
| | |\ \ \
| | | * | | Fixed bug #14896.unknown2006-06-223-13/+73
| * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-2218-22/+175
| |\ \ \ \ \
| | * \ \ \ \ Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-211-0/+20
| | |\ \ \ \ \
| | | * | | | | Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"):unknown2006-06-201-0/+20
| | * | | | | | Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1unknown2006-06-213-0/+31
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-211-1/+2
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | added missing MYSQLTEST_VARDIR declarationunknown2006-06-211-1/+2
| | | * | | | | Merge april:devel/BitKeeper/mysql-4.1unknown2006-06-213-0/+31
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | BUG#20357 - Got error 124 from storage engine using MIN and MAXunknown2006-06-213-0/+31
| | * | | | | | Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0unknown2006-06-211-0/+12
| | |\ \ \ \ \ \
| | | * | | | | | BUG#20578unknown2006-06-211-0/+12
| | * | | | | | | Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M50/autopush-5.0unknown2006-06-212-5/+29
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix for bug#18516 (also #19353, reported for 5.1):unknown2006-06-202-5/+29
| | * | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-214-6/+60
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge mysql.com:/home/marty/MySQL/mysql-5.0-backedunknown2006-06-214-6/+60
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix for Bug #19906 REPLACE doesn't update TEXT fields correctlyunknown2006-06-214-6/+60
| | * | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-215-6/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-215-6/+9
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-205-6/+9
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0unknown2006-06-205-6/+9
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Bug #17297 Fix error messagesunknown2006-06-205-6/+9
| | * | | | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.1unknown2006-06-212-5/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | / / / / / | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-206-5/+52
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.0unknown2006-06-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix for bug #12728: Very strange behaviour of ELTunknown2006-06-134-0/+27
| | | * | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-207-64/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1unknown2006-06-201-10/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix for bug #20496: func_time.test failure unknown2006-06-192-5/+14
* | | | | | | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleanunknown2006-06-213-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge of the changes for bug #18080unknown2006-06-213-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list errorunknown2006-06-193-9/+14
* | | | | | | | | | | | | | | | | | manual mergeunknown2006-06-212-0/+67
* | | | | | | | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleanunknown2006-06-215-74/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Bug #20482: failure on Create join view with sources views/tables in different unknown2006-06-215-10/+67
* | | | | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-06-2154-770/+1338
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
View Lorry Controller Status