summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-263-45/+101
|\
| * Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-253-45/+101
| |\
| | * WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.unknown2005-03-253-45/+101
* | | Manual mergeunknown2005-03-261-15/+29
|\ \ \
| * | | A fix for Bug#8226 "Cannot connect via shared memory": unknown2005-03-261-15/+29
| * | | Fix upgrade/downgrade issue. unknown2005-03-251-1/+1
* | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-258-4/+296
|\ \ \ \
| * \ \ \ Merging support for blackhole up to 5.0.unknown2005-03-258-4/+296
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-248-2/+296
| | |\ \
| | | * | Collection of changes per Bar and Serg.unknown2005-03-242-42/+75
| | | * | Additional storage engine called "blackhole". Customer request, and for that ...unknown2005-03-228-2/+263
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-242-1/+6
| | |\ \ \
* | | \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-255-37/+106
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-251-1/+1
| |\ \ \ \ \
| | * | | | | Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHE...unknown2005-03-251-1/+1
| * | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-253-35/+99
| |\ \ \ \ \ \
| | * | | | | | Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)unknown2005-03-251-13/+5
| | * | | | | | Bug #9317: Wrong count for tables in INFORMATION_SCHEMAunknown2005-03-243-34/+106
| * | | | | | | Mergeunknown2005-03-252-1/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-242-1/+6
| | |\ \ \ \ \
| | | * | | | | Fixed that LEFT OUTER JOIN was replaced with a regulat joinunknown2005-03-242-1/+6
| * | | | | | | Removed faulty mergeunknown2005-03-241-14/+0
| * | | | | | | Manual mergeunknown2005-03-241-0/+14
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-03-241-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | BUG#9303 blob field with specified length < 256 does not create tinyblobunknown2005-03-241-1/+1
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-245-22/+51
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
* | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-247-21/+61
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-245-13/+51
| |\ \ \ \ \
| | * \ \ \ \ merge from 4.1unknown2005-03-245-13/+51
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1unknown2005-03-235-22/+51
| | | |\ \ \ \
| | | | * | | | "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replicati...unknown2005-03-235-22/+51
| * | | | | | | Manual mergeunknown2005-03-242-7/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes and test cases for Bug#8880 "Commands out of sync error with cursors"unknown2005-03-242-7/+9
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-241-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-232-0/+19
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-03-231-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-232-22/+38
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug9072unknown2005-03-221-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | BUG#9072 'Max_error_count' system variable cannot be set to zerounknown2005-03-211-1/+1
* | | | | | | | | | Clarify comment to add which version of the C compiler for AIX needs to haveunknown2005-03-231-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-231-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Fix a valgrind warning spotted while trying to repeat Bug#7166unknown2005-03-231-0/+1
* | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-233-24/+56
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | ha_innodb.cc:unknown2005-03-231-0/+18
| |/ / / / / / /
| * | | | | | | Mergedunknown2005-03-222-24/+38
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | Added better comment for perceived problem with fix for Bug #8753 Invalid sch...unknown2005-03-221-2/+3
| | * | | | | Extra fix for perceived problem with fix for Bug #8753 Invalid schema object ...unknown2005-03-222-22/+37
| | | |/ / / | | |/| | |
| | * | | | Fixed newly introduced bug in ROLLUPunknown2005-03-221-1/+1
| | |/ / /
* | | | | sql/sql_acl.ccunknown2005-03-232-16/+18
* | | | | mergedunknown2005-03-2310-82/+89
|\ \ \ \ \