bk commit into 5.1 tree (anozdrin:1.2363)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2363 06/05/19 16:01:04 anozdrin@stripped +2 -0
  1. Fix compilation on Windows;
  2. Fix trigger.test.

  sql/sql_trigger.cc
    1.56 06/05/19 16:01:01 anozdrin@stripped +2 -2
    Use strlen() instead of sizeof() for C-strings.

  server-tools/instance-manager/log.cc
    1.10 06/05/19 16:01:01 anozdrin@stripped +2 -0
    Fix compilation in Windows.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	station.home
# Root:	/mnt/raid/MySQL/devel/5.1-rt-wl3158

--- 1.55/sql/sql_trigger.cc	2006-05-18 18:57:44 +04:00
+++ 1.56/sql/sql_trigger.cc	2006-05-19 16:01:01 +04:00
@@ -1412,8 +1412,8 @@
   }
   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.

--- 1.9/server-tools/instance-manager/log.cc	2006-05-18 18:57:44 +04:00
+++ 1.10/server-tools/instance-manager/log.cc	2006-05-19 16:01:01 +04:00
@@ -22,6 +22,8 @@
 
 #include <stdarg.h>
 
+#include "portability.h" /* for vsnprintf() on Windows. */
+
 /*
   TODO:
   - add flexible header support