into mysql.com:/home/pz/mysql/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
reordered Item_row class variables to be sorted by memory size
mysql-test/r/subselect.result:
fix result of subselect test
sql/item.cc:
postreviews fix
sql/item.h:
postreviews fix
sql/item_cmpfunc.h:
postreviews fix
sql/item_row.cc:
postreviews fix
sql/item_row.h:
reordered class variables to be sorted by memory size
postreviews fix
sql/item_strfunc.cc:
postreviews fix
sql/item_subselect.cc:
postreviews fix
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
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
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
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
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
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
Add optional second parameter to password() function. It can be used to force password()
to return fixed values.
mysql-test/r/func_crypt.result:
New test results
mysql-test/t/func_crypt.test:
new tests
sql/item_strfunc.cc:
Add optional second argument to password() function
sql/item_strfunc.h:
New method
sql/sql_yacc.yy:
Handling of password with 2 arguments
new format SCRUM
include/mysqld_error.h:
Add new error message
sql/share/czech/errmsg.txt:
czech
sql/share/danish/errmsg.txt:
danish
sql/share/dutch/errmsg.txt:
dutch
sql/share/english/errmsg.txt:
New Error message for in case old client connects new server and new auth is to be used
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:
japaneese
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:
romanian
sql/share/russian/errmsg.txt:
russian
sql/share/serbian/errmsg.txt:
se
sql/share/slovak/errmsg.txt:
slovak
sql/share/spanish/errmsg.txt:
spanish
sql/share/swedish/errmsg.txt:
swedish
sql/share/ukrainian/errmsg.txt:
ukrainian
sql/sql_parse.cc:
Add proper error message if old clients can't authenticate due to unsupported protocol
SCRUM
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
mysql-test/r/update.result:
Test for update with subselect and derived table ...
mysql-test/t/update.test:
Test for update with subselect and derived table ...
sql/sql_union.cc:
Fix for usage of ORDER BY ... and / or LIMIT .... without braces
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
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
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
I still have to make a test case for :
UPDATE from sub-select with derived table
mysql-test/r/multi_update.result:
Test for found rows in multi-table update
mysql-test/r/subselect.result:
Fix for new syntax for UNION's
mysql-test/t/multi_update.test:
Test for found rows in multi-table update
mysql-test/t/subselect.test:
Fix for new syntax for UNION's
sql/sql_cache.cc:
Fix for a bug that involved derived table in sub-select in UPDATE or
DELETE statement
sql/sql_derived.cc:
Fix for a bug that involved derived table in sub-select in UPDATE or
DELETE statement
sql/sql_parse.cc:
Fix for a bug that involved derived table in sub-select in UPDATE or
DELETE statement
sql/sql_show.cc:
Fix for th eshow of replication status
sql/sql_yacc.yy:
Three fixes.
One for not allowing mixing of braces and non-braces in UNION's
Second one for table aliases in multi-table deletes / updates
Third one for using derived tables within sub-selects for
UPDATE / DELETE commands
