summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* trx0trx.c:unknown2005-03-211-1/+9
* Mergeunknown2005-03-211-0/+6
|\
| * trx0trx.c, trx0trx.h:unknown2005-03-212-1/+15
| * Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-03-1716-15/+16
| |\
* | \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-buildunknown2005-03-213-30/+44
|\ \ \
| * | | mtr_report.pl:unknown2005-03-213-30/+44
* | | | A fix for Netware.unknown2005-03-211-0/+3
* | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-182-17/+44
|\ \ \ \ | |/ / /
| * | | Move mis-placed assignments to their proper position.unknown2005-03-181-2/+2
| * | | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1unknown2005-03-162-17/+44
| |\ \ \
| | * | | Add information to the log file written by 'Do-compile' that allows to calculateunknown2005-03-161-15/+41
| | * | | Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX).unknown2005-03-151-2/+3
* | | | | olap.test:unknown2005-03-173-1/+30
* | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-1715-15/+15
|\ \ \ \ \
| * \ \ \ \ Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0unknown2005-03-1715-15/+15
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Update URL.unknown2005-03-1715-15/+15
| | * | | | Update URL.unknown2005-03-1715-14/+15
* | | | | | Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeonunknown2005-03-172-6/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-03-172-6/+11
| |\ \ \ \
| | * | | | safer creation of temp files used in replication of LOAD DATA INFILE.unknown2005-03-172-6/+11
* | | | | | Mergeunknown2005-03-173-1/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).unknown2005-03-173-1/+18
| | |/ / / | |/| | |
| * | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-03-152-1/+2
| |\ \ \ \
* | \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-03-165-30/+211
|\ \ \ \ \ \
| * | | | | | olap.result, olap.test:unknown2005-03-163-4/+26
| * | | | | | olap.result, olap.test:unknown2005-03-155-27/+186
* | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1unknown2005-03-161-36/+57
|\ \ \ \ \ \ \
| * | | | | | | Fixes after Sinisa and Serg comments after push of patch for BUG#9123.unknown2005-03-161-36/+57
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-164-14/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix to get --skip-ndb to workunknown2005-03-161-2/+2
| * | | | | | | Partly reverty back patch (in heap-auto-increment-key detection) to ensure th...unknown2005-03-164-12/+15
* | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-164-14/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()unknown2005-03-164-14/+26
* | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-163-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix for bug#8656: Crash with group_concat on alias in outer tableunknown2005-03-163-0/+16
* | | | | | | | BUG#9123: Updates after Mats reviewunknown2005-03-161-2/+2
* | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-163-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLESunknown2005-03-163-0/+9
* | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-165-2/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-165-2/+33
| |\ \ \ \ \ \ \
| | * | | | | | | # Bug#8785 Problem with nested concats andunknown2005-03-155-2/+33
* | | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-161-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1unknown2005-03-161-1/+3
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | BUG#9123: If a table name is given with an underscore, unknown2005-03-151-1/+3
* | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-161-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-151-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Fix for bug#9166: Cluster compile failure on Solaris 10unknown2005-03-151-0/+2
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Bug #6660 mysqldump creates bad pathnames on Windowsunknown2005-03-151-2/+1
* | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-153-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Bug #6660 mysqldump creates bad pathnames on Windowsunknown2005-03-152-21/+9