There was an incomplete reset of the name resolution context, that caused
INSERT ... SELECT ... JOIN statements to resolve not by joint row type calculated
for the join.
Removed the redundant re-initialization of the context, because
mysql_insert_select_prepare() now correctly saves/restores the context.
mysql-test/r/insert_select.result:
Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
- testsuite for the bug
mysql-test/t/insert_select.test:
Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
- testsuite for the bug
sql/sql_parse.cc:
Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
- remove an incomplete reset of the context because the mentioned function
correctly saves/restores the context.
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
Avoid error message for target 'distclean' and no Makefile
BUILD/compile-dist:
Avoid error message for target 'distclean' and no Makefile
ndb/Makefile.am:
Avoid error message trying 'windoze-dsp' in obsolete directory
Make output less verbose
Make temporary directory name unique
Remove temporary directory on interrupt
scripts/make_win_src_distribution.sh:
Make output less verbose
Make temporary directory name unique
Remove temporary directory on interrupt
Include "sql_yacc.yy" for completeness (bug#20387)
scripts/make_win_src_distribution.sh:
Include "sql_yacc.yy" for completeness (bug#20387)
Improved error handling
Don't list all files packed with tar/zip unless debugging
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/archive.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/archive.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Changes for Netware
sql/net_serv.cc:
Netware needs <sys/select.h>
configure.in:
Call of "comp_err" has moved, changed code for Netware that
edits make files to reflect this
netware/BUILD/compile-netware-END:
After correcting "configure.in" to edit make files correctly,
removed obsolete "sed" of "extra/Makefile.am" for Netware
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/r/cast.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
configure.in:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.
sql/item_cmpfunc.cc:
Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.
sql/item_strfunc.cc:
Fix for bug#16716 for --ps-protocol mode.
mysql-test/mysql-test-run.pl:
Make --valgrind-all a synonym for --valgrind.
Set "-v --show-reachable=yes" as our default valgrind options.
Make --valgrind-options override the default options
Update usage.
Turn on valgrinding also when user specified --valgrind-path or --valgrind-options without --valgrind
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/ctype_sjis.result:
Auto merged
mysql-test/t/ctype_sjis.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
into rurik.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/t/func_group.test:
Auto merged
sql/field.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
mysql-test/r/func_group.result:
SCCS merged
resulted in a wrong error message.
The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.
Now the nest_level counter is decremented by 1 for any union part.
mysql-test/t/union.test:
Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
resulted in a wrong error message.
mysql-test/r/union.result:
Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
resulted in a wrong error message.
sql/sql_yacc.yy:
Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
resulted in a wrong error message.
Now the nest_level counter is decremented by 1 for any union part.
into mysql.com:/usr/home/ram/work/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/archive.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
ul
sql/ha_archive.cc:
ul
sql/item_func.cc:
ul
mysql-test/r/type_newdecimal.result:
Fix for bug#19667 group by a decimal expression yields wrong result
test case
mysql-test/t/type_newdecimal.test:
Fix for bug#19667 group by a decimal expression yields wrong result
test case
After merge fix
mysql-test/r/func_time.result:
After merge fix
mysql-test/r/func_concat.result:
After merge fix
mysql-test/r/cast.result:
After merge fix
sql/item_cmpfunc.h:
After merge fix
sql/item_cmpfunc.cc:
After merge fix
sql/field.cc:
After merge fix
