diff options
| -rw-r--r-- | sql/examples/ha_archive.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc index fd47b45ce52..1756bae02a1 100644 --- a/sql/examples/ha_archive.cc +++ b/sql/examples/ha_archive.cc @@ -258,7 +258,7 @@ int ha_archive::write_data_header(gzFile file_to_write) data_buffer[1]= (uchar)ARCHIVE_VERSION; if (gzwrite(file_to_write, &data_buffer, DATA_BUFFER_SIZE) != - sizeof(DATA_BUFFER_SIZE)) + DATA_BUFFER_SIZE) goto error; DBUG_PRINT("ha_archive::write_data_header", ("Check %u", (uint)data_buffer[0])); DBUG_PRINT("ha_archive::write_data_header", ("Version %u", (uint)data_buffer[1])); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 8874a70327e..35734bcc31b 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2388,11 +2388,16 @@ send_result_message: } default: // Probably HA_ADMIN_INTERNAL_ERROR - protocol->store("error", 5, system_charset_info); - protocol->store("Unknown - internal error during operation", 41 - , system_charset_info); - fatal_error=1; - break; + { + char buf[ERRMSGSIZE+20]; + uint length=my_snprintf(buf, ERRMSGSIZE, + "Unknown - internal error %d during operation", + result_code); + protocol->store("error", 5, system_charset_info); + protocol->store(buf, length, system_charset_info); + fatal_error=1; + break; + } } if (fatal_error) table->table->s->version=0; // Force close of table |