summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-09-193-19/+38
|\
| * mysql-test-run.pl:unknown2005-09-191-5/+16
| * bug#9282 - ndb unknown2005-09-192-14/+22
* | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-09-191-49/+73
|\ \ | |/
| * Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1unknown2005-09-181-54/+0
| |\
| * | mysql-test-run.pl:unknown2005-09-171-49/+73
* | | ctype_utf8.result, ctype_utf8.test:unknown2005-09-192-0/+8
* | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-195-2/+79
|\ \ \
| * | | Bug#10504unknown2005-09-165-2/+79
* | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-198-14/+191
|\ \ \ \
| * | | | Changes after discussion/review with Sanjaunknown2005-09-184-62/+98
| * | | | Fix for bug#5508 after Sanja's reviewunknown2005-09-166-9/+150
* | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1unknown2005-09-181-54/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0unknown2005-09-181-54/+0
| |\ \ \ \
| | * | | | .del-which.2~463417adb2e37122:unknown2005-09-181-54/+0
* | | | | | 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
| | | |\ \ \ \ \ \ \ \ \