after-merge fix

sql/table.cc: do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set

after-merge fix
sql/table.cc: do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set
f2204146 · unknown · 9ce04bc2 · f2204146
Commit f2204146 authored Aug 03, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/table.cc sql/table.cc +2 -1

No files found.
--- 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++;