summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-3111-69/+376
|\
| * Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.unknown2006-01-3111-69/+376
* | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-311-3/+9
|\ \
| * \ Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-...unknown2006-01-311-3/+9
| |\ \
| | * \ Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302unknown2006-01-311-3/+9
| | |\ \
| | | * | Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)unknown2006-01-312-7/+14
* | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2006-01-312-1/+2
|\ \ \ \ \
| * | | | | Fix missing --replace_result on $SLAVE_MYPORT in federated.unknown2006-01-312-1/+2
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-313-1/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-313-1/+15
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix for bug #16829 "Firing trigger with RETURN crashes the server"unknown2006-01-283-1/+15
* | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-312-6/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Check std_data_ln already createdunknown2006-01-311-2/+4
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-312-4/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Bug #16919 some tests fail in 5.0unknown2006-01-311-1/+8
| | * | | | Update trigger-grant-test to use MYSQLTEST_VARDIRunknown2006-01-311-3/+3
* | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-315-1/+104
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-301-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20unknown2006-01-301-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fixed BUG#15653, BUG#16582.unknown2006-01-303-17/+129
| * | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-304-0/+103
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | BUG# 14768unknown2006-01-274-0/+103
| | | |/ / / | | |/| | |
* | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-305-39/+321
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-305-39/+321
| |\ \ \ \ \
| | * | | | | Post-review fix for BUG#15737 (corrected typo in sp-code.test comment)unknown2006-01-301-1/+1
| | * | | | | Fixed BUG#15737: Stored procedure optimizer bug with LEAVEunknown2006-01-255-39/+321
* | | | | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-301-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixes bug #15634. Eliminates compiler warning 'all return paths are recursive...unknown2005-12-281-1/+4
* | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-300-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss17unknown2006-01-300-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Fixed BUG#16387.unknown2006-01-303-1/+28
* | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719unknown2006-01-302-19/+95
|\ \ \ \ \ \ \ \
| * | | | | | | | Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connectunknown2006-01-262-19/+96
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-01-307-7/+59
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | information_schema_db.result, information_schema.result:unknown2006-01-284-6/+6
| * | | | | | | Fixed bug #16260.unknown2006-01-273-1/+53
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-01-271-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-251-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fixes bug #11892. When MyODBC or any other client do my_init()/my_end()unknown2005-12-011-0/+1
* | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50...unknown2006-01-2763-11/+254
|\ \ \ \ \ \ \ \
| * | | | | | | | Add new option "check-testcases" to mysql-test-run.plunknown2006-01-2665-11/+256
* | | | | | | | | Use MYSQLTEST_VARDIRunknown2006-01-271-2/+2
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-01-2612-376/+607
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0unknown2006-01-253-0/+45
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#16487: New test for ignored table and multi-updateunknown2006-01-253-0/+45
| * | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-251-11/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Complaint from a user who was getting sick of repairing their tables do to th...unknown2006-01-241-11/+8
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-257-365/+552
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix for the following bugs:unknown2006-01-247-365/+552
| * | | | | | | | | Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M50/bug16730-5.0unknown2006-01-241-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |