Commit graph

34389 commits

Author SHA1 Message Date
unknown
1101cda353 interface for transaction log management added to handlerton
iterators creation interface added to handlerton


sql/ha_berkeley.cc:
  added new methods
sql/ha_federated.cc:
  added new methods
sql/ha_heap.cc:
  added new methods
sql/ha_innodb.cc:
  added new methods
sql/ha_myisam.cc:
  added new methods
sql/ha_myisammrg.cc:
  added new methods
sql/ha_ndbcluster.cc:
  added new methods
sql/ha_partition.cc:
  added new methods
sql/handler.cc:
  added new methods
  spelling fixed
  examples of functions for new interface added
sql/handler.h:
  transaction logs management interface added
  general iterator creatioin interface added
sql/log.cc:
  added new methods
storage/archive/ha_archive.cc:
  added new methods
storage/blackhole/ha_blackhole.cc:
  added new methods
storage/csv/ha_tina.cc:
  added new methods
storage/example/ha_example.cc:
  added new methods
2006-06-01 21:47:15 +03:00
unknown
a04d9fa947 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:34:24 +05:00
unknown
b056eac648 Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:31:39 +05:00
unknown
59c2b9702d Fix missing source file. 2006-05-24 09:28:37 +02:00
unknown
a3687d58f0 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-05-24 09:23:45 +02:00
unknown
d4aa0b8d92 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 19:08:28 -07:00
unknown
8bd23f0725 Fix events_logs_tests so it won't fail on Windows due to appearance
of hostname in query results.


mysql-test/r/events_logs_tests.result:
  Update results
mysql-test/t/events_logs_tests.test:
  Replace user_host in results, since it is system dependent.
2006-05-23 17:51:17 -07:00
unknown
ac975b1371 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 17:33:12 -07:00
unknown
4bccc3361a Removing mysql_explain_log from 5.1
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Delete: scripts/mysql_explain_log.sh
scripts/Makefile.am:
  Removing mysql_explain_log
scripts/make_binary_distribution.sh:
  Removing mysql_explain_log
support-files/mysql.spec.sh:
  Remove reference to mysql_explain_log
2006-05-23 17:26:56 -07:00
unknown
3100a6ca6e Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 15:13:30 -07:00
unknown
90ebc32456 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 13:03:33 -07:00
unknown
821daed661 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.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
2006-05-23 11:25:11 -07:00
unknown
041171fd81 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/log_tables.result:
  Merge conflict
mysql-test/t/log_tables.test:
  Merge conflict
2006-05-23 09:49:04 -07:00
unknown
4cf24a5160 event_scheduler.h, event_scheduler.cc:
Rename load_event() to load_named_event(), to avoid name clash on HP-UX


sql/event_scheduler.cc:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
sql/event_scheduler.h:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
2006-05-23 17:47:17 +02:00
unknown
7d01d11c8d Removed wrong ascii codes from source code.
Fixed core dump in --help


include/heap.h:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
mysys/my_getopt.c:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
sql/mysqld.cc:
  Wrong type.
2006-05-23 18:27:54 +03:00
unknown
c2330977cb Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-05-23 16:51:37 +02:00
unknown
05d44302b9 __FUNCTION__ is not available everywhere.
make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)


sql/event_scheduler.cc:
  __FUNCTION__ is not available everywhere.
  make us see at least with gcc the function proto. this can be extended
  probably for windows too.
2006-05-23 16:50:01 +02:00
unknown
375615f7fc Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 16:07:23 +02:00
unknown
2b8527e945 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 15:07:08 +02:00
unknown
749f183265 update log_tables.test so it is less fragile
mysql-test/r/log_tables.result:
  update result so test is less fragile
mysql-test/t/log_tables.test:
  update test so it is less fragile
2006-05-23 15:01:23 +02:00
unknown
63b84034f8 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 14:39:30 +02:00
unknown
d78ee0ab4f Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 13:49:24 +02:00
unknown
91552f962f various fixes after push of fix for bug#17619
mysql-test/r/not_embedded_server.result:
  update result
mysql-test/r/sp-threads.result:
  update result
sql/event_scheduler.h:
  fix build error with SUN compiler
sql/mysqld.cc:
  fix problem with --init-file which was expecting to be the only running
  thread. nevertheless Events should be started as close as possible to the
  place connections are handled.
