summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-272-6/+4
|\
| * bugfix to #1224unknown2004-01-272-6/+4
* | code cleanup (unnecessary line in libmysqld/Makefile.am)unknown2004-01-271-1/+0
|/
* warning commentunknown2004-01-261-0/+2
* Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-01-261-2/+5
|\
| * fix for BUG#2516: "SLAVE START may crash mysqld"unknown2004-01-261-2/+5
* | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-2625-13/+43
|\ \
| * | Fix for bug#2505: MySQL reports "out of memory" unknown2004-01-2625-13/+43
| |/
* | Fixed a bug in slave-compressed-protocol. Using this optionunknown2004-01-261-1/+1
|/
* Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-245-14/+11
|\
| * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-223-6/+6
| |\
| * | Fix for a bug #2422, where CONVERT(expr, cast) was masked byunknown2004-01-224-16/+12
| * | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-222-6/+7
| |\ \
| | * \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-2036-32/+257
| | |\ \
| | * \ \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-196-6/+7
| | |\ \ \
| | * \ \ \ merge fixesunknown2004-01-172-6/+7
| | |\ \ \ \
| | | * | | | Two bug fixesunknown2004-01-162-7/+8
* | | | | | | mysqld.cc:unknown2004-01-231-1/+1
* | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-2343-744/+934
|\ \ \ \ \ \ \
| * | | | | | | define name fixedunknown2004-01-231-1/+1
| * | | | | | | Error message addedunknown2004-01-2322-0/+22
| * | | | | | | Conflicts resolvedunknown2004-01-2317-738/+906
| |\ \ \ \ \ \ \
| | * | | | | | | SCRUMunknown2004-01-234-3/+7
| | * | | | | | | SCRUMunknown2004-01-236-61/+42
| | * | | | | | | SCRUM:unknown2004-01-1512-736/+919
| * | | | | | | | Reverted an addition to be able to use ';' as a commentunknown2004-01-231-1/+1
| * | | | | | | | patch reverted - USE_RAID is defined in my_config.hunknown2004-01-232-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-01-223-6/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | enforcing coding style to cause an intentional merge conflict with 4.0unknown2004-01-221-2/+2
| | * | | | | | no unnecessary includes (Intel ecc 7.0 compatibility fix)unknown2004-01-212-4/+4
* | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-2159-242/+582
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-211-0/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-211-0/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | yet another cleanup()-related fixunknown2004-01-211-0/+2
| * | | | | | | | | sql_string.cc:unknown2004-01-211-10/+5
| |/ / / / / / / /
| * | | | | | | | Further fixes for 2390: ucs2 alignmentunknown2004-01-215-15/+152
| |/ / / / / / /
| * | | | | | | Fix for #2278 (mysql_prepare and mysql_execute not exported in libmysqld.dll)unknown2004-01-211-0/+22
| * | | | | | | Mergeunknown2004-01-2033-19/+135
| |\ \ \ \ \ \ \
| | * | | | | | | for multy-delete command used same algorithm of table reference (alias)unknown2004-01-205-7/+6
| | * | | | | | | allow UPDATE and DELETE stetements with tables derived from subquery if they ...unknown2004-01-0429-14/+132
| * | | | | | | | Merge deer.(none):/home/hf/work/mysql-4.1.cleanunknown2004-01-2026-7/+184
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | row0sel.c:unknown2004-01-201-2/+0
| * | | | | | | | Pack of changes about 'cleanup()'-sunknown2004-01-206-16/+19
| * | | | | | | | Merge deer.(none):/home/hf/work/mysql-4.1.cleanunknown2004-01-1982-277/+1226
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Code cleanupunknown2004-01-191-1/+0
| * | | | | | | | Code cleanup (working on PS & cleanup() code)unknown2004-01-1911-136/+135
| * | | | | | | | Merge deer.(none):/home/hf/work/mysql-4.1.cleanunknown2004-01-068-17/+145
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge deer.(none):/home/hf/work/mysql-4.1.cleanunknown2003-12-3017-67/+136
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix for prepared statementsunknown2003-12-3017-67/+136
* | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-01-19119-304/+2324
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |