summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changed mysqld.dsp to avoid compilation error in VC++unknown2005-11-281-1/+1
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-273-1/+92
|\
| * Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-263-1/+92
| |\
| | * Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2005-11-263-1/+92
| | |\
| | | * Fixed bug #15106.unknown2005-11-253-1/+92
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-263-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1unknown2005-11-263-1/+7
| |\ \ \ | | |/ / | |/| |
| | * | followup for for the bug#5686unknown2005-11-263-1/+7
* | | | Enabled back bunch of tests for stored routines which were disabledunknown2005-11-262-43/+148
|/ / /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-263-10/+45
|\ \ \
| * | | documenting HA_STATUS_xxx flagsunknown2005-11-263-10/+45
* | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-251-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-251-4/+4
| |\ \ \
| | * | | BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersectionunknown2005-11-251-4/+4
* | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-2518-57/+140
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-2518-57/+140
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Post-merge fixes.unknown2005-11-254-12/+38
| | * | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-11-2515-53/+110
| | |\ \ \
| | | * | | A fix and a test case for Bug#14410 "Crash in Enum or Set type in unknown2005-11-255-8/+77
| | | * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-253-3/+31
| | | |\ \ \
| | | | * \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-243-3/+31
| | | | |\ \ \
| | | | | * | | Fix bug #14482 Wrongly applied optimization in resolve_const_item() causedunknown2005-11-243-3/+31
| | | * | | | | Updated expected errorunknown2005-11-252-2/+2
| | | * | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-241-6/+8
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Moved check of wrong schema version earlierunknown2005-11-241-6/+8
| | | * | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-231-12/+17
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-214-22/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabledunknown2005-11-214-22/+6
| | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-215-3/+15
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Bug #14514 Creating table with packed key fails silentlyunknown2005-11-215-3/+15
| | | * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-213-7/+44
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-...unknown2005-11-255-20/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bug #15168 yassl failure on amd64unknown2005-11-245-20/+13
* | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-254-30/+50
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce differ...unknown2005-11-074-30/+50
* | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-243-0/+33
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix bug#13293 Wrongly used index results in endless loop.unknown2005-11-243-0/+33
* | | | | | | | | Remove t3 in join_nested.testunknown2005-11-242-2/+2
* | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-247-3/+179
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-247-3/+179
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Some post-merge cleaning, and made assert THD::store_globals() work at all ti...unknown2005-11-243-1/+7
| | * | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-245-2/+172
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-11-245-2/+172
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fixed BUG#13729 Stored procedures: packet error after exception handledunknown2005-11-235-2/+177
* | | | | | | | | | | | | don't call handler::info() in SHOW CREATE TABLEunknown2005-11-241-1/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Make it buildable with -ansi flag on some platforms.unknown2005-11-241-0/+2
* | | | | | | | | | | | Polishing: get rid of C++-style comments.unknown2005-11-241-3/+3
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-242-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | table t7 was not dropped at the endunknown2005-11-242-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /