|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/*
|
|
|
|
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. |
|
|
|
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. |
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify |
|
|
|
it under the terms of the GNU General Public License as published by |
|
|
|
@ -1105,6 +1105,7 @@ bool write_ddl_log_entry(DDL_LOG_ENTRY *ddl_log_entry, |
|
|
|
{ |
|
|
|
DBUG_RETURN(TRUE); |
|
|
|
} |
|
|
|
memset(file_entry_buf, 0, sizeof(file_entry_buf)); |
|
|
|
file_entry_buf[DDL_LOG_ENTRY_TYPE_POS]= |
|
|
|
(char)DDL_LOG_ENTRY_CODE; |
|
|
|
file_entry_buf[DDL_LOG_ACTION_TYPE_POS]= |
|
|
|
@ -1199,6 +1200,7 @@ bool write_execute_ddl_log_entry(uint first_entry, |
|
|
|
{ |
|
|
|
DBUG_RETURN(TRUE); |
|
|
|
} |
|
|
|
memset(file_entry_buf, 0, sizeof(file_entry_buf)); |
|
|
|
if (!complete) |
|
|
|
{ |
|
|
|
/*
|
|
|
|
@ -1212,12 +1214,7 @@ bool write_execute_ddl_log_entry(uint first_entry, |
|
|
|
} |
|
|
|
else |
|
|
|
file_entry_buf[DDL_LOG_ENTRY_TYPE_POS]= (char)DDL_IGNORE_LOG_ENTRY_CODE; |
|
|
|
file_entry_buf[DDL_LOG_ACTION_TYPE_POS]= 0; /* Ignored for execute entries */ |
|
|
|
file_entry_buf[DDL_LOG_PHASE_POS]= 0; |
|
|
|
int4store(&file_entry_buf[DDL_LOG_NEXT_ENTRY_POS], first_entry); |
|
|
|
file_entry_buf[DDL_LOG_NAME_POS]= 0; |
|
|
|
file_entry_buf[DDL_LOG_NAME_POS + global_ddl_log.name_len]= 0; |
|
|
|
file_entry_buf[DDL_LOG_NAME_POS + 2*global_ddl_log.name_len]= 0; |
|
|
|
if (!(*active_entry)) |
|
|
|
{ |
|
|
|
if (get_free_ddl_log_entry(active_entry, &write_header)) |
|
|
|
|