mysql-test/r/rpl_events.result:
Now ON COMPLETION NOT PRESERVE events are also dropped on the
slave, since DROP EVENT command that is invoked for all such commands
gets invoked on the slave.
sql/event_data_objects.cc:
Fix the failing rpl_events test after the patch for Bug#27733.
At the time Events::drop_event got invoked inside
Event_job_data::execute() thd->query pointed to CREATE PROCEDURE
statement. This statement was written to the binary log
from inside Events::drop_event (under assumption that this is a
DROP EVENT statement that needs to be replicated), and caused
creation of this procedure on the slave (and a subsequent failure
when a procedure with the same name already exist).
The patch ensures that thd->query points at the right query text
for DROP EVENT executed when dropping ON COMPLETION NOT PRESERVE
events.
sql/event_data_objects.h:
Update a declaration.
sql/events.cc:
Change if () to an assert: thd->query now always points at a valid
query.
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
streamline the event worker thread work flow and try to eliminate
possibilities for memory corruptions that might have been
lurking in previous (complicated) code.
This patch:
* removes Event_job_data::compile that was never used
* cleans up Event_job_data::execute to minimize juggling with
thread context and eliminate unneded code paths
* Implements Security_context::change/restore_security_context
to be able to re-use these methods in all stored programs
This is to maybe fix Bug#27733 "Valgrind failures in
remove_table_from_cache".
Review comments applied.
sql/event_data_objects.cc:
Remove Event_job_data::compile, which was never used without
Event_job_data::execute().
Merge the implementation of compile() with Event_job_data::execute().
Reuse existing functions to prepare the event worker thread
for execution instead of some previously copy-pasted code.
Do not change and restore the current database inside
Event_job_data::execute(), just set the current database in the
thread, that is enough to parse and execute an event.
sql/event_data_objects.h:
Update declarations.
sql/event_scheduler.cc:
Allocate Event_job_data on stack.
sql/item_func.cc:
Update to match the new declaration of restore_security_context()
sql/sp_head.cc:
Update to match the new declaration of
change/restore_security_context()
sql/sql_class.cc:
Move change/restore_security_context to class Security_context.
Add more comments.
sql/sql_class.h:
Make change/restore_security_context methods of Security_context.
That allows us to reuse them in Event Scheduler (instead of a
copy-paste presently used there).
sql/sql_trigger.cc:
Update to match the new declaration of
change/restore_security_context()
done in previous patches.
There is an error in the Sun CC compiler that treats parameters that
differ in only qualifier as different, even though this is not
allowed by the standard (ISO/IEC 14882:2003, Section 13.1).
sql/log_event.cc:
Removing const qualifier since it causes linker error.
sql/log_event.h:
Restoring time_t instead of my_time_t since it causes warnings
elsewhere. Renaming parameters to functions since they hide
member variable (which causes warnings on Sun CC).
sql/rpl_record.cc:
Removing const qualifier since it causes linker error.
sql/rpl_rli.cc:
Restoring time_t instead of my_time_t since it causes warnings
elsewhere. Removing const qualifier since it causes linker error.
sql/rpl_rli.h:
Restoring time_t instead of my_time_t since it causes warnings
elsewhere. Removing const qualifier since it causes linker error.
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Manual merge
scripts/mysql_system_tables_data.sql:
Manual merge
Factoring out pack_row() and unpack_row() into new files
rpl_record.{cc,h}.
libmysqld/Makefile.am:
Adding file rpl_record.cc
sql/CMakeLists.txt:
Adding file rpl_record.cc
sql/Makefile.am:
Adding file rpl_record.cc and rpl_record.h
sql/log_event.cc:
Moving implementation of unpack_row() into "rpl_record.cc".
Adding inclusion of header file "rpl_record.h".
sql/log_event_old.cc:
Signature of do_prepare_row() changed.
sql/log_event_old.h:
Adding copyright.
sql/rpl_record_old.cc:
Signature of do_prepare_row() changed.
sql/rpl_record_old.h:
Adding copyright.
Signature of do_prepare_row() changed.
sql/sql_class.cc:
Moving implementation THD::pack_row() into "rpl_record.cc" and rewriting
it to be a global function.
Adding inclusion of header file "rpl_record.h".
sql/sql_class.h:
Removing pack_row() as THD member function.
sql/rpl_record.cc:
New BitKeeper file ``sql/rpl_record.cc''
sql/rpl_record.h:
New BitKeeper file ``sql/rpl_record.h''
configuration with HAVE_REPLICATION undefined, which causes the
*_rows_log_event_old classes to only have a default constructor. This
generates an error on some platforms, since the base classes does
not have a default constructor defined.
Updating signatures of do_prepare_row() for classes above, since
signatures in base classes changed.
sql/log_event_old.h:
Adding constructor since when HAVE_REPLICATION is not defined, the
class will not have any constructor, which generates an error on
some platforms. Updating signature of do_prepare_row() since
signature changed in base classes.
sql/rpl_rli.cc:
Changing signature for stmt_done() to use my_time_t instead of time_t.
sql/rpl_rli.h:
Changing signature for stmt_done() to use my_time_t instead of time_t.
Changing last_master_timestamp to use my_time_t instead of time_t.
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/my_malloc.c:
Auto merged
mysys/my_static.c:
Auto merged
mysys/safemalloc.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
mysql-test/r/grant.result:
Merged from 5.0
sql/sql_db.cc:
Merged from 5.0
sql/sql_parse.cc:
Merged from 5.0
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
heap/hp_write.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/table.cc:
Auto merged
into mysql.com:/home/bar/mysql-5.1-new-rpl
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/field_conv.cc:
Auto merged
Problem: single byte do_varstring1() function was called, which didn't
check limit on "number of character", and checked only "number of bytes".
Fix: adding a multi-byte aware function do_varstring1_mb(),
to limit on "number of characters"
mysql-test/r/ctype_utf8.result:
Adding test case
mysql-test/t/ctype_utf8.test:
Adding test case
sql/field_conv.cc:
Adding missing function to copy VARCHAR strings
having one length byte.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/tools/restore/Restore.hpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
mysql-test/r/ndb_restore.result:
manual merge
mysql-test/t/ndb_restore.test:
manual merge
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
include/errmsg.h:
Added more descriptive error message of why statement was automaticly dropped
libmysql/client_settings.h:
Added more descriptive error message of why statement was automaticly dropped
libmysql/errmsg.c:
Added more descriptive error message of why statement was automaticly dropped
libmysql/libmysql.c:
Added more descriptive error message of why statement was automaticly dropped
sql-common/client.c:
Added more descriptive error message of why statement was automaticly dropped
sql/net_serv.cc:
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
sql/sql_class.cc:
We need to set killed to NOT_KILLED after cleanup() if we want to continue using THD
(If not, the connection will be closed after the current stmt)
sql/sql_parse.cc:
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
tests/mysql_client_test.c:
More DBUG information
Better usage of --silent
Always print 'OK' the same way.
Disable test_bug17667 if run outside of mysql-test-run
Fix for when memory pre-allocation fails.
mysys/my_alloc.c:
Added code to null-out the pre-alloc pointer if allocation fails. This is necessary for the next time this procedure is called.
mysql-test/r/variables-big.result:
Added "big" test for bug fix Bug #27322.
mysql-test/t/variables-big.test:
Added "big" test for bug fix Bug #27322.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
