summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-043-0/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | BUG#9814: post-review fixes: clear thd->net.no_send error after SP instructionunknown2005-07-041-4/+4
| | * | | | | | | | | | | | | | | | | | Fix for BUG#9814: Clear thd->net.no_send_error before each SP instruction unknown2005-07-043-0/+74
* | | | | | | | | | | | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-07-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | - The Max package should Require a matching MySQL-server package. Automatical...unknown2005-07-041-1/+1
* | | | | | | | | | | | | | | | | | | Merge mysql.com:/space/my/mysql-5.0unknown2005-07-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/space/my/mysql-4.1-mergeunknown2005-07-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | / / / / / / / / | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | - manual mergeunknown2005-07-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge mysql.com:/space/my/mysql-4.0.25-cloneunknown2005-07-041-2/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | - bumped up version number in configure.in to 4.0.26unknown2005-07-041-1/+1
| | | * | | | | | | | | | | | | | | | - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from r...unknown2005-06-301-1/+1
* | | | | | | | | | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-045-95/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | InnoDB: Optimize [and clarify] a condition in build_template()unknown2005-07-011-9/+32
| * | | | | | | | | | | | | | | | | | | InnoDB: Fix a bug in BLOB handling; optimize null flag handling.unknown2005-06-301-38/+67
| * | | | | | | | | | | | | | | | | | | InnoDB: Optimize page_cur_search_with_match().unknown2005-06-303-48/+66
* | | | | | | | | | | | | | | | | | | | After merge fixesunknown2005-07-044-65/+71
* | | | | | | | | | | | | | | | | | | | manual mergeunknown2005-07-0425-332/+457
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fixes during review of new codeunknown2005-07-0426-312/+442
| * | | | | | | | | | | | | | | | | | | Simple optimizationunknown2005-06-293-22/+21
* | | | | | | | | | | | | | | | | | | | After merge fixesunknown2005-07-048-266/+260
* | | | | | | | | | | | | | | | | | | | Merge with 4.1unknown2005-07-0350-238/+520
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-021-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-022-5/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-011-5/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Optimization during reviewunknown2005-07-011-5/+4
| * | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0unknown2005-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | configure.in:unknown2005-07-021-1/+6
| | | |_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-0232-100/+370
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-07-011-5/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | fixed create_distinct_group() to make references via ref_pointer_arrayunknown2005-07-011-5/+14
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2unknown2005-07-011-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Don't allow 8bytes for data file pointers for now.unknown2005-06-301-0/+3
| | * | | | | | | | | | | | | | | | | | Fixed Bug#11226 and reverted fix for Bug#6993.unknown2005-06-304-8/+11
| | * | | | | | | | | | | | | | | | | | Moved connections first in test, to reduce risk of connecting before servers ...unknown2005-06-291-4/+7
| | * | | | | | | | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-06-293-0/+107
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | func_str.test:unknown2005-06-293-0/+107
| | * | | | | | | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-06-283-0/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | fixed not_null_tables() for IN() (BUG#9393)unknown2005-06-283-0/+30
| | * | | | | | | | | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-283-43/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-285-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Move reset of insert_values to ensure it's done also during error conditionsunknown2005-06-285-3/+8
| | * | | | | | | | | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-06-283-2/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | group_by.result, group_by.test:unknown2005-06-283-2/+21
| | * | | | | | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-286-30/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-256-30/+73
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-231-8/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test:unknown2005-06-286-5/+51
| * | | | | | | | | | | | | | | | | | | | | make_win_src_distribution.sh:unknown2005-06-281-0/+3
| |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Makefile.am:unknown2005-06-281-1/+1
| * | | | | | | | | | | | | | | | | | | | configure.in:unknown2005-06-281-1/+6