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-09-13 13:08:16+02:00, andrey@stripped +5 -0
allign
sql/event_data_objects.cc@stripped, 2006-09-13 13:08:10+02:00, andrey@stripped +1 -1
allign
sql/event_db_repository.cc@stripped, 2006-09-13 13:08:10+02:00, andrey@stripped +3 -1
allign
sql/event_queue.cc@stripped, 2006-09-13 13:08:10+02:00, andrey@stripped +3 -1
allign
sql/event_scheduler.cc@stripped, 2006-09-13 13:08:11+02:00, andrey@stripped +1 -1
allign
sql/events.cc@stripped, 2006-09-13 13:08:11+02:00, andrey@stripped +19 -16
allign
# 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-tree4_experiment
--- 1.67/sql/events.cc 2006-09-13 13:08:27 +02:00
+++ 1.68/sql/events.cc 2006-09-13 13:08:27 +02:00
@@ -43,6 +43,9 @@
*/
+#define DBUG_PRINT_MINE(a,b) DBUG_PRINT(a, b); sql_print_information b;
+#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
+
/*
If the user (un)intentionally removes an event directly from mysql.event
@@ -341,7 +344,7 @@ bool
Events::create_event(THD *thd, Event_parse_data *parse_data, bool if_not_exists)
{
int ret;
- DBUG_ENTER("Events::create_event");
+ DBUG_ENTER_MINE("Events::create_event");
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -388,7 +391,7 @@ bool
Events::update_event(THD *thd, Event_parse_data *parse_data, sp_name *rename_to)
{
int ret;
- DBUG_ENTER("Events::update_event");
+ DBUG_ENTER_MINE("Events::update_event");
LEX_STRING *new_dbname= rename_to ? &rename_to->m_db : NULL;
LEX_STRING *new_name= rename_to ? &rename_to->m_name : NULL;
if (unlikely(check_system_tables_error))
@@ -439,7 +442,7 @@ Events::drop_event(THD *thd, LEX_STRING
bool only_from_disk)
{
int ret;
- DBUG_ENTER("Events::drop_event");
+ DBUG_ENTER_MINE("Events::drop_event");
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -472,8 +475,8 @@ Events::drop_schema_events(THD *thd, cha
{
LEX_STRING const db_lex= { db, strlen(db) };
- DBUG_ENTER("Events::drop_schema_events");
- DBUG_PRINT("enter", ("dropping events from %s", db));
+ DBUG_ENTER_MINE("Events::drop_schema_events");
+ DBUG_PRINT_MINE("enter", ("dropping events from %s", db));
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -509,8 +512,8 @@ Events::show_create_event(THD *thd, LEX_
int ret;
Event_timed *et= new Event_timed();
- DBUG_ENTER("Events::show_create_event");
- DBUG_PRINT("enter", ("name: %s@%s", dbname.str, name.str));
+ DBUG_ENTER_MINE("Events::show_create_event");
+ DBUG_PRINT_MINE("enter", ("name: %s@%s", dbname.str, name.str));
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -585,7 +588,7 @@ int
Events::fill_schema_events(THD *thd, TABLE_LIST *tables, COND * /* cond */)
{
char *db= NULL;
- DBUG_ENTER("Events::fill_schema_events");
+ DBUG_ENTER_MINE("Events::fill_schema_events");
Events *myself= get_instance();
if (unlikely(myself->check_system_tables_error))
{
@@ -628,7 +631,7 @@ Events::init()
{
THD *thd;
bool res= FALSE;
- DBUG_ENTER("Events::init");
+ DBUG_ENTER_MINE("Events::init");
if (opt_event_scheduler == Events::EVENTS_DISABLED)
DBUG_RETURN(FALSE);
@@ -690,7 +693,7 @@ end:
void
Events::deinit()
{
- DBUG_ENTER("Events::deinit");
+ DBUG_ENTER_MINE("Events::deinit");
if (likely(!check_system_tables_error))
{
scheduler->stop();
@@ -749,7 +752,7 @@ Events::destroy_mutexes()
void
Events::dump_internal_status()
{
- DBUG_ENTER("Events::dump_internal_status");
+ DBUG_ENTER_MINE("Events::dump_internal_status");
puts("\n\n\nEvents status:");
puts("LLA = Last Locked At LUA = Last Unlocked At");
puts("WOC = Waiting On Condition DL = Data Locked");
@@ -775,7 +778,7 @@ Events::dump_internal_status()
bool
Events::start_execution_of_events()
{
- DBUG_ENTER("Events::start_execution_of_events");
+ DBUG_ENTER_MINE("Events::start_execution_of_events");
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -801,7 +804,7 @@ Events::start_execution_of_events()
bool
Events::stop_execution_of_events()
{
- DBUG_ENTER("Events::stop_execution_of_events");
+ DBUG_ENTER_MINE("Events::stop_execution_of_events");
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -825,7 +828,7 @@ Events::stop_execution_of_events()
bool
Events::is_execution_of_events_started()
{
- DBUG_ENTER("Events::is_execution_of_events_started");
+ DBUG_ENTER_MINE("Events::is_execution_of_events_started");
if (unlikely(check_system_tables_error))
{
my_error(ER_EVENTS_DB_ERROR, MYF(0));
@@ -857,8 +860,8 @@ Events::check_system_tables(THD *thd)
Open_tables_state backup;
bool ret= FALSE;
- DBUG_ENTER("Events::check_system_tables");
- DBUG_PRINT("enter", ("thd=0x%lx", thd));
+ DBUG_ENTER_MINE("Events::check_system_tables");
+ DBUG_PRINT_MINE("enter", ("thd=0x%lx", thd));
thd->reset_n_backup_open_tables_state(&backup);
--- 1.18/sql/event_db_repository.cc 2006-09-13 13:08:27 +02:00
+++ 1.19/sql/event_db_repository.cc 2006-09-13 13:08:27 +02:00
@@ -23,7 +23,7 @@
#include "sp_head.h"
#define DBUG_PRINT_MINE(a,b) DBUG_PRINT(a, b); sql_print_information b;
-#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
+#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
static
time_t mysql_event_last_create_time= 0L;
@@ -675,7 +675,9 @@ Event_db_repository::update_event(THD *t
DBUG_PRINT_MINE("info", ("name: %s", parse_data->name.str));
DBUG_PRINT_MINE("info", ("user: %s", parse_data->definer.str));
if (new_dbname)
+ {
DBUG_PRINT_MINE("info", ("rename to: %s@%s", new_dbname->str, new_name->str));
+ }
/* first look whether we overwrite */
if (new_name)
--- 1.16/sql/event_queue.cc 2006-09-13 13:08:27 +02:00
+++ 1.17/sql/event_queue.cc 2006-09-13 13:08:27 +02:00
@@ -20,7 +20,7 @@
#include "event_db_repository.h"
#define DBUG_PRINT_MINE(a,b) DBUG_PRINT(a, b); sql_print_information b;
-#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
+#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
#define EVENT_QUEUE_INITIAL_SIZE 30
#define EVENT_QUEUE_EXTENT 30
@@ -806,8 +806,10 @@ end:
ret, *job_data, abstime? abstime->tv_sec:0));
if (*job_data)
+ {
DBUG_PRINT_MINE("info", ("db=%s name=%s definer=%s", (*job_data)->dbname.str,
(*job_data)->name.str, (*job_data)->definer.str));
+ }
DBUG_RETURN(ret);
}
--- 1.30/sql/event_scheduler.cc 2006-09-13 13:08:27 +02:00
+++ 1.31/sql/event_scheduler.cc 2006-09-13 13:08:27 +02:00
@@ -21,7 +21,7 @@
#include "event_queue.h"
#define DBUG_PRINT_MINE(a,b) DBUG_PRINT(a, b); sql_print_information b;
-#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
+#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
#ifdef __GNUC__
--- 1.77/sql/event_data_objects.cc 2006-09-13 13:08:27 +02:00
+++ 1.78/sql/event_data_objects.cc 2006-09-13 13:08:27 +02:00
@@ -22,7 +22,7 @@
#include "sp_head.h"
#define DBUG_PRINT_MINE(a,b) DBUG_PRINT(a, b); sql_print_information b;
-#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
+#define DBUG_ENTER_MINE(a) DBUG_ENTER(a); sql_print_information("enter %s", a);
#define EVEX_MAX_INTERVAL_VALUE 1000000000L
| Thread |
|---|
| • bk commit into 5.1 tree (andrey:1.2316) | ahristov | 13 Sep |
