Commit graph

28416 commits

Author SHA1 Message Date
unknown
faa8995e7a WL #1034 updates after review
(strip m_ as prefix from member variables' names)


sql/event.cc:
  - change copyright years
  - remove m_ prefix from member variables (I liked m_)
  - reorder parameter in evex_update_event()
sql/event.h:
  - change copyright years
  - remove m_ prefix from member variables
  - declare some member variables as private (were public)
  - delete 0 is valid in C++ therefore don't embrace with if()
sql/event_executor.cc:
  - executor => scheduler in messages
  - fix a bug introduced in last commit -> typo in a mutex name
  - remove m_ prefix from member variables
sql/event_priv.h:
  - change copyright years
sql/event_timed.cc:
  - change copyright years
  - strip m_ as prefix from member variables' names
sql/sql_parse.cc:
  - strip m_ as prefix from member variables' names
sql/sql_yacc.yy:
  - strip m_ as prefix from member variables names
2005-12-08 00:17:05 +01:00
unknown
a4bcbd51d9 WL #1034 updates after review
sql/event.cc:
  - fix TODO (remove things already done)
  - check the length of the event's name and body during creation
    and report an error if longer than what can be fit into 
    mysql.event (nothing like non-strict mode here)
  - report to sql_parse.cc and error when open table failed, otherwise send_ok()
    was being called and the error have become an warning.
  - update function documentation a bit
  - evex_db_find_routine_aux returns 0 and not EVEX_OK
sql/event_executor.cc:
  - CS changes to definitions of the main and worker thread routines
  - reorder code a bit to prevent crashes because of reading of
    already freed data -> first wait all events to finish their work,
    namely all worker threads to finish, and then destroy in-memory
    structures
  - more error checking and error reporting at the place of failure.
sql/event_priv.h:
  code simplifying macro
sql/event_timed.cc:
  CS cosmetics
2005-12-07 22:29:00 +01:00
unknown
bc3708a5b9 WL#1034 ongoing updates after review
sql/event.cc:
  -my_error() as close as possible to the place where the error
   occurs.
  -a thought how to replicate events
  -use close_thread_tables() in some cases and for others rely on
   this call being done in sql_parse.cc::do_command()
sql/event.h:
  remove redundant defines
sql/event_executor.cc:
  - reenable the compilation again
  - don't backup the open_tables_state, it's not needed
sql/event_timed.cc:
  - inline a bit
  - comment added
sql/mysqld.cc:
  - start mysqld with --event-scheduler=0 by default
sql/share/errmsg.txt:
  3 new messages
sql/sql_parse.cc:
  remove now obsolete error checking - the errors are reported
  as closer as possible to the place where they are detected
sql/sql_yacc.yy:
  add WARNING message. fix a bug that was corrupting 
  thd->client_capabilites ->
  select count(*) from mysql.event
  was reporting : "Unknown table test.event"!!!
  Using temporal variable is nice but IMO quite error-prone.
2005-12-07 19:26:44 +01:00
unknown
a581a4a1c5 rever
sql/sp_head.cc:
  revert
2005-12-06 17:12:01 +01:00
unknown
7838d468ab WL#1034
make more independent of SP


sql/event.cc:
  use own routine - export it
sql/event_priv.h:
  export these two
sql/event_timed.cc:
  use own routine, don't rely on SP
sql/sp.cc:
  revert changes to SP
sql/sp.h:
  revert changes to SP
sql/sql_show.cc:
  rever changes to SP
2005-12-06 16:46:29 +01:00
unknown
70856a0d54 WL#1034
updated sources


sql/event.cc:
  update
  put some error calls to the places they occur
sql/event.h:
  - change the default (does not work in STRICT mode)
sql/event_executor.cc:
  move mutex initialization to evex_init_mutexes so init_events() can be reused when the
  main thread does not work and set global event_scheduler=1; (this will start the thread)
  The main thread is now visible with show processlist and can be killed.
sql/event_priv.h:
  don't use anymore SP for opening table
sql/event_timed.cc:
  don't use anymore SP routines for opening mysql.event
sql/mysqld.cc:
  shutdown_events() should be maximal at the end of the server because
  it destroys mutexes of EVEX. The call should not be in the main thread.
sql/set_var.cc:
  make sys_var_event_executor subclass sys_var_bool_ptr
  to overload ::update() method - needed to start a
  killed (non-running) evex main thread
sql/set_var.h:
  declare class sys_var_event_executor
sql/share/errmsg.txt:
  2 new messages
2005-12-06 16:15:29 +01:00
unknown
7ff7977105 WL#1034 updated
- split into several files
- forbid parallel execution (before analyse is done how to make it possible)
  because the same sp_head instance cannot be executed in parallel
- added GPL headers
- changed EVENT_ACL to be per DB variable
- fixed minor problems


mysql-test/lib/init_db.sql:
  WL#1034 updated
  - add Event_priv to mysql.user (update test)
  - add updated mysql.event table struct
scripts/mysql_fix_privilege_tables.sql:
  WL#1034 updated
  add updated mysql.event structure
sql/Makefile.am:
  split event.cc into
  - event.cc (create/alter/drop)
  - event_executor.cc (main and worker threads)
  - event_timed.cc (class event_timed)
  - event_priv.h (some definitions used internally by the module)
sql/event.cc:
  - added GPL header
  - split into few files
  - fixed some issues after code review
  - now using SP routines for opening/traversing/closing tables
    (will be reverted)
sql/event.h:
  - add GPL header
  - remove two methods - inline them in sql_yacc.yy 
  - don't use absolute values for EVEX_ defines but the SP_ equivalents (have to move 100% to SP_
    defines and as later step to not transfer messages upwards in the stack but
    report them at the place they occur)
  - updated reference table definition
  - move default mem_root param from event.cc to the header
