into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
mysql-test/r/sp-error.result:
failed auto merge
mysql-test/r/sp.result:
failed auto merge
mysql-test/r/udf.result:
failed auto merge
mysql-test/t/sp.test:
failed auto merge
sql/sp_head.cc:
failed auto merge
sql/sql_yacc.yy:
failed auto merge
test programs.
mysql-test/r/query_cache.result:
Reset query cache parameters to prevent dependency between test programs.
mysql-test/t/query_cache.test:
Reset query cache parameters to prevent dependency between test programs.
The problem is that currently there is no way to test the behavior
of the mysql_change_user() function using the mysqltest suite because
there is no internal command for it.
The solution is to introduce a change_user command that can be used
to test aspects of the MySQL client function mysql_change_user().
client/mysqltest.c:
Add change_user command to mysqltest.
mysql-test/r/mysqltest.result:
Add test case result for change_user command
mysql-test/t/mysqltest.test:
Add test case for change_user command
mysql-test/r/change_user.result:
Add new file with test case results for bugs 20023 and 31418.
mysql-test/t/change_user.test:
Add new file with test cases for bugs 20023 and 31418.
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
myisam/sort.c:
Auto merged
mysql-test/r/repair.result:
Auto merged
mysql-test/t/repair.test:
Auto merged
The embedded version of the server doesn't use column level grants, and
the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
the redundant HAVE_QUERY_CACHE (which is always the case) to determine if
column level grants should be compiled or not.
mysql-test/r/query_cache.result:
Updated result file
mysql-test/r/query_cache_notembedded.result:
Updated result file
mysql-test/t/query_cache.test:
Moved test with GRANT to query_cache_notembedded test.
mysql-test/t/query_cache_notembedded.test:
Moved test with GRANT to query_cache_notembedded test.
sql/sql_cache.cc:
Changed the conditional compilation directive to only compile column level grant
checks if NO_EMBEDDED_ACCESS_CHECKS isn't defined.
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
The root cause of the issue was that the CREATE FUNCTION grammar,
for User Defined Functions, was using the sp_name rule.
The sp_name rule is intended for fully qualified stored procedure names,
like either ident.ident, or just ident but with a default database
implicitly selected.
A UDF does not have a fully qualified name, only a name (ident), and should
not use the sp_name grammar fragment during parsing.
The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
- creating UDF (no definer, can have AGGREGATE, simple ident)
- creating Stored Functions (definer, no AGGREGATE, fully qualified name)
With the test case provided, another issue was exposed which is also fixed:
the DROP FUNCTION statement was using sp_name and also failing when no database
is implicitly selected, when droping UDF functions.
The fix is also to change the grammar so that DROP FUNCTION works with
both the ident.ident syntax (to drop a stored function), or just the ident
syntax (to drop either a UDF or a Stored Function, in the current database)
mysql-test/r/sp-error.result:
Adjust test results
mysql-test/r/udf.result:
Adjust test results
mysql-test/t/sp-error.test:
Adjust test results
mysql-test/t/udf.test:
Adjust test results
sql/sql_parse.cc:
CREATE UDF FUNCTION does not use a fully qualified name.
sql/sql_yacc.yy:
Fix grammar for CREATE / DROP FUNCTION, FOR udf
Improve error messages for select no_such_function()
as it may well happen with 32- vs 64-bit Linux systems.
This patch was proposed immediately with the report of
Bug #29658 wrong test for static nss checking on linux, doesn't cover all platforms
On Windows the debug log was doing freopen () instead of
fflush() and that was slowing the logging down that much
that some tests timed out.
Fixed by replacing the freopen() with an syncing-to-disk
flag to fopen() and fflush().
Also increased the timeout of the tests running with --debug
on windows : seems to slow down as much as valgrind on linux.
dbug/dbug.c:
Bug #27099: remove the freopen() for the
windows log : too slow. Replace it with the "c" option
for fopen().
mysql-test/mysql-test-run.pl:
Bug #27099: on windows debug log seems to slow the tests
down about as much as valgrind does on linux.
Bug#31169 Test case does not check whether configuration contains feature tested
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Add check for partitioning feature.
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
Add check for partitioning feature.
issue an error if string has illegal characters
mysql-test/r/ctype_utf8.result:
issue an error if string has illegal characters
mysql-test/t/ctype_utf8.test:
issue an error if string has illegal characters
sql/item.cc:
issue an error if string has illegal characters
sql/item.h:
issue an error if string has illegal characters
sql/sql_yacc.yy:
issue an error if string has illegal characters
of the stored procedure cursors (materialized on disk).
include/mysql_com.h:
Remove an unused variable.
sql/protocol.cc:
net->no_send_eof was not used anywhere.
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
libmysql/libmysql.c:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
if remote server sends malicious response.
We need to check if the SHOW TABLE STATUS query we issue inside the
FEDERATED engine returned the result with the proper (or just sufficient)
number of rows. Otherwise statements like row[12] can crash the server.
sql/ha_federated.cc:
bug #29801 Federated engine crashes local server
if remote server sends malicious response.
Return with the error if the remote server return fewer rows than we need.
into mysql.com:/home/ram/work/b31154/b31154.5.1
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
into mysql.com:/home/ram/work/b30885/b30885.5.1
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
storage/heap/hp_hash.c:
the code was changed to use bitmaps instead of key length, so ul
into magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt
mysql-test/r/func_group.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog~8457b43736642c:
Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
Auto merged
