Commit graph

45238 commits

Author SHA1 Message Date
unknown
a005dfb6c6 Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-runtime


sql/parse_file.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
2007-04-06 21:18:25 +04:00
unknown
52b86a6e0a Polishing: note added. 2007-04-06 20:21:30 +04:00
unknown
c557623a68 Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST.
This will hopefully fix events.test failure on vmware-win32, 
where scheduling is very primitive.


mysql-test/t/events_scheduling.test:
  This test case has no races now and can be enabled under valgrind.
sql/event_scheduler.cc:
  Make Event Scheduler thread shutdown more synchronous: report
  successful shutdown only after having removed the scheduler
  thread from the global list of threads.
  This ensures that after the scheduler has been stopped, its
  thread is not present in SHOW PROCESSLIST output.
2007-04-06 19:44:14 +04:00
unknown
9bc5135f81 Polishing: add comments.
sql/parse_file.cc:
  Add comments.
2007-04-06 18:56:39 +04:00
unknown
0507590a51 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 13:55:20 +02:00
unknown
5896976dea Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-runtime
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/r/information_schema.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-04-06 13:53:05 +02:00
unknown
e739ca8743 merging fix
mysql-test/r/type_set.result:
  result fixed
2007-04-06 16:06:10 +05:00
unknown
306be7fee9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  vajra.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual resolve.
mysql-test/t/openssl_1.test:
  Manual resolve.
2007-04-06 14:15:29 +04:00
unknown
3bed20c39c Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-06 12:45:07 +05:00
unknown
93e7a47082 Fix events.test failure on manu pushbuild hosts (5.1-runtime).
sql/event_db_repository.cc:
  Fix events.test failure on many pushbuild hosts (5.1-runtime).
  Make sure that when reading mysql.event the key number matches
  the field number that we're using to read by key.
  Also, print an error in case of a handler error (to not return 
  'Unknown error' when a table is corrupted to the user).
2007-04-06 02:57:38 +04:00
unknown
a06ff97656 A fix for events_trans.test failure on many hosts (5.1-runtime)
sql/event_data_objects.cc:
  Disable an event if its data in the table is corrupted.
sql/events.cc:
  A fix for events_trans failure on most of the hosts.
  A better error message if the event table is old
  (don't suggest it's corrupted, it may simply have bad data).
2007-04-06 01:53:15 +04:00
unknown
dd0c20ac28 3d attempt to fix information_schema.test failure on HP-UX.
Apparently it's the only platform in pushbuild where we 
compile without openssl.


mysql-test/r/information_schema.result:
  Update results.
mysql-test/r/openssl_1.result:
  Update results.
mysql-test/t/information_schema.test:
  Move the part of the test case that needs SSL support to 
  openssl_1.test
mysql-test/t/openssl_1.test:
  Add a test case that needs SSL support.
2007-04-06 00:38:57 +04:00
unknown
25677bdc2e Fix a compile failure on Windows. 2007-04-05 23:22:33 +04:00
unknown
aadfe5e7fc Fix a compile error with LINT enabled builds. 2007-04-05 21:46:25 +04:00
unknown
923d2d3a01 Remove a dead file.
BitKeeper/deleted/.del-openssl_2.result:
  Delete: mysql-test/r/openssl_2.result
2007-04-05 21:01:09 +04:00
unknown
40e17891da Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-c1


sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
2007-04-05 20:50:28 +04:00
unknown
ff452d050a Post-merge and post-review fixes for the patch for
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event 
is damaged:


mysql-test/r/events.result:
  Update results (a post-merge fix)
mysql-test/r/events_bugs.result:
  Update results (a post-merge fix)
mysql-test/r/events_scheduling.result:
  Update results (a post-merge fix)
mysql-test/t/events_scheduling.test:
  Make sure this test has no races.
sql/event_data_objects.cc:
  Manual post-merge fix for the events replication patch.
sql/event_data_objects.h:
  A post-merge fix.
sql/event_db_repository.cc:
  A post-merge fix.
sql/event_scheduler.cc:
  We should drop the event inside ::execute since there we have
  the right credentials to do so (otherwise Events::drop_event
  returns "access denied" error).
sql/events.cc:
  A post-review fix for: rename start_or_stop_event_scheduler
  to switch_event_scheduler_state.
sql/events.h:
  A post-review fix for: rename start_or_stop_event_scheduler
  to switch_event_scheduler_state.
sql/set_var.cc:
  A post-review fix for: rename start_or_stop_event_scheduler
  to switch_event_scheduler_state.
sql/sql_yacc.yy:
  Remove unused declaratoins.
2007-04-05 20:47:22 +04:00
unknown
b4f1d7ba12 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/r/information_schema.result:
  Auto merged
2007-04-05 10:17:32 -06:00
unknown
ea3afa8d1e bug #26074 Mysql crash creating partition
As we have unified paths inside partition engine, we should look for '/'
as a path separator


mysql-test/r/windows.result:
  result fixed
mysql-test/t/windows.test:
  testcase
