summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-09-18 03:01:09 +0400
committerSergey Petrunya <psergey@askmonty.org>2009-09-18 03:01:09 +0400
commitf974f10cf1e790a162a46d662061fd08b050c648 (patch)
tree572e9ae3113bc8ba15c7992d8d7b80aff258371d /storage
parent23958fe046356fe646cac7b963c1f6503f071935 (diff)
downloadmariadb-git-f974f10cf1e790a162a46d662061fd08b050c648.tar.gz
Apply Igor's fix:
Fixed a failure of the merge_innodb test on windows. storage/myisammrg/ha_myisammrg.cc: Fixed a failure of the merge_innodb test on windows.
Diffstat (limited to 'storage')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 67f2d6457c7..fca8d94172c 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -309,7 +309,7 @@ static MI_INFO *myisammrg_attach_children_callback(void *callback_param)
TABLE *parent;
TABLE *child;
TABLE_LIST *child_l;
- MI_INFO *myisam;
+ MI_INFO *myisam= NULL;
DBUG_ENTER("myisammrg_attach_children_callback");
my_errno= 0;