summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* one more testserg@serg.mysql.com2002-12-022-0/+9
* mergedserg@serg.mysql.com2002-12-027-26/+131
|\
| * INSERT ... ON DUPLICATE KEY UPDATE ...serg@serg.mysql.com2002-12-027-25/+130
| * removed left-over UPDATE_ACL from REPLACEserg@serg.mysql.com2002-11-301-1/+1
* | Proper handling of ORDER BY table.column in UNION'sSinisa@sinisa.nasamreza.org2002-12-0228-13/+39
* | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2002-12-0219-98/+168
|\ \
| * \ Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1monty@mashka.mysql.fi2002-12-029-19/+26
| |\ \
| | * | Fixed bug when creating keys in temporary HEAP tables.monty@mashka.mysql.fi2002-12-029-19/+26
| * | | Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict.pem@mysql.com2002-12-011-6/+13
| * | | Merge work.mysql.com:/home/bk/mysql-4.1pem@mysql.com2002-12-013-53/+55
| |\ \ \ | | |/ / | |/| |
| | * | Fixed ambiguity between the row value syntax and INTERVAL syntax by making thepem@mysql.com2002-11-303-53/+55
| * | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1bell@sanja.is.com.ua2002-12-017-20/+74
| |\ \ \
| | * | | fix of error handlingbell@sanja.is.com.ua2002-12-017-20/+74
* | | | | A better fixSinisa@sinisa.nasamreza.org2002-11-301-2/+2
* | | | | A bug fix for ORDER BY on table.column in provisional entire UNIONSinisa@sinisa.nasamreza.org2002-11-303-2/+11
|/ / / /
* | | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2002-11-3010-25/+103
|\ \ \ \ | |/ / /
| * | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1bell@sanja.is.com.ua2002-11-308-20/+96
| |\ \ \ | | |/ / | |/| |
| | * | check of using same table for changing and selectbell@sanja.is.com.ua2002-11-308-20/+96
| * | | Pass thd as an argument to yylex().pem@mysql.com2002-11-302-5/+7
| | |/ | |/|
* | | some bug fixes and tests for those.Sinisa@sinisa.nasamreza.org2002-11-305-10/+39
* | | many bug fixesSinisa@sinisa.nasamreza.org2002-11-306-9/+11
* | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2002-11-291-17/+26
|\ \ \ | |/ /
| * | let's leave "INSERT ... SELECT ... UPDATE" for the futureserg@serg.mysql.com2002-11-291-17/+26
| |/
* | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2002-11-2936-52/+93
|\ \ | |/ |/|
| * many, many changesSinisa@sinisa.nasamreza.org2002-11-2936-52/+93
| |\
| | * many bug fixesSinisa@sinisa.nasamreza.org2002-11-297-14/+24
| | * adding mandatory aliases for derived tables as per SQL-99Sinisa@sinisa.nasamreza.org2002-11-2834-53/+5562
* | | Merge work:/home/bk/mysql-4.1serg@serg.mysql.com2002-11-2911-16/+47
|\ \ \
| * \ \ Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1bell@sanja.is.com.ua2002-11-2911-16/+47
| |\ \ \ | | |/ / | |/| |
| | * | checking columns of top itemsbell@sanja.is.com.ua2002-11-2911-16/+47
* | | | added missing Com_xxx status variablesserg@serg.mysql.com2002-11-293-3/+22
* | | | make multi updates statistics visible in SHOW STATUS as Com_update_multiserg@serg.mysql.com2002-11-293-13/+22
* | | | s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_M...serg@serg.mysql.com2002-11-292-7/+7
|/ / /
* | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1bar@bar.mysql.r18.ru2002-11-291-335/+346
|\ \ \ | |/ / |/| |
| * | UCS2 fixesbar@bar.mysql.r18.ru2002-11-291-240/+237
| * | my_strntod_ucs2 and my_strntol_ucs2 fixesbar@bar.mysql.r18.ru2002-11-291-98/+112
* | | fixed error handling bugbell@sanja.is.com.ua2002-11-294-1/+17
|/ /
* | Fixesd that wrong charset were usedbar@bar.mysql.r18.ru2002-11-291-5/+3
* | mysql.h:bar@bar.mysql.r18.ru2002-11-291-2/+2
* | Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4miwax@mysql.com2002-11-294-53/+193
|\ \
| * \ Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4miwax@mysql.com2002-11-284-53/+193
| |\ \
| | * | Correct view of sort.c and mi_too_big_key_for_sort()wax@mysql.com2002-11-282-10/+8
| | * | Move MI_SORT_PARAM and BUFFPEK to myisamdef.h, delete KEY_STORE, change funct...wax@mysql.com2002-11-173-112/+105
| | * | Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4miwax@mysql.com2002-11-171-29/+178
| | |\ \
| | | * | add functions for store keys to temporary file with variable lengthwax@mysql.com2002-11-132-29/+179
* | | | | test of changing subselects treebell@sanja.is.com.ua2002-11-282-0/+11
* | | | | fixed bug IN subselect with ORDERbell@sanja.is.com.ua2002-11-283-4/+16
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1bell@sanja.is.com.ua2002-11-284-4/+2
|\ \ \ \ \
| * \ \ \ \ Merge work.mysql.com:/home/bk/mysql-4.1venu@myvenu.com2002-11-284-4/+2
| |\ \ \ \ \
| | * | | | | Get rid of pbool from my_list.h; and avoid using the my_global.h for clientsvenu@myvenu.com2002-11-284-4/+2