2006-05-23 13:32:22 +02:00
unknown
3d2a3c4175 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 12:13:02 +02:00
unknown
6f1ab9ba48 update result
drop users at the end of events_stress


mysql-test/r/ps_1general.result:
  update result
mysql-test/r/skip_name_resolve.result:
  update result
mysql-test/r/sp_notembedded.result:
  update result
mysql-test/r/status.result:
  update result
mysql-test/t/events_stress.test:
  drop users created in the test
2006-05-23 12:10:07 +02:00
unknown
da73495f09 make it less stressful. some pushbuild boxes cannot cope with it 2006-05-23 10:49:09 +02:00
unknown
c4c26017c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
2006-05-23 12:08:47 +04:00
unknown
1d41f34f9a Bug#20002 Old --with-openssl and --with-yassl options just silently ignored
- Terminate configure with error(and message) if --with-yassl or --with-openssl is used.


config/ac-macros/ssl.m4:
  Add error message if --with-yassl or --with-openssl is used
2006-05-23 10:07:07 +02:00
unknown
f29550142c Bug#20018 Class declared inside of function causes problem with gcc 2.95.3
- Move class MY_HOOKS out of function


sql/sql_insert.cc:
  Move class MY_HOOKS out of function 'select_create::prepare'
2006-05-23 09:25:07 +02:00
unknown
eb88fd5577 BUG#20015 mgmsrv and mgmapi: get statport is dead code
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
2006-05-23 14:35:18 +10:00
unknown
17395f03cc Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 01:28:47 +02:00
unknown
91de2afb8c fix endianess on ppc. seems for sys_var_long_ptr we have to fetch
var->save_result.ulonglong_value and not var->save_result.ulong_value
2006-05-23 01:10:32 +02:00
unknown
36438ebaa1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-release
2006-05-23 00:25:23 +02:00
unknown
b1eaf92cd9 fix win32 build after push for bug#17619
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
2006-05-23 00:19:02 +02:00
unknown
d4e4e0099b Bump up the version number, 5.1.11 has been cloned. 2006-05-22 22:58:01 +02:00
unknown
c8fd8a8258 Merge mysql.com:/home/jimw/my/mysql-5.1-20004
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-22 13:21:50 -07:00
unknown
e21d0cf275 Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 22:12:48 +02:00
unknown
261a42b8d0 manual merged
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
2006-05-22 21:57:23 +02:00
unknown
efefe651c2 Change = to == in ndbrequire 2006-05-22 21:51:28 +02:00
unknown
c476d56e3b Merge shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 21:35:23 +02:00
unknown
19885b10d6 Add m4.cpp to CMakeLists.txt for taocrypt
extra/yassl/taocrypt/CMakeLists.txt:
  Add md4.cpp
2006-05-22 21:30:34 +02:00
unknown
f4781a7e4c fix for bug #17619 Scheduler race conditions
- 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.
2006-05-22 20:46:13 +02:00
unknown
4afca4061c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1


sql/mysql_priv.h:
  Auto merged
2006-05-22 11:40:29 -07:00
unknown
a10e279333 Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 20:40:28 +02:00
unknown
e1dfae7464 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-22 20:40:27 +02:00
unknown
5b2cade4fa Bug #20004: log_tables fails on Windows due to output differences
This test included hostname information in the output, which varies
  between platforms.


mysql-test/r/log_tables.result:
  Update results
mysql-test/t/log_tables.test:
  Replace user_host selected from logs to avoid platform differences.
  Also, fix use of replace_column in test for bug 17600.
2006-05-22 11:34:41 -07:00
unknown
a9d12e26fd Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-05-22 18:03:11 +02:00
unknown
bd578562f2 Fix BUILD/compile-pentium-gcov
BUILD/compile-pentium-gcov:
  Add -max options for gcov, fix yassl and BDB builds, disable ccache which
  is incompatible with gcc profiling output.
2006-05-22 17:15:49 +02:00
unknown
8677a24fc4 Merge mysql.com:/home/kgeorge/mysql/5.0/B18745
into  mysql.com:/home/kgeorge/mysql/5.1/B18745


mysql-test/r/func_group.result:
  Auto merged
2006-05-22 18:15:47 +03:00
unknown
b1b1769e3e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2006-05-22 16:42:48 +02:00