Revert "Test pull request to validate the GitHub workflow"

lth · Facebook Github Bot · commit 8670dcf756d8 · 2016-10-27T10:52:14.000-07:00
Summary: This reverts commit 5ae7f41. Closes #360 Differential Revision: D4089450 Pulled By: lth fbshipit-source-id: 945bd28
diff --git a/VERSION b/VERSION
@@ -2,5 +2,3 @@ MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
 MYSQL_VERSION_PATCH=27
 MYSQL_VERSION_EXTRA=
-MYSQL_SOMETHING=
-MYSQL_SOMETHING_SOMETHING=
diff --git a/sql/uuid.cc b/sql/uuid.cc
@@ -17,7 +17,6 @@
 
 #include "rpl_gtid.h"
 
-// Another comment.
 
 /*
 const size_t Uuid::TEXT_LENGTH;
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
@@ -20,8 +20,6 @@
 
 #define MYSQL_SERVER 1
 
-// One more comment.
-
 /* The C++ file's header */
 #include "./ha_rocksdb.h"
 
@@ -3306,8 +3304,6 @@ static int rocksdb_init_func(void *p)
 #endif
 
   rocksdb_hton= (handlerton *)p;
-  DBUG_ASSERT(rocksdb_hton != nullptr);
-
   mysql_mutex_init(rdb_psi_open_tbls_mutex_key, &rdb_open_tables.m_mutex,
                    MY_MUTEX_INIT_FAST);
 #ifdef HAVE_PSI_INTERFACE
diff --git a/storage/rocksdb/rdb_buff.h b/storage/rocksdb/rdb_buff.h
@@ -20,9 +20,6 @@
 #include <string>
 #include <vector>
 
-#if 1
-#endif
-
 namespace myrocks {
 
 /*
