~drizzle-trunk/drizzle/development

Viewing changes to drizzled/plugin/event_observer.cc

Committer: Lee Bieber
Date: 2011-03-01 01:51:22 UTC
mfrom: (2209.1.3 build)
Revision ID: kalebral@gmail.com-20110301015122-jse47000xs6xp062

Merge Patrick - 726914: Need to update dbqp randgen config files for slave_plugin
Merge Olaf - fix EOL
Merge Patrick - 725236: randgen transaction log tests need to be implemented using dbqp / randgen

files added:
tests/randgen_tests/slave_plugin/multi_thread1.cnf

tests/randgen_tests/slave_plugin/multi_thread1_mix.cnf

tests/randgen_tests/slave_plugin/multi_thread2.cnf

tests/randgen_tests/slave_plugin/multi_thread2_mix.cnf

tests/randgen_tests/slave_plugin/multi_thread3.cnf

tests/randgen_tests/slave_plugin/multi_thread3_mix.cnf

tests/randgen_tests/slave_plugin/single_thread3.cnf

tests/randgen_tests/slave_plugin/trx_ordering.cnf

files renamed:
tests/randgen_tests/innodb_trx_log/multi_thread1.disabled => tests/randgen_tests/innodb_trx_log/multi_thread1.cnf

tests/randgen_tests/innodb_trx_log/multi_thread1_mix.disabled => tests/randgen_tests/innodb_trx_log/multi_thread1_mix.cnf

tests/randgen_tests/innodb_trx_log/multi_thread2.disabled => tests/randgen_tests/innodb_trx_log/multi_thread2.cnf

tests/randgen_tests/innodb_trx_log/multi_thread2_mix.disabled => tests/randgen_tests/innodb_trx_log/multi_thread2_mix.cnf

tests/randgen_tests/innodb_trx_log/multi_thread3.disabled => tests/randgen_tests/innodb_trx_log/multi_thread3.cnf

tests/randgen_tests/innodb_trx_log/multi_thread3_mix.disabled => tests/randgen_tests/innodb_trx_log/multi_thread3_mix.cnf

tests/randgen_tests/innodb_trx_log/single_thread3.disabled => tests/randgen_tests/innodb_trx_log/single_thread3.cnf

tests/randgen_tests/innodb_trx_log/trx_ordering.disabled => tests/randgen_tests/innodb_trx_log/trx_ordering.cnf

tests/randgen_tests/trx_log/multi_thread1.disabled => tests/randgen_tests/trx_log/multi_thread1.cnf

tests/randgen_tests/trx_log/multi_thread1_mix.disabled => tests/randgen_tests/trx_log/multi_thread1_mix.cnf

tests/randgen_tests/trx_log/multi_thread2.disabled => tests/randgen_tests/trx_log/multi_thread2.cnf

tests/randgen_tests/trx_log/multi_thread2_mix.disabled => tests/randgen_tests/trx_log/multi_thread2_mix.cnf

tests/randgen_tests/trx_log/multi_thread3.disabled => tests/randgen_tests/trx_log/multi_thread3.cnf

tests/randgen_tests/trx_log/multi_thread3_mix.disabled => tests/randgen_tests/trx_log/multi_thread3_mix.cnf

tests/randgen_tests/trx_log/single_thread3.disabled => tests/randgen_tests/trx_log/single_thread3.cnf

tests/randgen_tests/trx_log/trx_ordering.disabled => tests/randgen_tests/trx_log/trx_ordering.cnf

files modified:
client/drizzletest.cc

drizzled/cached_directory.cc

drizzled/error.cc

drizzled/plugin/event_observer.cc

drizzled/plugin/function.cc

drizzled/plugin/table_function.h

drizzled/session.h

drizzled/session/table_messages.cc

drizzled/sql_base.cc

drizzled/sql_table.cc

drizzled/sys_var.cc

drizzled/table_function_container.cc

plugin/show_dictionary/show.h

plugin/show_dictionary/show_columns.h

tests/lib/randgen/randgen_test_execution.py

tests/lib/test_mgmt/test_execution.py

tests/randgen_tests/slave_plugin/slave_plugin.cnf

Show diffs side-by-side

added added

removed removed

drizzled/plugin/event_observer.cc

127

/* If positioned then check if the position is already taken. */

128

if (position)

129

{

130

if (observers->find(event_pos) != observers->end())

130

if (observers->count(event_pos))

131

{

132

errmsg_printf(error::WARN,

133

_("EventObserverList::addEventObserver() Duplicate event position %d for event '%s' from EventObserver plugin '%s'"),

Older »