maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/

------------------------------------------------------------
revno: 2748
revision-id: psergey@xxxxxxxxxxxx-20090917230109-mni2vfp5mtgxpbhw
parent: psergey@xxxxxxxxxxxx-20090917224610-zeizjpwa3xp740bs
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: mysql-5.1-maria-contd4
timestamp: Fri 2009-09-18 03:01:09 +0400
message:
  Apply Igor's fix:
  Fixed a failure of the merge_innodb test on windows.
=== modified file 'storage/myisammrg/ha_myisammrg.cc'
--- a/storage/myisammrg/ha_myisammrg.cc	2009-09-07 20:50:10 +0000
+++ b/storage/myisammrg/ha_myisammrg.cc	2009-09-17 23:01:09 +0000
@@ -309,7 +309,7 @@
   TABLE         *parent;
   TABLE         *child;
   TABLE_LIST    *child_l;
-  MI_INFO       *myisam;
+  MI_INFO       *myisam= NULL;
   DBUG_ENTER("myisammrg_attach_children_callback");
 
   my_errno= 0;