sql/mysqld.cc:
  WL#1034
  rename --event-executor to --event-scheduler
  executor sounds a bit scary :)
sql/set_var.cc:
  rename internal variable name from event_executor to event_scheduler
  (ppl won't be scarried anymore :)
sql/share/errmsg.txt:
  omit one %s - not needed
sql/sp_head.cc:
  disable this DBUG_PRINT for a bit. m_next_cached_sp is 0x0 and I get crash here...
sql/sp_head.h:
  remove m_old_cmq, a temporal variable is used in sql_yacc.yy (Serg's idea)
  to keep the previous state.
  $<ulong_val>$ =  ....
  
  YYTHD->client_capabilites != $<ulong_val>4;
  
  (the same is done also for class event_timed)
sql/sql_acl.cc:
  handle pre-5.1.4 table and give the user EVENT_ACL if he had CREATE_ACL
sql/sql_acl.h:
  fix the bitmask
sql/sql_parse.cc:
  - move from EVENT_ACL being global to EVENT_ACL being per DB like
    CREATE_PROC_ACL
  - lex->m_qname dropped, because not needed, fix code therefore
  - add comment that SHOW CREATE EVENT has to be implemented
sql/sql_yacc.yy:
  - use temporal variable of Bison to store a short lived value
  - fix indentation
  - inline 2 class event_timed methods in the parser
sql/tztime.h:
  be more expressive - it's already extern
2005-12-05 11:45:04 +01:00
unknown
e7f18c97b8 add test case with \n at EOF 2005-12-02 13:28:14 +01:00
unknown
582299d700 add these, forgotten in the previous commit 2005-12-02 13:22:15 +01:00
unknown
4d891eb91c WL1034 update for latest 5.1 sources
BUILD/SETUP.sh:
  for now no optimizations in debug build - get rid of "value optimized out"
2005-12-02 13:07:02 +01:00
unknown
dad8c66501 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-28 15:07:55 +01:00
unknown
09a47fd418 Merge mysql.com:/M51/tmp-5.1 into mysql.com:/M51/mysql-5.1 2005-11-28 14:56:03 +01:00
unknown
17c70d0e81 sql/mysqld.cc
Fix a typo: "distibution" -> "distribution".


sql/mysqld.cc:
  Fix a typo: "distibution" -> "distribution".
2005-11-28 14:54:41 +01:00
unknown
e2b135f2d7 Merge mysql.com:/usr/home/bar/mysql-5.0.b14146.sep
into  mysql.com:/usr/home/bar/mysql-5.1-new


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
2005-11-28 15:03:41 +04:00
unknown
dd985bd629 Added my name
Changed to alphabetical order


mysql-test/r/show_check.result:
  Changed to alphabetical order
2005-11-27 13:58:50 +01:00
unknown
cd22085abd Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/tmp/x/mysql-5.1-new
2005-11-26 15:30:09 +01:00
unknown
0a3d70a044 Fixed failing "show check" test.
mysql-test/r/show_check.result:
  fixed failing test for Holyfoot ;-)
sql/authors.h:
  added myself
2005-11-25 11:05:35 -08:00
unknown
25d34b2324 Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/data0/mysqldev/my/mysql-5.1.3-pushmain
2005-11-25 11:46:28 +01:00
unknown
878e2618ea HF mentioned in authors.h
sql/authors.h:
  line about HF
2005-11-25 14:46:27 +04:00
unknown
8280d2040e Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
into mysql.com:/data0/mysqldev/my/mysql-5.1.3-fixes
2005-11-25 11:04:13 +01:00
unknown
e040ac612f Compile more stuff during make dist to detect more errors already during bootstrap. 2005-11-25 10:48:42 +01:00
unknown
030558e17e Fix VS project files following move of storage engines below storage/. 2005-11-25 10:46:28 +01:00
unknown
95b6827587 Fix example storage engine following table def cache updates. 2005-11-25 10:35:26 +01:00
unknown
efd2066135 Mikaels fix for compiling without partition storage engine 2005-11-25 10:33:38 +01:00
unknown
68e89d69e0 Made set_part_info a handler method and not a ha_partition method only
The previous variant where it was a specific ha_partition method
only worked for the partition handler. It was unfortunately called also
for the NDB handler and in this case it called a random method in the
NDB handler with random input.


sql/ha_ndbcluster.cc:
  Moved initialisation of some handler variables to
  set_part_info method called earlly in the open process
sql/ha_ndbcluster.h:
  Moved initialisation of some handler variables to
  set_part_info method called earlly in the open process
sql/ha_partition.h:
  Made set_part_info a handler method and not a ha_partition method only
sql/handler.h:
  Made set_part_info a handler method and not a ha_partition method only
sql/sql_partition.cc:
  Made set_part_info a handler method and not a ha_partition method only
2005-11-25 09:11:52 +01:00
unknown
a167f63b85 Fixing result file from previous merge.
mysql-test/r/mysqldump.result:
  Fixing result from merge
2005-11-24 11:59:41 -08:00
unknown
d6a1a3a51c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/mysql-5.1-new


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  REsolve
mysql-test/t/mysqldump.test:
  Resolve conflict
2005-11-24 11:23:44 -08:00
unknown
b0b86ec10b Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.

Though I hear you could just use a sed line to modify it back :)


client/client_priv.h:
  New option for --replace
client/mysqldump.c:
  Added option for REPLACE INTO instead of INSERT INTO
mysql-test/r/mysqldump.result:
  Updated REsultes for replace into
mysql-test/t/mysqldump.test:
  Added new test for --replace
2005-11-24 09:56:40 -08:00
unknown
cb8302df8c Tag 5.1.3-alpha cloneoff
Update version number to 5.1.4-alpha


configure.in:
  Update version number to 5.1.4-alpha
2005-11-24 14:57:16 +01:00
unknown
705965362d added missing errorcode handling in NdbIndexStat causing test failure 2005-11-24 14:57:14 +01:00
unknown
c9865bf916 Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/space/my/mysql-5.1
2005-11-24 13:39:56 +01:00
unknown
cc7945293f - fixed a compile error in mysys/mf_tempdir.c by adding a missing comma
(only showed up in a non-debug build)


mysys/mf_tempdir.c:
   - fixed a compile error by adding a missing comma (only showed up in a non-debug
     build)
2005-11-24 13:26:47 +01:00
unknown
6beccdb328 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  SCCS merged
2005-11-24 13:16:50 +01:00
unknown
26264c5cf8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/my/mysql-5.1
2005-11-24 13:36:43 +02:00
unknown
5bc1615c4e updated test as result of config change done in cluster startup 2005-11-24 12:36:42 +01:00
unknown
d5e6a57299 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2005-11-24 11:37:09 +01:00
unknown
2b2391c47a added possibility to start ndb cluster with different sized clusters for usage from mysql test run 2005-11-24 11:34:35 +01:00
unknown
0f358e1b76 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


sql/field.cc:
  Auto merged
2005-11-24 11:38:21 +02:00
unknown
9fdbaf5195 added missing drop view at end of test 2005-11-24 09:56:48 +01:00
unknown
2d3d9773c1 Merge mysql.com:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1-TDC


sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-11-24 06:23:51 +02:00
unknown
7f10ea430c Clear variable
mysql-test/r/view_grant.result:
  Drop things that may be left from old runs
mysql-test/t/view_grant.test:
  Drop things that may be left from old runs
2005-11-24 06:17:38 +02:00
unknown
b293216ec3 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/my/mysql-5.1
2005-11-24 06:15:36 +02:00
unknown
0db7a010e4 Added bitmap_buffer_size()
Removed valgrind warnings when using not aligned bitmap buffer size
Added setting of thread_stack


include/my_bitmap.h:
  Added bitmap_buffer_size()
sql/handler.cc:
  use bitmap_buffer_size()
sql/opt_range.cc:
  use bitmap_buffer_size()
sql/sql_insert.cc:
  Use bitmap_buffer_size()
sql/sql_parse.cc:
  Added setting of thread_stack when taking thread from thread cache
sql/sql_plugin.cc:
  Set thread_stack
2005-11-24 06:15:35 +02:00
unknown
c5349d8845 Merge mysql.com:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1-TDC


sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/unireg.h:
  Auto merged
2005-11-24 04:08:07 +02:00
unknown
4189df2a33 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/my/mysql-5.1


sql/field.cc:
  Auto merged
2005-11-24 03:10:27 +02:00
unknown
81b2bbac05 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/examples/ha_tina.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
2005-11-24 02:56:12 +02:00
unknown
97bfd41fe1 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk


BitKeeper/etc/ignore:
  added libmysqld/ha_blackhole.cc
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Delete: libmysqld/ha_blackhole.cc
include/my_global.h:
  Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
  (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
mysql-test/r/federated.result:
  Update results after error message changes
mysql-test/r/grant.result:
  Update results after error message changes
mysql-test/r/grant2.result:
  Update results after error message changes
sql/ha_federated.cc:
  Fix error messages to be more consistent
sql/mysql_priv.h:
  Stack size to have when opening a table
  (This was needed on x86 64 bit Linux)
sql/share/errmsg.txt:
  Remove quotes around error string for federated as two quotes in the output looks strange
sql/sql_base.cc:
  More correct stack size
sql/sql_parse.cc:
  Set thread_stack before store_globals()
sql/unireg.h:
  More correct MAX_DBKEY_LENGTH
2005-11-24 02:36:28 +02:00
unknown
f443161911 Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-11-24 00:37:46 +02:00
unknown
039168c2fa Merge mysql.com:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1-TDC


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  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_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/field.cc:
  Merge with global tree
sql/sql_base.cc:
  Merge with global tree
sql/table.cc:
  Merge with global tree
2005-11-23 22:58:53 +02:00
unknown
fe245ed8ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


sql/field.cc:
  Auto merged
2005-11-23 22:45:47 +02:00