summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mergingunknown2002-12-3131-234/+351
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged
| * postreview fix (SCRUM)unknown2002-12-2823-210/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed layout sql/filesort.cc: fixed layout sql/gstream.cc: fixed layout sql/item.cc: postreview fix sql/item.h: postreview fix sql/item_cmpfunc.cc: postreview fix sql/item_cmpfunc.h: fixed layout sql/item_func.h: fixed layout sql/item_row.h: fixed layout sql/item_strfunc.cc: fixed layout sql/item_subselect.cc: postreview fix sql/item_subselect.h: postreview fix sql/nt_servc.cc: fixed layout sql/opt_range.cc: fixed layout sql/password.c: fixed layout sql/spatial.cc: fixed layout sql/sql_help.cc: fixed layout sql/sql_lex.cc: fixed layout sql/sql_olap.cc: fixed layout sql/sql_select.cc: fixed layout sql/sql_show.cc: fixed layout sql/sql_string.cc: fixed layout sql/sql_table.cc: fixed layout sql/stacktrace.c: fixed layout
| * Merge sanja.is.com.ua:/home/bell/mysql/work-row-4.1unknown2002-12-2716-34/+223
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-from-4.1 sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged
| | * support of subselect without FROM reducing (SCRUM)unknown2002-12-2616-34/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived more correct creation of reference in Item_field::fix_field mysql-test/r/subselect.result: new explain with subselect reduced mysql-test/t/subselect.test: new explain with subselect reduced sql/item.cc: support of subselect without FROM reducing more correct creation of reference in Item_field::fix_field sql/item.h: support of subselect without FROM reducing sql/item_cmpfunc.cc: support of subselect without FROM reducing sql/item_cmpfunc.h: support of subselect without FROM reducing sql/item_func.cc: support of subselect without FROM reducing sql/item_func.h: support of subselect without FROM reducing sql/item_row.cc: support of subselect without FROM reducing sql/item_row.h: support of subselect without FROM reducing sql/item_strfunc.h: fixed layout support of subselect without FROM reducing sql/item_subselect.cc: support of subselect without FROM reducing sql/item_subselect.h: support of subselect without FROM reducing sql/mysql_priv.h: reference in Item_field::fix_field related changes sql/sql_base.cc: reference in Item_field::fix_field related changes sql/sql_derived.cc: fixed bug of calling setup_fields without correct lex->current_select pointer
* | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-12-3113-312/+850
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-row-4.1 mysql-test/r/subselect.result: Auto merged mysql-test/t/subselect.test: Auto merged sql/item.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged
| * \ \ Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-12-299-7/+238
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-row-4.1 sql/sql_yacc.yy: Auto merged
| * | | postreview fixunknown2002-12-272-9/+14
| | | |
| * | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-12-2713-306/+840
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-row-4.1 sql/sql_yacc.yy: Auto merged
| | * | results fixingunknown2002-12-251-1/+1
| | | |
| | * | more correct argument for translation function (SCRUM related)unknown2002-12-252-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fiexd bug in LIMIT check sql/item_subselect.cc: more correct argument for translation function fiexd bug in LIMIT check sql/item_subselect.h: more correct argument for translation function
| | * | check of LIMIT in row IN subquery (SCRUM related)unknown2002-12-253-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of LIMIT in row IN subquery mysql-test/t/subselect.test: test of LIMIT in row IN subquery sql/item_subselect.cc: check of LIMIT in row IN subquery
| | * | mergingunknown2002-12-2513-287/+804
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/sql_class.cc: Auto merged
| | | * | row IN subselects (SCRUM)unknown2002-12-1913-48/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of row IN subslect mysql-test/t/subselect.test: test of row IN subslect sql/item.cc: New helper Item - reference on item list by number cache item for row sql/item.h: layout fixed New helper Item - reference on item list by number cache item for row sql/item_cmpfunc.cc: changed Item_in_optimizer to be able work with row sql/item_cmpfunc.h: changed Item_in_optimizer to be able work with row sql/item_row.cc: Fixed row Item to be compatible with row subselect sql/item_row.h: Fixed row Item to be compatible with row subselect sql/item_subselect.cc: changed name of class to corerectly reflex its function row IN subselect sql/item_subselect.h: changed name of class to corerectly reflex its function row IN subselect sql/sql_class.cc: changed name of class to corerectly reflex its function sql/sql_class.h: changed name of class to corerectly reflex its function sql/sql_yacc.yy: changed name of class to corerectly reflex its function
| | | * | Item_in_optimizer is changed to be used with row IN subselect (SCRUM)unknown2002-12-195-159/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed unused items sql/item.cc: removed unused Items sql/item.h: removed unused Items sql/item_cmpfunc.cc: Item_in_optimizer is changed to be used with row IN subselect sql/item_cmpfunc.h: Item_in_optimizer is changed to be used with row IN subselect sql/item_subselect.cc: Item_in_optimizer is changed to be used with row IN subselect
| | | * | support of simple row subselects (SCRUM)unknown2002-12-198-69/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of simple row subselect fixed table droping mysql-test/t/subselect.test: test of simple row subselect fixed table dropimg sql/item.cc: Item_cache_str fixed to correctly store NULL and copy string value sql/item.h: Item_cache_str fixed to correctly store NULL and copy string value sql/item_cmpfunc.cc: support of simple row subselects sql/item_subselect.cc: support of simple row subselects sql/item_subselect.h: support of simple row subselects sql/sql_class.cc: support of simple row subselects
| | | * | optimized single value subselect (to be used as row) (SCRUM)unknown2002-12-194-66/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.h: optimized single value subselect (to be used as row) sql/item_subselect.cc: optimized single value subselect (to be used as row) sql/item_subselect.h: optimized single value subselect (to be used as row) sql/sql_class.cc: optimized single value subselect (to be used as row)
* | | | | license has been addedunknown2002-12-311-0/+16
| | | | |
* | | | | XML parserunknown2002-12-316-2/+522
| | | | |
* | | | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-311-0/+861
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
| * | | | | GIS docunknown2002-12-271-0/+861
| |/ / / /
* | | | | Merge work.mysql.com:/home/bk/mysql-4.1unknown2002-12-303-10/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/bk/src-4.1 sql/sql_table.cc: Auto merged
| * | | | | pure coverage test updates unknown2002-12-303-10/+27
| | | | | |
* | | | | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-3017-23/+186
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/field.cc: Auto merged sql/item.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged
| * | | | | | fixing rpl_temporary.test for FreeBSD/Linux thread-order (it add 4 sec. sleep)unknown2002-12-302-2/+7
| | | | | | |
| * | | | | | Fix compiler warnings removing unreferenced variablesunknown2002-12-295-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/field.cc: Removing unreferenced local variables sql/item.cc: Remove unreferenced local variable sql/sql_parse.cc: Remove unreferenced local variable sql/sql_select.cc: Remove unreferenced local variable sql/sql_show.cc: Remove unreferenced local variable
| * | | | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1unknown2002-12-3012-15/+180
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1 BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_table.cc: Auto merged
| | * | | | | processing thread specific queriesunknown2002-12-3013-15/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-289-7/+238
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | | Merge akeremidarski@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-286-5/+235
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into banica.(none):/home/salle/bk/mysql-4.1
| | * | | | | sql_table.cc:unknown2002-12-286-5/+235
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CREATE LIKE TABLE .. temporary case sql/sql_table.cc: Fix CREATE LIKE TABLE .. temporary case
| * | | | | Removed ^Munknown2002-12-273-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by Georg Richter as it brokes his build with mipspro client/mysqlimport.c: Removed ^M client/mysqlshow.c: Removed ^M BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | aliases with multi-table updates / deletesunknown2002-12-288-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for a bug with derived tables and query cache ix for a charset bug in timestamp mysql-test/r/multi_update.result: aliases with multi-table updates / deletes mysql-test/r/query_cache.result: fix for query cache with derived tables mysql-test/t/multi_update.test: aliases with multi-table updates / deletes mysql-test/t/outfile.test: Fix of bug with charset in timestamp mysql-test/t/query_cache.test: fix for a bug with derived tables and query cache sql/field.cc: fix for a charset bug in timestamp sql/sql_parse.cc: aliases with multi-table updates / deletes sql/sql_yacc.yy: aliases with multi-table updates / deletes
* | | | | merge fixesunknown2002-12-2638-121/+223
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/derived.result: Auto merged mysql-test/t/derived.test: Auto merged sql/sql_yacc.yy: Auto merged sql/item.cc: Fixes for merge ...
| * | | | added FROM DUAL for derived tablesunknown2002-12-263-0/+5
| | | | |
| * | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-12-261-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-send_error-4.1 sql/sql_select.cc: Auto merged
| | * \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-11-1490-476/+1891
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-4.1 sql/sql_select.cc: Auto merged
| | * | | | | fixed possible bug (call with incorrect parameters)unknown2002-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_select.cc: fixed possible bug
| * | | | | | Changed get_arg() so that it can be used to fetch more thanunknown2002-12-251-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just one argument from command line. Fixed a bug in interactive 'connect' command, which earlier couldn't take quoted arguments. How-to-repeat: mysql> connect `stupid db` localhost
| * | | | | | Merge work:/home/bk/mysql-4.1unknown2002-12-252-12/+32
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1
| | * \ \ \ \ \ Merge work:/home/bk/mysql-4.1unknown2002-12-242-12/+32
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1
| | | * | | | | | mysql multiline comment, by Sergey Gluhov.unknown2002-12-242-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | | | BDB logs deleting has been moved from start_master unknown2002-12-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the start of mysql-test-run
| * | | | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-2523-46/+46
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
| | * | | | | | | Fix messages in other languagesunknown2002-12-2422-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/share/czech/errmsg.txt: Chezh sql/share/danish/errmsg.txt: Danish sql/share/dutch/errmsg.txt: Dutch sql/share/estonian/errmsg.txt: Estonian sql/share/french/errmsg.txt: French sql/share/german/errmsg.txt: German sql/share/greek/errmsg.txt: Greek sql/share/hungarian/errmsg.txt: Hungarian sql/share/italian/errmsg.txt: Italian sql/share/japanese/errmsg.txt: Japanese sql/share/korean/errmsg.txt: Korean sql/share/norwegian-ny/errmsg.txt: Norwegian-ny sql/share/norwegian/errmsg.txt: Norwegian sql/share/polish/errmsg.txt: polish sql/share/portuguese/errmsg.txt: Portuguese sql/share/romanian/errmsg.txt: Romainian sql/share/russian/errmsg.txt: Russian sql/share/serbian/errmsg.txt: Serbian sql/share/slovak/errmsg.txt: Slovak sql/share/spanish/errmsg.txt: spanish sql/share/swedish/errmsg.txt: Swedish sql/share/ukrainian/errmsg.txt: Ukrainian
| | * | | | | | | Correct wrong error messagesunknown2002-12-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/share/english/errmsg.txt: Correct Error messages to match actual behavior
| * | | | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-247-32/+79
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
| | * | | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-238-42/+60
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
| | * | | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-204-8/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
| | * \ \ \ \ \ \ \ Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2002-12-207-32/+79
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
| | | * \ \ \ \ \ \ \ Merge mysql.r18.ru:/usr/home/ram/work/mysql-4.1unknown2002-12-207-32/+79
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb