diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2012-12-27 02:43:20 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2012-12-27 02:43:20 +0100 |
| commit | 544f413df9c38a0ea28df0037728bd3e264f721a (patch) | |
| tree | 28538d0e26a82599cd1616c2e0be5e89de63525e /sql | |
| parent | 0bb3fb3b3d4f9357423e6ef9a1520930a8b83acd (diff) | |
| parent | 6b7182d9a3a073a7e2d586b3182c27de154aad08 (diff) | |
| download | mariadb-git-544f413df9c38a0ea28df0037728bd3e264f721a.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_partition.cc | 1 | ||||
| -rw-r--r-- | sql/sql_table.cc | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 8c9f82448aa..6e1b3fc37b8 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -3637,6 +3637,7 @@ int ha_partition::truncate_partition(Alter_info *alter_info, bool *binlog_stmt) part, sub_elem->partition_name)); if ((error= m_file[part]->ha_truncate())) break; + sub_elem->part_state= PART_NORMAL; } while (++j < num_subparts); } else diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 043906800da..8bbe29cb3cf 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1140,6 +1140,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]= @@ -1234,6 +1235,7 @@ bool write_execute_ddl_log_entry(uint first_entry, { DBUG_RETURN(TRUE); } + memset(file_entry_buf, 0, sizeof(file_entry_buf)); if (!complete) { /* @@ -1247,12 +1249,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)) |