mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug#14589559: ASSERTION `FILE_ENTRY_BUF[2] == 0' FAILED

Browse source 
IN DEACTIVATE_DDL_LOG_ENTRY

Update of comments according to reviewers request.
This commit is contained in:
Mattias Jonsson 2012-11-30 16:17:38 +01:00
parent 5f4dc7531f
commit 17076f8cd3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_table.cc
View file

@ -823,6 +823,7 @@ static void set_ddl_log_entry_from_buf(uint read_entry,
{
uint inx;
uchar single_char;
DBUG_ENTER("set_ddl_log_entry_from_buf");
ddl_log_entry->entry_pos= read_entry;
single_char= file_entry_buf[DDL_LOG_ENTRY_TYPE_POS];
ddl_log_entry->entry_type= (enum ddl_log_entry_code)single_char;
@ -835,6 +836,7 @@ static void set_ddl_log_entry_from_buf(uint read_entry,
ddl_log_entry->from_name= (char*) &file_entry_buf[inx];
inx+= global_ddl_log.name_len;
ddl_log_entry->handler_name= (char*) &file_entry_buf[inx];
DBUG_VOID_RETURN;
}
@ -1396,7 +1398,7 @@ bool execute_ddl_log_entry(THD *thd, uint first_entry)
{
if (read_ddl_log_file_entry(file_entry_buf, read_entry, IO_SIZE))
{
/* Write to error log and continue with next log entry */
/* Print the error to the log and continue with next log entry */
sql_print_error("Failed to read entry = %u from ddl log",
read_entry);
break;
@ -1407,7 +1409,7 @@ bool execute_ddl_log_entry(THD *thd, uint first_entry)
if (execute_ddl_log_action(thd, &ddl_log_entry))
{
/* Write to error log and continue with next log entry */
/* Print the error to the log and continue with next log entry */
sql_print_error("Failed to execute action for entry = %u from ddl log",
read_entry);
break;