sql/ha_partition.cc:
  check for '/' instead of FN_LIBCHAR
2007-04-05 20:26:18 +05:00
unknown
44ac931080 ha_ndbcluster.cc:
Bug #26591  Cluster handler does not set bits in null bytes correctly: Improved comments
ha_ndbcluster_binlog.cc:
  Bug #26591  Cluster handler does not set bits in null bytes correctly: Using empty_record() instead of bzero


sql/ha_ndbcluster.cc:
  Bug #26591  Cluster handler does not set bits in null bytes correctly: Improved comments
sql/ha_ndbcluster_binlog.cc:
  Bug #26591  Cluster handler does not set bits in null bytes correctly: Using empty_record() instead of bzero
2007-04-05 15:59:42 +02:00
unknown
a36054f420 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-c1


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/events_scheduling.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
mysql-test/t/events_scheduling.test:
  Auto merged
sql/event_data_objects.h:
  Auto merged
sql/event_db_repository.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/events.result:
  e
  Use local.
mysql-test/r/events_restart_phase1.result:
  Use local
mysql-test/r/events_time_zone.result:
  SCCS merged
mysql-test/t/events_restart_phase1.test:
  Use local
sql/event_data_objects.cc:
  Use local
sql/event_db_repository.cc:
  Manual merge.
sql/event_queue.cc:
  Manual merge.
sql/events.cc:
  Manual merge.
2007-04-05 15:49:46 +04:00
unknown
fa1d637e89 A set of changes aiming to make the Event Scheduler more user-friendly
when there are no up-to-date system tables to support it:
 - initialize the scheduler before reporting "Ready for connections".
   This ensures that warnings, if any, are printed before "Ready for
   connections", and this message is not mangled.
 - do not abort the scheduler if there are no system tables
 - check the tables once at start up, remember the status and disable
   the scheduler if the tables are not up to date.
   If one attempts to use the scheduler with bad tables,
   issue an error message.
 - clean up the behaviour of the module under LOCK TABLES and pre-locking
   mode
 - make sure implicit commit of Events DDL works as expected.
 - add more tests


Collateral clean ups in the events code.

This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work 
when mysql.event is damaged


mysql-test/r/events.result:
  Update results.
mysql-test/r/events_bugs.result:
  Update results.
mysql-test/r/events_restart_phase1.result:
  Update results.
mysql-test/r/events_restart_phase2.result:
  Update results.
mysql-test/r/events_restart_phase3.result:
  Update results.
mysql-test/r/events_scheduling.result:
  Update results.
mysql-test/r/events_time_zone.result:
  Update results.
mysql-test/t/events.test:
  Add new tests for tampering with mysql.event and some more
  tests for sub-statements, LOCK TABLES mode and pre-locking.
mysql-test/t/events_bugs.test:
  Move the non-concurrent part of test for Bug 16420 to this file.
mysql-test/t/events_restart_phase1.test:
  Rewrite events_restart_* tests to take into account that now
  we check mysql.event table only once, at server startup.
mysql-test/t/events_restart_phase2.test:
  Rewrite events_restart_* tests to take into account that now
  we check mysql.event table only once, at server startup.
mysql-test/t/events_restart_phase3.test:
  Rewrite events_restart_* tests to take into account that now
  we check mysql.event table only once, at server startup.
mysql-test/t/events_scheduling.test:
  Add more coverage for event_scheduler global variable.
mysql-test/t/events_time_zone.test:
  Move the non-concurrent part of the tests for Bug 16420 to 
  events_bugs.test
sql/event_data_objects.cc:
  Move update_timing_fields functionality to Event_db_repository.
  Make loading of events from a table record more robust to tampering
  with the table - now we do not check mysql.event on every table open.
sql/event_data_objects.h:
  Cleanup.
sql/event_db_repository.cc:
  Now Event_db_repository is responsible for table I/O only.
  All the logic of events DDL is handled outside, in Events class please
  refer to the added test coverage to see how this change affected
  the behavior of Event Scheduler.
  Dependency on sp_head.h and sp.h removed.
  Make this module robust to tweaks with mysql.event table.
  Move check_system_tables from events.cc to this file
sql/event_db_repository.h:
  Cleanup declarations (remove unused ones, change return type to bool
  from int).
sql/event_queue.cc:
  Update to adapt to the new start up scheme of the Event Scheduler.
sql/event_queue.h:
  Cleanup declarations.
sql/event_scheduler.cc:
  Make all the error messages uniform:
  [SEVERITY] Event Scheduler: [user][schema.event] message
  Using append_identifier for error logging was an overkill - we may 
  need it only if the system character set may have NUL (null character)
  as part of a valid identifier, this is currently never the case, 
  whereas additional quoting did not look nice in the log.
sql/event_scheduler.h:
  Cleanup the headers.
sql/events.cc:
  Use a different start up procedure of Event Scheduler:
  - at start up, try to check the system tables first.
  If they are not up-to-date, disable the scheduler.
  - try to load all the active events. In case of a load error, abort
  start up.
  - do not parse an event on start up. Parsing only gives some information
  about event validity, but far not all.
  Consolidate the business logic of Events DDL in this module.
  Now opt_event_scheduler may change after start up and thus is protected
  by LOCK_event_metadata mutex.
