summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-10-015-2/+27
|\
| * Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-09-143-1/+26
| |\
| | * BUG#30385: Server crash when deleting with ORDER BY and LIMITunknown2007-09-103-1/+26
| * | Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-09-042-1/+1
| |\ \ | | |/ | |/|
| | * libmysql_r/client_settings.h libmysqld/ha_blackhole.ccunknown2007-08-291-0/+0
| | * mysql_config.sh:unknown2007-08-291-1/+1
* | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-09-102-10/+73
|\ \ \ | |/ /
| * | Remove any old pidfile before starting mysqld to make sure thatunknown2007-08-291-0/+3
| * | Fix typo: '$$' => '$'unknown2007-08-291-1/+1
| * | Add 'mtr_rmtree'unknown2007-08-292-10/+70
| |/
* | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-08-150-0/+0
|\ \ | |/ |/|
| * Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-07-020-0/+0
| |\
| | * Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-06-180-0/+0
| | |\
| | | * Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-06-180-0/+0
| | | |\
| | | | * Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rplunknown2007-06-115-38/+376
| | | | |\
* | | | | \ Merge synthia.local:/home/mydev/mysql-4.1-amainunknown2007-08-131-30/+51
|\ \ \ \ \ \
| * \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-amainunknown2007-08-021-30/+51
| |\ \ \ \ \ \
| | * | | | | | Bug#29838 - myisam corruption using concurrent select ... and updateunknown2007-08-011-30/+51
* | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1unknown2007-08-051-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-08-021-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-08-021-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | myisamchk.c:unknown2007-08-021-2/+2
* | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-08-049-19/+118
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2007-08-016-1/+106
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/029717/my41-29717unknown2007-07-316-1/+106
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Bug #29717 INSERT INTO SELECT inserts values even ifunknown2007-07-316-1/+106
| * | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-08-011-14/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/41unknown2007-08-011-14/+8
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-08-011-14/+8
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Option 6 tries to grant global privileges at the database levelunknown2007-08-011-14/+8
| * | | | | | | | | | my_pthread.c:unknown2007-07-301-1/+1
| * | | | | | | | | | Merge debian.(none):/M41/bug16635-4.1unknown2007-07-261-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Raise the 64 character limit for path names in the error messagesunknown2007-07-261-3/+3
| | |/ / / / / / / /
* | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-07-264-8/+53
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge bk@192.168.21.1:mysql-4.1-optunknown2007-07-223-1/+46
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Fixed bug #29911.unknown2007-07-203-1/+46
| | |/ / / / / / /
| * | | | | | | | Bug #29494 Field packet with NULL fields crashes libmysqlclient.unknown2007-07-201-7/+7
| |/ / / / / / /
* | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-07-202-11/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/41unknown2007-07-172-11/+29
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge sin.intern.azundris.com:/home/tnurnberg/27198/40-27198unknown2007-07-162-11/+29
| | |\ \ \ \ \ \
| | | * | | | | | Bug#27198: Error returns from time() are ignoredunknown2007-07-132-14/+29
| * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-amainunknown2007-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-amainunknown2007-07-080-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-ateamunknown2007-07-080-0/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-ateamunknown2007-07-051-0/+19
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
* | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-06-290-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-06-211-21/+35
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-06-153-6/+11
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / | | | | | |/| | | | | |