[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2744)

17 Sep 2009

#At lp:maria based on revid:igor@askmonty.org-20090916174301-lzzh1r0khn3dxwvp

 2744 Igor Babaev	2009-09-16
      Fixed a failure of the merge_innodb test on windows.
modified:
  storage/myisammrg/ha_myisammrg.cc

=== 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 03:36:21 +0000
@@ -309,7 +309,7 @@ static MI_INFO *myisammrg_attach_childre
   TABLE         *parent;
   TABLE         *child;
   TABLE_LIST    *child_l;
-  MI_INFO       *myisam;
+  MI_INFO       *myisam= NULL;
   DBUG_ENTER("myisammrg_attach_children_callback");
 
   my_errno= 0;

    