From eba0752b45f3d35f641503d2e82bed1a194bcdff Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Fri, 3 Aug 2007 22:02:19 +0200
Subject: [PATCH] after-merge fix

---
 sql/table.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/table.cc b/sql/table.cc
index 8eb1da9cad1..12fffe1dde7 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1878,7 +1878,8 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
   bzero((char*) bitmaps, bitmap_size*3);
 #endif
 
-  outparam->no_replicate= test(outparam->file->ha_table_flags() &
+  outparam->no_replicate= outparam->file &&
+                          test(outparam->file->ha_table_flags() &
                                HA_HAS_OWN_BINLOGGING);
   thd->status_var.opened_tables++;