sql/events.h:
  Use all-static-data-members approach to implement Singleton pattern.
sql/mysqld.cc:
  New invocation scheme of Events. Move some logic to events.cc.
  Initialize the scheduler before reporting "Ready for connections".
sql/set_var.cc:
  Clean up sys_var_thd_sql_mode::symbolic_mode_representation
  to work with a LEX_STRING.
  Move more logic related to @@events_scheduler global variable to Events
  module.
sql/set_var.h:
  Update declarations.
sql/share/errmsg.txt:
  If someone tampered with mysql.event table after the server has
  started we no longer give him/her a complete report what was actually 
  broken. Do not send the user to look at the error log in such case,
  as there is nothing there (check_table_intact is not executed).
sql/sp_head.cc:
  Update to a new declaration of 
  sys_var_thd_sql_mode::symbolic_mode_representation
sql/sql_db.cc:
  New invocation scheme of Events module.
sql/sql_parse.cc:
  Move more logic to Events module. Make sure that we are consistent
  in the way access rights are checked for Events DDL: always
  after committing the current transaction and checking the system tables.
sql/sql_show.cc:
  Update to the new declarations of 
  sys_var_thd_sql_mode::symbolic_mode_representation
sql/sql_test.cc:
  New invocation scheme of events.
sql/table.cc:
  mysql.event is a system table.
  Update check_table_intact to be concurrent, more verbose, and less smart.
sql/table.h:
  Add a helper method.
mysql-test/r/events_trans.result:
  New BitKeeper file ``mysql-test/r/events_trans.result''
mysql-test/t/events_trans.test:
  New BitKeeper file ``mysql-test/t/events_trans.test'':
  test cases for Event Scheduler that require a transactional
  storage engine.
2007-04-05 15:24:34 +04:00
unknown
483ce95394 ndb: change attribute id for ANY_VALUE as id was already reserved for upcoming read pached patch 2007-04-05 12:01:01 +02:00
unknown
68fa01f04e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
2007-04-05 11:21:25 +02:00
unknown
a127d58259 aftermerging fix
sql/partition_info.cc:
  here we have to check for zero return from file->get_default_no_partitions
2007-04-05 13:25:39 +05:00
unknown
23e92aca5a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
2007-04-05 10:24:37 +02:00
unknown
34dcbe661a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-05 10:22:46 +02:00
unknown
4025df9217 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/r/rpl_ndb_log.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-04-05 10:21:41 +02:00
unknown
8f21b31d67 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:20:56 +02:00
unknown
8bdb42e011 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 09:18:52 +02:00
unknown
9170a3c184 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2007-04-05 09:18:37 +02:00
unknown
f6a9b254af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 09:18:36 +02:00
unknown
ee59e734e2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/desc.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/select_all.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged
2007-04-05 09:16:42 +02:00
unknown
a3d8d943b9 set name for ndb tools 2007-04-05 09:16:16 +02:00
unknown
f7143ac3a8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/t/ndb_autodiscover3.test:
  Auto merged
2007-04-05 09:13:20 +02:00
unknown
e8a0ac29a7 Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00
unknown
c66a15285f Add extra INSERT to make usre sync_slave_with_master has job to do
mysql-test/r/rpl_ssl.result:
  Add an extra INSERT to make sure that the "sync_slave_with_master" has
  someghing to do and thus have to wait for the slave IO thread
  to start.
mysql-test/t/rpl_ssl.test:
  Add an extra INSERT to make sure that the "sync_slave_with_master" has
  someghing to do and thus have to wait for the slave IO thread
  to start.
2007-04-05 09:10:22 +02:00
unknown
499d058c2d Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
2007-04-05 08:39:12 +02:00
unknown
865cd0108a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
2007-04-05 08:24:03 +02:00
unknown
0679e0a693 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
2007-04-05 13:42:53 +08:00
unknown
b8ea75c8a6 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2007-04-05 07:34:36 +02:00
unknown
7374893012 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
2007-04-05 07:29:38 +02:00
unknown
cfe2d1da88 Removed compiler warnings 2007-04-05 07:28:09 +02:00
unknown
33ad89917f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/sql_trigger.h:
  Auto merged
2007-04-05 06:59:47 +02:00
unknown
22c188fef8 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/sql_trigger.h:
  Auto merged
2007-04-05 06:52:25 +02:00
unknown
4c0f3c50f8 Fixed compilation error on Windows 2007-04-05 06:49:43 +02:00
unknown
02a7bdc453 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2007-04-05 12:26:01 +08:00
unknown
bb8fb9e9e6 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-05 11:30:19 +08:00
unknown
d5c744d238 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
2007-04-05 10:47:40 +08:00
unknown
6575e2d296 fix test for bug#25721
did not run properly on a fast Windows machine
2007-04-04 21:35:58 +00:00