summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Brian's "he is too lazy to commit this so Eric is going to have to do it" env...unknown2005-09-162-1/+6
* Added testcase for BUG#13118unknown2005-09-162-0/+81
* Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-161-10/+0
|\
| * InnoDB: Remove unused #defines BTR_PAGE_MAX_KEY_SIZE and BTR_COMPRESS_LIMIT.unknown2005-09-161-10/+0
* | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-163-4/+32
|\ \
| * | Fix bug #12291 Table wasn't reinited for index scan after sequential scanunknown2005-09-163-4/+32
* | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-161-0/+8
|\ \ \ | |_|/ |/| |
| * | Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0unknown2005-09-151-0/+8
| |\ \
| | * | Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by K...unknown2005-09-151-0/+8
* | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-162-12/+12
|\ \ \ \
| * | | | fixed length detectionunknown2005-09-162-12/+12
| |/ / /
* | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-154-2/+24
|\ \ \ \
| * \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-154-2/+24
| |\ \ \ \
| | * \ \ \ Merge moonbone.local:/work/12887-bug-4.1-mysqlunknown2005-09-151-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal:/home/bk/mysql-4.1unknown2005-09-153-1/+22
| | | |\ \ \ \
| | | * \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-12723unknown2005-09-151-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix shared memory connection handling on Windows. (Bug #12723)unknown2005-08-311-1/+1
| | * | | | | | | Manual mergeunknown2005-09-153-1/+23
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-153-1/+22
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Fix bug#12887 Distinct is not always applied after rollupunknown2005-09-153-1/+22
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-154-28/+360
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | bad merge fixedunknown2005-09-154-28/+360
* | | | | | | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-150-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge selena.:H:/MYSQL/src/fin-mysql-4.1unknown2005-09-150-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Turn off EOLN_NATIVE flag of some test filesunknown2005-09-150-0/+0
| | * | | | | | Merge mysql.com:/home/my/mysql-4.0unknown2005-09-151-4/+4
| | |\ \ \ \ \ \
| | | * | | | | | Turn off EOLN_NATIVE flag for all test filesunknown2005-09-151-0/+2
* | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-153-0/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Mergeunknown2005-09-153-0/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix bug #11416 Server crash if using a view that uses function convert_tzunknown2005-09-153-0/+14
* | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-151-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-150-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/export/space/pekka/ndb/version/my41unknown2005-09-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | ndb - bug#9994 backpatch fixes from 5.0unknown2005-09-155-158/+338
| | | * | | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-09-142-8/+14
| | | |\ \ \ \ \ \ \
| * | | | | | | | | | - bumped up version number to 5.0.14-rc in the main tree (5.0.13-rc hasunknown2005-09-151-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | - bumped up version number from 5.0.13-beta to 5.0.13-rcclone-5.0.13-buildunknown2005-09-151-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-152-15/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Information schema fix for WL#2787unknown2005-09-152-15/+26
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-151-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL)unknown2005-09-151-3/+15
| |/ / / / / / / /
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-153-6/+20
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-153-6/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Bug #12526 yassl: Crashes in "integer.cpp"unknown2005-09-152-2/+16
| | * | | | | | | | Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050913150614|63378unknown2005-09-141-4/+4
* | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-09-1523-125/+670
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-1516-97/+414
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-1516-97/+414
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix for bug #12704 "Server crashes during trigger execution".unknown2005-09-1516-97/+414
| * | | | | | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-144-4/+246
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /