Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-08-15 18:14:05+02:00, andrey@stripped +6 -0
WL#3337 (Event scheduler new architecture)
Pure white-space changes changeset.
sql/event_data_objects.cc@stripped, 2006-08-15 18:14:00+02:00, andrey@stripped +10 -8
white space changes
sql/event_data_objects.h@stripped, 2006-08-15 18:14:00+02:00, andrey@stripped +3 -3
white space changes
sql/event_queue.cc@stripped, 2006-08-15 18:14:00+02:00, andrey@stripped +1 -1
white space changes
sql/event_queue.h@stripped, 2006-08-15 18:14:00+02:00, andrey@stripped +4 -4
white space changes
sql/event_scheduler.h@stripped, 2006-08-15 18:14:00+02:00, andrey@stripped +5 -5
white space changes
sql/events.h@stripped, 2006-08-15 18:14:00+02:00, andrey@stripped +7 -7
white space changes
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: andrey
# Host: example.com
# Root: /work/mysql-5.1-runtime-wl3337
--- 1.44/sql/events.h 2006-08-15 18:14:17 +02:00
+++ 1.45/sql/events.h 2006-08-15 18:14:17 +02:00
@@ -54,22 +54,22 @@ public:
bool
init();
-
+
void
deinit();
void
init_mutexes();
-
+
void
destroy_mutexes();
bool
start_execution_of_events();
-
+
bool
stop_execution_of_events();
-
+
bool
is_started();
@@ -104,7 +104,7 @@ public:
static int
fill_schema_events(THD *thd, TABLE_LIST *tables, COND * /* cond */);
-
+
bool
dump_internal_status(THD *thd);
@@ -122,10 +122,10 @@ private:
Event_queue *event_queue;
Event_scheduler *scheduler;
Event_db_repository *db_repository;
-
+
bool db_ok;
- pthread_mutex_t LOCK_event_metadata;
+ pthread_mutex_t LOCK_event_metadata;
/* Prevent use of these */
Events(const Events &);
--- 1.12/sql/event_queue.cc 2006-08-15 18:14:17 +02:00
+++ 1.13/sql/event_queue.cc 2006-08-15 18:14:17 +02:00
@@ -659,7 +659,7 @@ Event_queue::recalculate_activation_time
Event_queue::empty_queue()
NOTE
- Should be called with LOCK_event_queue locked
+ Should be called with LOCK_event_queue locked
*/
void
--- 1.10/sql/event_queue.h 2006-08-15 18:14:17 +02:00
+++ 1.11/sql/event_queue.h 2006-08-15 18:14:17 +02:00
@@ -31,13 +31,13 @@ public:
void
init_mutexes();
-
+
void
deinit_mutexes();
-
+
bool
init_queue(THD *thd, Event_db_repository *db_repo, Event_scheduler *sched);
-
+
void
deinit_queue();
@@ -104,7 +104,7 @@ protected:
const char* mutex_last_attempted_lock_in_func;
bool mutex_queue_data_locked;
bool mutex_queue_data_attempting_lock;
-
+
/* helper functions for working with mutexes & conditionals */
void
lock_data(const char *func, uint line);
--- 1.15/sql/event_scheduler.h 2006-08-15 18:14:17 +02:00
+++ 1.16/sql/event_scheduler.h 2006-08-15 18:14:17 +02:00
@@ -50,12 +50,12 @@ public:
stop();
/*
- Need to be public because has to be called from the function
+ Need to be public because has to be called from the function
passed to pthread_create.
*/
bool
run(THD *thd);
-
+
void
init_scheduler(Event_queue *queue);
@@ -64,7 +64,7 @@ public:
void
init_mutexes();
-
+
void
deinit_mutexes();
@@ -112,7 +112,7 @@ private:
ulong thread_id;
pthread_cond_t COND_state;
-
+
Event_queue *queue;
uint mutex_last_locked_at_line;
@@ -121,7 +121,7 @@ private:
const char* mutex_last_unlocked_in_func;
bool mutex_scheduler_data_locked;
bool waiting_on_cond;
-
+
ulonglong started_events;
private:
--- 1.74/sql/event_data_objects.cc 2006-08-15 18:14:17 +02:00
+++ 1.75/sql/event_data_objects.cc 2006-08-15 18:14:17 +02:00
@@ -161,7 +161,7 @@ Event_parse_data::init_body(THD *thd)
*/
if ((*(body_end - 1) == '*') && (*body_end == '/'))
{
- DBUG_PRINT("info", ("consumend one '*" "/' comment in the query '%s'",
+ DBUG_PRINT("info", ("consumend one '*" "/' comment in the query '%s'",
body_begin));
body.length-= 2;
body_end-= 2;
@@ -217,7 +217,7 @@ Event_parse_data::init_execute_at(THD *t
DBUG_ASSERT(starts_null && ends_null);
/* let's check whether time is in the past */
- thd->variables.time_zone->gmt_sec_to_TIME(&time_tmp,
+ thd->variables.time_zone->gmt_sec_to_TIME(&time_tmp,
(my_time_t) thd->query_start());
if ((not_used= item_execute_at->get_date(<ime, TIME_NO_ZERO_DATE)))
@@ -1073,7 +1073,7 @@ bool get_next_time(TIME *next, TIME *sta
{
longlong seconds_diff;
long microsec_diff;
-
+
if (calc_time_diff(time_now, start, 1, &seconds_diff, µsec_diff))
{
DBUG_PRINT("error", ("negative difference"));
@@ -1289,7 +1289,7 @@ Event_queue_element::compute_next_execut
}
goto ret;
}
- else if (starts_null && ends_null)
+ else if (starts_null && ends_null)
{
/* starts is always set, so this is a dead branch !! */
DBUG_PRINT("info", ("Neither STARTS nor ENDS are set"));
@@ -1333,7 +1333,7 @@ Event_queue_element::compute_next_execut
{
TIME next_exec;
- if (get_next_time(&next_exec, &starts, &time_now,
+ if (get_next_time(&next_exec, &starts, &time_now,
last_executed.year? &last_executed:&starts,
expression, interval))
goto err;
@@ -1851,7 +1851,8 @@ event_basic_identifier_equal(LEX_STRING
/*
- Switches the security context
+ Switches the security context.
+
SYNOPSIS
event_change_security_context()
thd Thread
@@ -1859,7 +1860,7 @@ event_basic_identifier_equal(LEX_STRING
host The host of the user
db The schema for which the security_ctx will be loaded
backup Where to store the old context
-
+
RETURN VALUE
FALSE OK
TRUE Error (generates error too)
@@ -1887,7 +1888,8 @@ event_change_security_context(THD *thd,
/*
- Restores the security context
+ Restores the security context.
+
SYNOPSIS
event_restore_security_context()
thd Thread
--- 1.12/sql/event_data_objects.h 2006-08-15 18:14:17 +02:00
+++ 1.13/sql/event_data_objects.h 2006-08-15 18:14:17 +02:00
@@ -37,7 +37,7 @@ public:
LEX_STRING dbname;
LEX_STRING name;
LEX_STRING definer;// combination of user and host
-
+
Event_basic();
virtual ~Event_basic();
@@ -90,7 +90,7 @@ public:
Event_queue_element();
virtual ~Event_queue_element();
-
+
virtual int
load_from_row(TABLE *table);
@@ -187,7 +187,7 @@ private:
int
get_fake_create_event(THD *thd, String *buf);
- Event_job_data(const Event_job_data &); /* Prevent use of these */
+ Event_job_data(const Event_job_data &); /* Prevent use of these */
void operator=(Event_job_data &);
};
| Thread |
|---|
| • bk commit into 5.1 tree (andrey:1.2279) | ahristov | 15 Aug |
