Remove unused and obsolete mgmapi functionality (that did nothing anyway).
storage/ndb/include/mgmapi/mgmapi.h:
remove dead internal ndb_mgm_get_stat_port function.
storage/ndb/src/mgmapi/mgmapi.cpp:
remove ndb_mgm_get_stat_port
was only marked for internal use.
dead (in 5.0 as well, only removed in 5.1 for safety)
storage/ndb/src/mgmsrv/Services.cpp:
remove dead 'get statport'
storage/ndb/src/mgmsrv/Services.hpp:
remove dead getStatPort
sql/event_scheduler.cc:
remove unused variables
fix win32 build problem - pthread_mutex_lock() is void there
sql/event_scheduler.h:
pthread_mutex_lock() is void on win32. This fixes the win32 build.
sql/event_timed.cc:
remove unused code & variables
libmysqld/Makefile.am:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/events_logs_tests.result:
Auto merged
mysql-test/r/events_microsec.result:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/events_stress.result:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
- Scheduler is either initialized at server start or never.
Starting & stopping is now suspending & resuming.
- The scheduler has clear OO interface
- Now all calls to the scheduler are synchronous
- GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
- External API is encapsulated into class Events
- Includes fixes for all comments of Kostja's review of 19.05.2005
Starting to merge into 5.1-release (5.1.10) and push
BitKeeper/etc/ignore:
Added libmysqld/event_scheduler.cc to the ignore list
libmysqld/Makefile.am:
executor -> scheduler
mysql-test/r/events.result:
update result
mysql-test/r/events_bugs.result:
update result
mysql-test/r/events_logs_tests.result:
update result
mysql-test/r/events_microsec.result:
update result
mysql-test/r/events_scheduling.result:
update result
mysql-test/r/events_stress.result:
update result
mysql-test/t/disabled.def:
enable these tests
mysql-test/t/events.test:
optimize the test a bit for speed, save some seconds runtime
remove FULL from SHOW EVENTS
mostly use I_S.EVENTS
mysql-test/t/events_bugs.test:
Skip irrelevant for the current design tests - all events are loaded
on server startup. Change in mysql.event will be visible on next server start.
Don't use numeric error codes.
mysql-test/t/events_logs_tests.test:
optimize the test a bit for speed
mysql-test/t/events_microsec.test:
Skip irrelevant for the current design tests - all events are loaded
on server startup. Change in mysql.event will be visible on next server start.
Don't use numeric error codes.
mysql-test/t/events_scheduling.test:
broader test
mysql-test/t/events_stress.test:
Rework the test to the new architecture of suspending/resuming.
Use less events, no need for thousands, hundreds is still ok.
sql/Makefile.am:
executor -> scheduler
sql/cmakelists.txt:
executor -> scheduler
sql/event.cc:
- remove todo comments
- remove unneded evex_queue abstraction functions
- move events_init() and events_shutdown() from event_executor.cc to here
- export db_create_event
- remove evex_load_and_compile_event, part of class Event_scheduler
- integrate the public interface found in event.h and used by sql_parse.cc
to use the new class Event_scheduler.
sql/event.h:
- add COND_finished so if one thread kills a running event it waits on this
- export callback event_timed_definer_equal, event_timed_identifier_equal(),
event_timed_name_equal and event_timed_db_equal()
to be used by Event_scheduler::drop_matching_events()
- cleanup event.h
- encapsulated all external interface into class Events
sql/event_executor.cc:
make it empty, will delete after that
sql/event_priv.h:
- more things in the private header
- remove event queue abstraction functions. tightly bind to QUEUE
- export privately db_drop_event, db_find_event, db_create_event()
- made change_security_context() and restore_security_context() free functions
sql/event_timed.cc:
- fix calculation of time when ENDS is set (STARTS is always set)
- during Event_timed::compile() set the right Security_ctx. Prevents a crash
during Event_scheduler::load_events_from_db()
- add Event_timed::kill_thread()
- implement event_timed_*_equal()
- made change_security_context() and restore_security_context() free functions.
- Comments cleanups
sql/lex.h:
new word scheduler for SHOW SCHEDULER STATUS (available only debug builds)
sql/log.cc:
move these from event_scheduler.cc
sql/mysql_priv.h:
refactor kill_one_thread
export sql_print_message_func and sql_print_message_handlers
sql/mysqld.cc:
In close_connections, called by kill_server() skip the main scheduler
thread and use events_shutdown() for shutting down the scheduler, in the same
manner it's done for RPL.
Add a new value to --event-scheduler :
0 <- No scheduler available
1 <- Start with scheduler enabled
2 <- Start with scheduler suspended
sql/repl_failsafe.cc:
refactor thd::system_thread to be an enum
sql/set_var.cc:
move sys_var_event_executor::update() to set_var.cc
executor -> scheduler
use thd::sys_var_tmp
sql/set_var.h:
executor -> scheduler
sql/share/errmsg.txt:
3 new error messages
sql/sql_class.cc:
refactor thd::system_thread to be an enum . more type-safety
sql/sql_class.h:
refactor thd::system_thread to be an enum . more type-safety
sql/sql_db.cc:
get the error from evex_drop_schema_events
sql/sql_error.h:
export warning_level_names
sql/sql_lex.h:
new command SHOW SCHEDULER STATUS, available only in debug build and
for debug purposes.
sql/sql_parse.cc:
refactor kill_one_thread() -> does the *dirty* work, and sql_kill
just the reporting.
add handler for SQLCOM_SHOW_SCHEDULER_STATUS
sql/sql_show.cc:
fix verbosity handling (this will be obsoleted anyway by the fix for 17394).
sql/sql_yacc.yy:
remove FULL from SHOW EVENTS
add SHOW SCHEDULER STATUS in debug builds
sql/table.cc:
Fix valgrind warning.
Moved the InnoDB related test from func_group.test to innodb_mysql.test
mysql-test/r/func_group.result:
Moved a test to innodb_mysql
mysql-test/r/innodb_mysql.result:
moved a test to innodb_mysql
mysql-test/t/func_group.test:
Moved a test to innodb_mysql
mysql-test/t/innodb_mysql.test:
Moved a test to innodb_mysql
into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
server-tools/instance-manager/instance_options.cc:
Manually merged.
server-tools/instance-manager/instance_options.h:
Manually merged.
server-tools/instance-manager/manager.cc:
Manually merged.
server-tools/instance-manager/manager.h:
Manually merged.
server-tools/instance-manager/options.cc:
Manually merged.
server-tools/instance-manager/options.h:
Manually merged.
into mysql.com:/space/pekka/ndb/version/my51
mysql-test/r/ndb_blob.result:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
use local
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
use local
mysql-test/r/ndb_blob.result:
bug#19956 : var* pk
mysql-test/t/ndb_blob.test:
bug#19956 : var* pk
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
bug#19956 - check var* length bytes and zero rest of value if any blob attribute
ndb/src/ndbapi/NdbOperationSearch.cpp:
bug#19956 - check var* length bytes and zero rest of value if any blob attribute
Specify yaSSL .a file, not .la (bug#19966)
Don't use Mac OS X "__.SYMDEF SORTED" file in archives
libmysqld/Makefile.am:
Specify yaSSL .a file, not .la (bug#19966)
Don't use Mac OS X "__.SYMDEF SORTED" file in archives
Change mode to -rw-rw-r--
mysql-test/r/archive_bitfield.result:
Change mode to -rw-rw-r--
mysql-test/r/binlog_row_binlog.result:
Change mode to -rw-rw-r--
mysql-test/r/ctype_cp932_binlog_row.result:
Change mode to -rw-rw-r--
mysql-test/r/events.result:
Change mode to -rw-rw-r--
mysql-test/r/events_bugs.result:
Change mode to -rw-rw-r--
mysql-test/r/events_logs_tests.result:
Change mode to -rw-rw-r--
mysql-test/r/events_microsec.result:
Change mode to -rw-rw-r--
mysql-test/r/events_stress.result:
Change mode to -rw-rw-r--
mysql-test/r/federated_transactions.result:
Change mode to -rw-rw-r--
mysql-test/r/myisam-system.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_config2.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_dd_ddl.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_dd_disk2memory.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_insert_id_pk.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_2innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_2myisam.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_blob.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_blob2.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_charset.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_dd_advance.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_func003.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_log.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_multi_update2.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_multi_update3.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_relayrotate.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_row_001.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_sp006.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_UUID.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_trig004.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_relay_space_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_blob_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_blob_myisam.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_log_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_mysqlbinlog.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_stm_EE_err2.result:
Change mode to -rw-rw-r--
mysql-test/r/type_newdecimal-big.result:
Change mode to -rw-rw-r--
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/events_logs_tests-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/rpl_ndb_commit_afterflush.test:
Change mode to -rw-rw-r--
mysql-test/t/rpl_ndb_insert_ignore.test:
Change mode to -rw-rw-r--
plugin/fulltext/AUTHORS:
Change mode to -rw-rw-r--
plugin/fulltext/ChangeLog:
Change mode to -rw-rw-r--
plugin/fulltext/NEWS:
Change mode to -rw-rw-r--
plugin/fulltext/README:
Change mode to -rw-rw-r--
plugin/fulltext/configure.in:
Change mode to -rw-rw-r--
storage/archive/plug.in:
Change mode to -rw-rw-r--
storage/example/plug.in:
Change mode to -rw-rw-r--
into mysql.com:/home/jimw/my/mysql-5.1-clean
include/my_pthread.h:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
Auto merged
sql/set_var.cc:
Resolve conflict
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Resolve conflict
- record structure wrongly deallocated during online alter on remote mysqld
- change so that ndb handler allocates the buffer itself, so it can be reused after alter
