bk commit into 5.0 tree (antony:1.2481)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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@stripped, 2007-07-24 10:33:49-07:00, antony@stripped +1 -0
  fix compile on Windows for bug25714.c

  tests/bug25714.c@stripped, 2007-07-24 10:33:46-07:00, antony@stripped +7 -3
    fix compile on Windows

diff -Nrup a/tests/bug25714.c b/tests/bug25714.c
--- a/tests/bug25714.c	2007-07-23 23:35:40 -07:00
+++ b/tests/bug25714.c	2007-07-24 10:33:46 -07:00
@@ -13,10 +13,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_global.h>
+#include <my_sys.h>
 #include <mysql.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <m_string.h>
 #include <assert.h>
 
 int main (int argc, char **argv)
@@ -27,6 +27,9 @@ int main (int argc, char **argv)
   const char* query4= "INSERT INTO federated.t1 SET Value=54";
   const char* query5= "INSERT INTO federated.t1 SET Value=55";
 
+  DEBUGGER_OFF;
+  MY_INIT(argv[0]);
+
   if (argc != 2)
     return -1;
 
@@ -63,6 +66,7 @@ int main (int argc, char **argv)
          (long) mysql_insert_id(&conn));
 
   mysql_close(&conn);
+  my_end(0);
 
   return 0;
 };