bzr push into mysql-5.0 branch (timothy.smith:2642 to 2643) Bug#37380

[Timothy Smith]

 2643 Timothy Smith	2008-07-02
      Fix "C++ code in C file" syntax error in mysys/default.c
modified:
  mysys/default.c

 2642 Patrick Crews	2008-07-01
      Bug#37380 - Test funcs_1.is_columns_myisam_embedded fails on OS X
      
      Test was failing due to the addition of a '\x05' character in result sets
      Latest builds of the server have shown this problem to have disappeared.
      Removing code within the test that disables the test on Mac OS X.
      
      Recommit due to tree error on earlier, approved patch.
modified:
  mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test

=== modified file 'mysys/default.c'
--- a/mysys/default.c	2008-06-25 01:25:23 +0000
+++ b/mysys/default.c	2008-07-02 14:37:29 +0000
@@ -1015,10 +1015,12 @@ static uint my_get_system_windows_direct
 
 static const char *my_get_module_parent(char *buf, size_t size)
 {
+  char *last= NULL;
+  char *end;
   if (!GetModuleFileName(NULL, buf, size))
     return NULL;
+  end= strend(buf);
 
-  char *last= NULL, *end= strend(buf);
   /*
     Look for the second-to-last \ in the filename, but hang on
     to a pointer after the last \ in case we're in the root of