compiler warning

sql/table.h:1531:17: warning: enumeral and non-enumeral type in conditional expression [-Wextra]

compiler warning
sql/table.h:1531:17: warning: enumeral and non-enumeral type in conditional expression [-Wextra]
368ad5ec · Sergei Golubchik · Eugene Kosov · c968a7eb · 368ad5ec
Commit 368ad5ec authored Dec 21, 2017 by Sergei Golubchik Committed by Eugene Kosov Dec 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

sql/table.h sql/table.h +9 -2

No files found.
--- a/sql/table.h
+++ b/sql/table.h
@@ -1525,10 +1525,17 @@ struct TABLE
   */
  bool vers_write;

-  bool versioned(vers_sys_type_t type= VERS_UNDEFINED) const
+  bool versioned() const
  {
    DBUG_ASSERT(s);
-    return type ? s->versioned == type : s->versioned;
+    return s->versioned;
+  }
+
+  bool versioned(vers_sys_type_t type) const
+  {
+    DBUG_ASSERT(s);
+    DBUG_ASSERT(type);
+    return s->versioned == type;
  }

  bool versioned_write(vers_sys_type_t type= VERS_UNDEFINED) const