bzr push into mysql-6.0 branch (vvaintroub:2815)

[Vladislav Vaintroub]

 2815 Vladislav Vaintroub	2008-09-01 [merge]
      merge
modified:
  mysql-test/r/partition.result
  mysql-test/t/partition.test

=== modified file 'libmysql/dll.c'
--- a/libmysql/dll.c	2008-04-28 16:24:05 +0000
+++ b/libmysql/dll.c	2008-09-01 18:09:29 +0000
@@ -89,9 +89,20 @@ BOOL APIENTRY LibMain(HANDLE hInst,DWORD
   UNREFERENCED_PARAMETER(lpReserved);
 } /* LibMain */
 
+
+static BOOL do_libmain;
 int __stdcall DllMain(HANDLE hInst,DWORD ul_reason_being_called,LPVOID lpReserved)
 {
-  return LibMain(hInst,ul_reason_being_called,lpReserved);
+  /*
+    Unless environment variable LIBMYSQL_DLLINIT is set, do nothing.
+    The environment variable is checked once, during the first call to DllMain()
+    (in DLL_PROCESS_ATTACH hook).
+  */
+  if (ul_reason_being_called == DLL_PROCESS_ATTACH)
+    do_libmain = (getenv("LIBMYSQL_DLLINIT") != NULL);
+  if (do_libmain)
+    return LibMain(hInst,ul_reason_being_called,lpReserved);
+  return TRUE;
 }
 
 #elif defined(WINDOWS)

=== removed file 'mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data'
Binary files c:\users\vvaint~1\appdata\local\temp\bzr-diff-old-bu9rns and c:\users\vvaint~1\appdata\local\temp\bzr-diff-new-divnx4 differ

=== removed file 'mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data'
Binary files c:\users\vvaint~1\appdata\local\temp\bzr-diff-old-qkrngp and c:\users\vvaint~1\appdata\local\temp\bzr-diff-new-p11nax differ