1. Fix compilation on Windows;

2. Fix trigger.test.

server-tools/instance-manager/log.cc

@@ -22,6 +22,8 @@
 
 #include <stdarg.h>
 
+#include "portability.h" /* for vsnprintf() on Windows. */
+
 /*
   TODO:
   - add flexible header support

sql/sql_trigger.cc

@@ -1412,8 +1412,8 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db,
   }
   if (table.triggers)
   {
-    LEX_STRING old_table_name= { (char *) STRING_WITH_LEN(old_table) };
-    LEX_STRING new_table_name= { (char *) STRING_WITH_LEN(new_table) };
+    LEX_STRING old_table_name= { (char *) old_table, strlen(old_table) };
+    LEX_STRING new_table_name= { (char *) new_table, strlen(new_table) };
     /*
       Since triggers should be in the same schema as their subject tables
       moving table with them between two schemas raises too many questions.