1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A fix for events_trans.test failure on many hosts (5.1-runtime)

Browse Source 
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).
This commit is contained in:
unknown 2007-04-06 01:53:15 +04:00
parent 25677bdc2e
commit a06ff97656
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/event_data_objects.cc
View File

@ -1043,6 +1043,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
status = Event_queue_element::SLAVESIDE_DISABLED;
break;
case 'D' :
default:
status = Event_queue_element::DISABLED;
break;
}

10
sql/events.cc
View File

@ -387,7 +387,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data,
if (check_db_dir_existence(parse_data->dbname.str))
{
my_error(ER_BAD_DB_ERROR, MYF(0));
my_error(ER_BAD_DB_ERROR, MYF(0), parse_data->dbname.str);
DBUG_RETURN(TRUE);
}
@ -508,7 +508,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data,
/* Check that the target database exists */
if (check_db_dir_existence(new_dbname->str))
{
my_error(ER_BAD_DB_ERROR, MYF(0));
my_error(ER_BAD_DB_ERROR, MYF(0), new_dbname->str);
DBUG_RETURN(TRUE);
}
}
@ -1116,7 +1116,7 @@ Events::load_events_from_db(THD *thd)
DBUG_ENTER("Events::load_events_from_db");
DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
if ((ret= db_repository->open_event_table(thd, TL_WRITE, &table)))
if (db_repository->open_event_table(thd, TL_WRITE, &table))
{
sql_print_error("Event Scheduler: Failed to open table mysql.event");
DBUG_RETURN(TRUE);
@ -1137,8 +1137,8 @@ Events::load_events_from_db(THD *thd)
if (et->load_from_row(thd, table))
{
sql_print_error("Event Scheduler: "
"Error while reading from mysql.event. "
"The table is probably corrupted");
"Error while loading events from mysql.event. "
"The table probably contains bad data or is corrupted");
delete et;
goto end;
}