summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* make JOIN::prepare, JOIN::optimize only once for EXPLAIN of derived tableunknown2004-02-016-16/+47
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-02-0118-243/+306
|\
| * now all tables of query are locked in one place (including derived tables)unknown2004-02-0118-243/+306
* | cleanupunknown2004-01-302-14/+14
* | incorrect fix undone, as it causes memory leaks (e.g. in key.test)unknown2004-01-301-0/+1
* | catch accesses to deleted objectsunknown2004-01-302-2/+9
* | SHOW CREATE DATABASE moved to sql_show.cc where it belongsunknown2004-01-303-90/+91
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-01-308-24/+20
|\ \ | |/ |/|
| * better fix BUG#2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary keyunknown2004-01-288-24/+20
* | Unused variable removed (cleanup spotted in bug #2214)unknown2004-01-291-1/+0
* | ibuf0ibuf.c:unknown2004-01-291-3/+6
* | Fixed Bug#2479, "dependant subquery with limit crash".unknown2004-01-293-1/+101
* | Fixed a bug in GREATES() and LEAST() function, that caused a coreunknown2004-01-283-0/+16
|/
* Fix for #2210 (SHOW TABLE STATUS fails when .frm is corrupted)unknown2004-01-281-0/+1
* Fix for #2209unknown2004-01-271-0/+1
* 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
| |/ / / / / / / /