summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mergeigor@rurik.mysql.com2003-10-3060-821/+2800
|\
| * Many files:igor@rurik.mysql.com2003-10-017-19/+28
| * Manual merge after improving concurrency for key cache reassignmentigor@rurik.mysql.com2003-10-017-37/+370
| * Manual merge after improving concurrency for key cache reassignmentigor@rurik.mysql.com2003-10-0153-771/+2408
| |\
| | * Many files:igor@rurik.mysql.com2003-10-017-20/+88
| | * Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-2660-782/+2689
| | |\
| | | * key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:igor@rurik.mysql.com2003-08-265-34/+43
| | | * Manual mergeigor@rurik.mysql.com2003-08-261-5/+45
| | | * Manual mergeigor@rurik.mysql.com2003-08-2659-768/+2626
| | | |\
| | | | * Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-0936-157/+329
| | | | |\
| | | | * | set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:igor@rurik.mysql.com2003-08-0920-234/+761
| | | | * | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-021-2/+11
| | | | |\ \
| | | | * \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-02146-3191/+1767
| | | | |\ \ \
| | | | * | | | resolving bk problemsigor@rurik.mysql.com2003-08-022-3/+3
| | | | * | | | Many files:igor@rurik.mysql.com2003-08-0243-292/+1130
| | | | * | | | Makefile.am:igor@rurik.mysql.com2003-07-161-1/+1
| | | | * | | | Conflict resolutionigor@rurik.mysql.com2003-07-16127-1177/+3444
| | | | |\ \ \ \
| | | | * | | | | mi_keycache.c:igor@rurik.mysql.com2003-07-1612-12/+190
| | | | * | | | | range.result, range.test:igor@rurik.mysql.com2003-06-302-2/+216
| | | | * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-06-3026-470/+593
| | | | |\ \ \ \ \
| | | | | * | | | | item_cmpfunc.h, opt_range.cc:igor@rurik.mysql.com2003-06-302-1/+16
| | | | | * | | | | mysqld.cc, handler.cc:igor@rurik.mysql.com2003-06-302-3/+4
| | | | | * | | | | Many files:igor@rurik.mysql.com2003-06-3022-466/+573
* | | | | | | | | | small fix in commentkonstantin@oak.local2003-10-301-1/+1
* | | | | | | | | | added fixed= 1 to the end of Item_in_optimizer::fix_fields() konstantin@oak.local2003-10-301-0/+1
* | | | | | | | | | BUG#1644: Insertion of more than 3 NULL columns with parameter binding failspem@mysql.comhem.se2003-10-272-3/+2
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1pem@mysql.com2003-10-271-71/+240
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | A few more fixes.pem@mysql.comhem.se2003-10-251-2/+111
| * | | | | | | | | | A major overhaul to adopt to recent changes. It now passes all tests.pem@mysql.comhem.se2003-10-251-70/+130
* | | | | | | | | | | fixed ALL/ANY optimisation with union (BUG#1668)bell@sanja.is.com.ua2003-10-275-10/+56
* | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-10-261-27/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sql_parse.cc:heikki@hundin.mysql.fi2003-10-261-27/+35
* | | | | | | | | | | | after-merge fixbell@sanja.is.com.ua2003-10-261-4/+4
* | | | | | | | | | | | mergebell@sanja.is.com.ua2003-10-2626-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | mergebell@laptop.sanja.is.com.ua2003-10-0926-1/+38
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | added worning about changing requested size of query cache (BUG#1502)bell@laptop.sanja.is.com.ua2003-10-0926-1/+38
* | | | | | | | | | | | | sql_parse.cc:heikki@hundin.mysql.fi2003-10-251-0/+3
* | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-10-252-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fixed unlinking SELECT methodsbell@sanja.is.com.ua2003-10-251-0/+17
| * | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-10-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | made 'TODO'bell@sanja.is.com.ua2003-10-241-1/+1
* | | | | | | | | | | | | | | sql_parse.cc:heikki@hundin.mysql.fi2003-10-251-8/+48
* | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-10-245-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | removed one more hack that - as usual - almost always workedserg@serg.mylan2003-10-245-14/+11
* | | | | | | | | | | | | | | after merge fixbell@sanja.is.com.ua2003-10-241-0/+3
* | | | | | | | | | | | | | | Mergebell@sanja.is.com.ua2003-10-244-5/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | added commentbell@sanja.is.com.ua2003-10-241-0/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | added check of cardinality to IN/ALL/ANY subquery transformerbell@sanja.is.com.ua2003-10-233-5/+30
* | | | | | | | | | | | | | support 'parallel' updates and rallback of whole statement in case of error i...bell@sanja.is.com.ua2003-10-246-59/+136
* | | | | | | | | | | | | | Mergebell@sanja.is.com.ua2003-10-235-9/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /