bk commit into 5.1 tree (df:1.2598)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-03 22:02:19+02:00, df@stripped +1 -0
  after-merge fix

  sql/table.cc@stripped, 2007-08-03 22:02:17+02:00, df@stripped +2 -1
    do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set

diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2007-08-03 16:54:37 +02:00
+++ b/sql/table.cc	2007-08-03 22:02:17 +02:00
@@ -1878,7 +1878,8 @@ int open_table_from_share(THD *thd, TABL
   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++;