summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cleanups (comments and compiler warnings)unknown2003-11-029-16/+36
* mergeunknown2003-10-314-5/+52
|\
| * samall optimisation (any independent query will not save data for rexecution)unknown2003-10-104-5/+52
* | small fix for max_user_connections. everything else will be pulled from 4.0unknown2003-10-311-1/+2
* | post-merge fixesunknown2003-10-312-15/+16
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-10-3116-29/+655
|\ \
| * \ Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-312-6/+1
| |\ \
| | * | old_total_warn_count is not usedunknown2003-10-312-6/+1
| * | | Fixes for mysql tests.unknown2003-10-315-16/+17
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-3110-8/+638
| |\ \ \ | | |/ / | |/| |
| | * | WL #1056: Eliminate NOT operators from where conditionunknown2003-10-3110-8/+638
| | |/
* | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-10-3163-871/+2966
|\ \ \ | |/ /
| * | new mysqldump -X test (bug #1707)unknown2003-10-312-3/+33
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-311-47/+133
| |\ \
| | * | WL #1279: Add table description to xml dump (SCRUM)unknown2003-10-301-47/+133
| * | | Mergeunknown2003-10-3060-821/+2800
| |\ \ \
| | * | | Many files:unknown2003-10-017-19/+28
| | * | | Manual merge after improving concurrency for key cache reassignmentunknown2003-10-017-37/+370
| | * | | Manual merge after improving concurrency for key cache reassignmentunknown2003-10-0153-771/+2408
| | |\ \ \
| | | * | | Many files:unknown2003-10-017-20/+88
| | | * | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-08-2660-782/+2689
| | | |\ \ \
| | | | * | | key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:unknown2003-08-265-34/+43
| | | | * | | Manual mergeunknown2003-08-261-5/+45
| | | | * | | Manual mergeunknown2003-08-2659-768/+2626
| | | | |\ \ \
| | | | | * \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-08-0936-157/+329
| | | | | |\ \ \
| | | | | * | | | set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:unknown2003-08-0920-234/+761
| | | | | * | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-08-021-2/+11
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-08-02146-3191/+1767
| | | | | |\ \ \ \ \
| | | | | * | | | | | resolving bk problemsunknown2003-08-022-3/+3
| | | | | * | | | | | Many files:unknown2003-08-0243-292/+1130
| | | | | * | | | | | Makefile.am:unknown2003-07-161-1/+1
| | | | | * | | | | | Conflict resolutionunknown2003-07-16127-1177/+3444
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | mi_keycache.c:unknown2003-07-1612-12/+190
| | | | | * | | | | | | range.result, range.test:unknown2003-06-302-2/+216
| | | | | * | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-06-3026-470/+593
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | item_cmpfunc.h, opt_range.cc:unknown2003-06-302-1/+16
| | | | | | * | | | | | | mysqld.cc, handler.cc:unknown2003-06-302-3/+4
| | | | | | * | | | | | | Many files:unknown2003-06-3022-466/+573
* | | | | | | | | | | | | post-merge fixesunknown2003-10-302-5/+14
* | | | | | | | | | | | | mergedunknown2003-10-3036-84/+353
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | small fix in commentunknown2003-10-301-1/+1
| * | | | | | | | | | | | added fixed= 1 to the end of Item_in_optimizer::fix_fields() unknown2003-10-301-0/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | BUG#1644: Insertion of more than 3 NULL columns with parameter binding failsunknown2003-10-272-3/+2
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-271-71/+240
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | A few more fixes.unknown2003-10-251-2/+111
| | * | | | | | | | | | | A major overhaul to adopt to recent changes. It now passes all tests.unknown2003-10-251-70/+130
| * | | | | | | | | | | | fixed ALL/ANY optimisation with union (BUG#1668)unknown2003-10-275-10/+56
| * | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-10-261-27/+35
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | sql_parse.cc:unknown2003-10-261-27/+35
| * | | | | | | | | | | | | after-merge fixunknown2003-10-261-4/+4