into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
into magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt
include/mysql_com.h:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/udf_example.c:
Auto merged
There's currently no way of knowing the determinicity of an UDF.
And the optimizer and the sequence() UDFs were making wrong
assumptions about what the is_const member means.
Plus there was no implementation of update_system_tables()
causing the optimizer to overwrite the information returned by
the <udf>_init function.
Fixed by equating the assumptions about the semantics of
is_const and providing a implementation of update_used_tables().
Added a TODO item for the UDF API change needed to make a better
implementation.
include/mysql_com.h:
Bug #30355: comment added
mysql-test/r/udf.result:
Bug #30355: test case
mysql-test/t/udf.test:
Bug #30355: test case
sql/item_func.cc:
Bug #30355: keep const_item_cache and used_tables_cache in sync
sql/item_func.h:
Bug #30355:
- a better implementation of update_used_tables()
- keep const_item_cache and used_tables_cache in sync
sql/udf_example.c:
Bug #30355: Wrong value for const_item fixed.
mysql-test/suite/ndb/t/disabled.def:
Disabling failing tests.
mysql-test/suite/rpl/t/disabled.def:
Disabling failing tests.
mysql-test/suite/rpl/t/rpl_ssl.test:
Disabling part of test that fails.
Some test cases were missing preparation to deal with failed
predecessor test cases.
Added preparation (drop table if exists) to some test cases.
mysql-test/include/innodb_rollback_on_timeout.inc:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Added preparation (drop table if exists).
mysql-test/r/innodb-semi-consistent.result:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Fixed test result.
mysql-test/r/innodb-ucs2.result:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Fixed test result.
mysql-test/r/innodb_mysql.result:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Fixed test result.
mysql-test/r/innodb_timeout_rollback.result:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Fixed test result.
mysql-test/t/innodb-semi-consistent.test:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Added preparation (drop table if exists).
mysql-test/t/innodb-ucs2.test:
Bug#32754 - InnoDB tests do not prepare or clean up correctly
Added preparation (drop table if exists).
Problem: passing a non-constant name to the NAME_CONST function results in a crash.
Fix: check the NAME_CONST name argument; return fake item type if we got
non-constant argument(s).
mysql-test/r/func_misc.result:
Fix for bug #32559: connection hangs on query with name_const
- test result.
mysql-test/t/func_misc.test:
Fix for bug #32559: connection hangs on query with name_const
- test case.
sql/item.cc:
Fix for bug #32559: connection hangs on query with name_const
- Item_name_const::type() now returns NULL_ITEM if non-constant arguments
were used to create the item to avoid wrong type casting.
sql/item.h:
Fix for bug #32559: connection hangs on query with name_const
- NAME_CONST name argument checked for invariability.
into hh-nb.hhunger:/work/merge/mysql-5.1-32496
BitKeeper/etc/ignore:
auto-union
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
used ul
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/r/subselect.result:
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/r/subselect_notembedded.result:
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/t/subselect.test:
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/t/subselect_notembedded.test:
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
- Additional patch to fix compiler warnings
client/mysql.cc:
Initialize warnings to 0 to avid compiler warning
Call 'print_warnings' also when error occured
mysql-test/r/mysql.result:
Change test to make is possible to see that second set of warnings
are from second invocation of mysql
mysql-test/t/mysql.test:
Change test to make is possible to see that second set of warnings
are from second invocation of mysql
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
manual merge
Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
This caused the server to crash on any attempt to store new grants because
of uninitialized structures.
This patch breaks up the grant loading function into two phases to allow
for procs_priv table to fail with an warning instead of crashing the server.
mysql-test/r/grant.result:
Test case
mysql-test/t/grant.test:
Test case making sure that FLUSH PRIVILEGES doesn't crash the server if
procs_priv is removed.
sql/sql_acl.cc:
- Refactored grant_reload into two phases: 1. open and lock tables_priv and
columns_priv tables, read the data, close tables. 2. open and lock
procs_priv, read data, close table. Since the tables are independant of
each other there will be no race conditions and it will be possible to
handle situations where the procs_priv table isn't present.
- Refactored the helper function grant_load into new grant_load (without
procs_priv table) and grant_load_procs_priv.
sql/sql_parse.cc:
- Changed comment style to doxygen style.
self-join
When doing DELETE with self-join on a MyISAM or MERGE table, it could
happen that a record being retrieved in join_read_next_same() has
already been deleted by previous iterations. That caused the engine's
index_next_same() method to fail with HA_ERR_RECORD_DELETED error and
the whole DELETE query to be aborted with an error.
Fixed by suppressing the HA_ERR_RECORD_DELETED error in
hy_myisam::index_next_same() and ha_myisammrg::index_next_same(). Since
HA_ERR_RECORD_DELETED can only be returned by MyISAM, there is no point
in filtering this error in the SQL layer.
mysql-test/r/merge.result:
Added a test case for bug #28837.
mysql-test/r/myisam.result:
Added a test case for bug #28837.
mysql-test/t/merge.test:
Added a test case for bug #28837.
mysql-test/t/myisam.test:
Added a test case for bug #28837.
sql/ha_myisam.cc:
Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().
sql/ha_myisammrg.cc:
Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().
into magare.gmz:/home/kgeorge/mysql/autopush/B32036-5.0-opt
mysql-test/r/subselect.result:
merge of fix for bug 32036 to 5.0-opt
mysql-test/t/subselect.test:
merge of fix for bug 32036 to 5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B32036-5.1-opt
mysql-test/r/subselect.result:
merged fix for bug 32036 to 5.1-opt
mysql-test/t/subselect.test:
merged fix for bug 32036 to 5.1-opt
sql/sql_yacc.yy:
merged fix for bug 32036 to 5.1-opt
crashes MySQL 5.122
There was a difference in how UNIONs are handled
on top level and when in sub-query.
Because the rules for sub-queries were syntactically
allowing cases that are not currently supported by
the server we had crashes (this bug) or wrong results
(bug 32051).
Fixed by making the syntax rules for UNIONs match the
ones at top level.
These rules however do not support nesting UNIONs, e.g.
(SELECT a FROM t1 UNION ALL SELECT b FROM t2)
UNION
(SELECT c FROM t3 UNION ALL SELECT d FROM t4)
Supports for statements with nested UNIONs will be
added in a future version.
mysql-test/r/subselect.result:
Bug #32036: test case
mysql-test/t/subselect.test:
Bug #32036: test case
sql/sql_yacc.yy:
Bug #32036: Make the syntax rules for UNIONs in subqueries the same
as for top level UNIONs.
