Redefinition of myisam_bulk_insert_tree_size

Removed new error message
Fixed test case for varbinary
Threads are again killable in "merge_buffers"
Cleanup of sql_repl.cc
SHOW OPEN TABLES now works when no tables are opened

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index f38ddef05a2..d203894cf27 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -245,9 +245,9 @@ public:
   int get_data_size()
   {
     return q_len + db_len + 2 +
-      sizeof(uint32) // thread_id
-      + sizeof(uint32) // exec_time
-      + sizeof(uint16) // error_code
+      4		// thread_id
+      + 4	// exec_time
+      + 2	// error_code
       ;
   }