merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.

mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/handler.h b/sql/handler.h
index b7d4d689d40..a218de6a1e5 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1198,6 +1198,9 @@ public:
   {
     return inited == INDEX ? ha_index_end() : inited == RND ? ha_rnd_end() : 0;
   }
+  /**
+    The cached_table_flags is set at ha_open and ha_external_lock
+  */
   Table_flags ha_table_flags() const { return cached_table_flags; }
   /**
     These functions represent the public interface to *users* of the
@@ -1738,7 +1741,7 @@ public:
     if (ht->alter_table_flags)
       return ht->alter_table_flags(flags);
     return 0;
-  } 
+  }
 
 protected:
   /* Service methods for use by storage engines. */