summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2012-11-30 16:17:38 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2012-11-30 16:17:38 +0100
commitfbe1315bd903a76497f78397667075f3b760d924 (patch)
tree4d86f900bee2e6719b8c7e889dbe2246d0dc14e4 /sql/sql_table.cc
parent60f5f314684d15df091c7684a22ea8cfa3a429d9 (diff)
downloadmariadb-git-fbe1315bd903a76497f78397667075f3b760d924.tar.gz
bug#14589559: ASSERTION `FILE_ENTRY_BUF[2] == 0' FAILED
IN DEACTIVATE_DDL_LOG_ENTRY Update of comments according to reviewers request.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index cf725a5261d..e9f6022aca4 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -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;