summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0unknown2005-09-293-6/+4
|\
| * Minor corrections to InnoDB function commentsunknown2005-09-293-6/+4
* | mysqlbinlog --hexdump augments each log entry with byte informationunknown2005-09-293-70/+163
|/
* Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-09-290-0/+0
|\
| * Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2924-205/+260
| |\
| * \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-285-1/+93
| |\ \
| * \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-284-2/+50
| |\ \ \
| * \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2710-26/+108
| |\ \ \ \
| * \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-268-18/+30
| |\ \ \ \ \
| * \ \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-241-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-235-4/+62
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-223-4/+239
| | |\ \ \ \ \ \ \
| | * | | | | | | | GCC4 build fixunknown2005-09-221-0/+1
* | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-285-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Moving archive from example to sql.unknown2005-09-285-6/+6
* | | | | | | | | | | Mergeunknown2005-09-2921-193/+228
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Many files:unknown2005-09-2919-96/+97
| * | | | | | | | | | mtr_process.pl:unknown2005-09-281-1/+2
| * | | | | | | | | | mysql-test-run.pl:unknown2005-09-281-64/+81
| * | | | | | | | | | mysql-test-run.pl:unknown2005-09-281-1/+16
* | | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | - compile fix: don't use C++ - style comments in .c files!unknown2005-09-281-1/+1
* | | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-281-51/+117
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | ndb - printSchemaFile: more checks and optionsunknown2005-09-281-51/+117
* | | | | | | | | | | select.result, item.cc:unknown2005-09-282-10/+10
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-287-1/+125
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-288-3/+127
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-285-43/+64
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | mysql_config.sh:unknown2005-09-281-1/+1
| | * | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-283-0/+76
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed a bug checksum table locks the InnoDB table and does not use aunknown2005-09-283-0/+76
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-2822-46/+188
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-283-0/+48
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.unknown2005-09-283-0/+48
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | * | | | | | | | | | disabled.def:unknown2005-09-251-0/+16
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | | | | | | | | | | BUG #13511 Wrong patch pushed, fixing.unknown2005-09-281-1/+1
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-283-13/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix for bug #13546 "Build errors with --with-embedded-serverunknown2005-09-283-13/+14
* | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501unknown2005-09-281-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fix for bug #13501 "build problem: too many arguments to function my_boolunknown2005-09-271-2/+2
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-281-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | ndb - bug#13512unknown2005-09-281-1/+1
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-2821-78/+140
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-283-4/+13
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correct merge error, warning ended up after new tests from 4.1unknown2005-09-281-2/+2
| * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-2818-69/+129
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-275-43/+64
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Bug #7037 Test "mysql_protocols" fails on Solaris 8 + 9 /x86unknown2005-09-231-2/+7
| | | * | | | | | | | BUG#7037 MySQL Bugs: #7037: Test "mysql_protocols" fails on Solaris 8 + 9 /x86unknown2005-09-231-6/+14