diff --git a/Doxyfile b/Doxyfile
index ba3868e4e30d..791e9a3da6ff 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -95,7 +95,7 @@ PROJECT_NAME           = MySQL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 5.8.0
+PROJECT_NUMBER         = 8.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/INSTALL b/INSTALL
index 70e0a448924b..b21a703e1065 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,8 @@ Pre-built binaries in different package formats can be found on
 
 You can find information about how to install from a source distribution at
 
-  http://dev.mysql.com/doc/refman/5.8/en/source-installation.html
+  http://dev.mysql.com/doc/refman/8.0/en/source-installation.html
 
-The MySQL 5.8 Reference Manual is available on
+The MySQL 8.0 Reference Manual is available on
 
-  http://dev.mysql.com/doc/refman/5.8/en/
+  http://dev.mysql.com/doc/refman/8.0/en/
diff --git a/VERSION b/VERSION
index 32f270b1b192..dfb2cd1c4fae 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-MYSQL_VERSION_MAJOR=5
-MYSQL_VERSION_MINOR=8
+MYSQL_VERSION_MAJOR=8
+MYSQL_VERSION_MINOR=0
 MYSQL_VERSION_PATCH=0
 MYSQL_VERSION_EXTRA=-dmr
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 3d94879b3dce..88d17eeaf87a 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2198,6 +2198,7 @@ static Exit_status check_master_version()
     glob_description_event= new Format_description_log_event(3);
     break;
   case '5':
+  case '8':
     /*
       The server is soon going to send us its Format_description log
       event, unless it is a 5.0 server with 3.23 or 4.0 binlogs.
diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result
index 99fab38d7a71..1f1f2be0b4f1 100644
--- a/mysql-test/r/comments.result
+++ b/mysql-test/r/comments.result
@@ -10,7 +10,7 @@ ERROR 42000: Query was empty
 select 1 /*!32301 +1 */;
 1  +1
 2
-select 1 /*!52301 +1 */;
+select 1 /*!999999 +1 */;
 1
 1
 select 1--1;
diff --git a/mysql-test/r/ctype_unicode800.result b/mysql-test/r/ctype_unicode800.result
index 9b7f2baf244d..a77a86e660a1 100644
--- a/mysql-test/r/ctype_unicode800.result
+++ b/mysql-test/r/ctype_unicode800.result
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS t1;
 #
-# Start of 5.8 tests
+# Start of 8.0 tests
 #
 #
 # WL#9125: Add utf8mb4_800_ci_ai
@@ -942,5 +942,5 @@ a = b
 1
 DROP TABLE t1;
 #
-# End of 5.8 tests
+# End of 8.0 tests
 #
diff --git a/mysql-test/r/mysql_ssl.result b/mysql-test/r/mysql_ssl.result
index caa701537242..e0cc3e438cad 100644
--- a/mysql-test/r/mysql_ssl.result
+++ b/mysql-test/r/mysql_ssl.result
@@ -6,4 +6,4 @@ End of 5.7 tests
 #
 # WL#9091: Remove --ssl, --ssl-verify-server-cert client-side options
 #
-End of 5.8 tests
+End of 8.0 tests
diff --git a/mysql-test/suite/innodb/r/log_corruption.result b/mysql-test/suite/innodb/r/log_corruption.result
index f576ccae8558..afea7c0fd82c 100644
--- a/mysql-test/suite/innodb/r/log_corruption.result
+++ b/mysql-test/suite/innodb/r/log_corruption.result
@@ -9,7 +9,7 @@
 # --innodb-force-recovery=6 (skip the entire redo log)
 # valid header, valid checkpoint 1, all-zero (invalid) checkpoint 2, invalid block number
 # --innodb-force-recovery=6 (skip the entire redo log)
-# valid 5.8.0 header, valid checkpoint 1, all-zero (invalid) checkpoint 2, invalid block checksum
+# valid 8.0.0 header, valid checkpoint 1, all-zero (invalid) checkpoint 2, invalid block checksum
 # --innodb-force-recovery=6 (skip the entire redo log)
 # valid 5.7.9 header, valid checkpoint 1, no matching MLOG_CHECKSUM
 # --innodb-force-recovery=6 (skip the entire redo log)
diff --git a/mysql-test/suite/innodb/t/log_corruption.test b/mysql-test/suite/innodb/t/log_corruption.test
index d467ef1e56a1..c91a65fcd332 100644
--- a/mysql-test/suite/innodb/t/log_corruption.test
+++ b/mysql-test/suite/innodb/t/log_corruption.test
@@ -34,7 +34,7 @@ let SEARCH_PATTERN=InnoDB: Invalid redo log header checksum;
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption2.zip -d $newdir > $SEARCH_FILE
 --error 1
 --exec $MYSQLD $args
-let SEARCH_PATTERN=InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\\. Please follow the instructions at http://dev.mysql.com/doc/refman/5.8/en/upgrading-downgrading.html;
+let SEARCH_PATTERN=InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\\. Please follow the instructions at http://dev.mysql.com/doc/refman/8.0/en/upgrading-downgrading.html;
 --source include/search_pattern_in_file.inc
 
 --echo # redo log from MySQL 5.7.9, with corrupted log checkpoint
@@ -79,7 +79,7 @@ let SEARCH_PATTERN=Data Dictionary initialization failed;
 let SEARCH_PATTERN=InnoDB: Cannot create sys_virtual system tables. running in read-only mode;
 --source include/search_pattern_in_file.inc
 
---echo # valid 5.8.0 header, valid checkpoint 1, all-zero (invalid) checkpoint 2, invalid block checksum
+--echo # valid 8.0.0 header, valid checkpoint 1, all-zero (invalid) checkpoint 2, invalid block checksum
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption4b.zip -d $newdir > $SEARCH_FILE
 --error 1
diff --git a/mysql-test/suite/memcached/r/memc292_ibd2sdi_system_tablespace.result b/mysql-test/suite/memcached/r/memc292_ibd2sdi_system_tablespace.result
index e9d9efcf2cbf..80af7750264b 100644
--- a/mysql-test/suite/memcached/r/memc292_ibd2sdi_system_tablespace.result
+++ b/mysql-test/suite/memcached/r/memc292_ibd2sdi_system_tablespace.result
@@ -325,7 +325,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -1085,7 +1085,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -1266,7 +1266,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
diff --git a/mysql-test/suite/memcached/r/memc293_ibd2sdi.result b/mysql-test/suite/memcached/r/memc293_ibd2sdi.result
index 3b13cf592f0d..3e33186a1de4 100644
--- a/mysql-test/suite/memcached/r/memc293_ibd2sdi.result
+++ b/mysql-test/suite/memcached/r/memc293_ibd2sdi.result
@@ -320,7 +320,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -1159,11 +1159,11 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 Usage: IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -#, --debug[=name]  Output debug log. See
-                      http://dev.mysql.com/doc/refman/5.8/en/dbug-package.html
+                      http://dev.mysql.com/doc/refman/8.0/en/dbug-package.html
   -d, --dump-file=name 
                       Dump the tablespace SDI into the file passed by user.
                       Without the filename, it will default to stdout
@@ -1776,7 +1776,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -1912,7 +1912,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -2054,7 +2054,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/5.8/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.0/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
diff --git a/mysql-test/suite/memcached/t/memc293_ibd2sdi.test b/mysql-test/suite/memcached/t/memc293_ibd2sdi.test
index 7ffe060f0d18..3d95fd9d7a50 100644
--- a/mysql-test/suite/memcached/t/memc293_ibd2sdi.test
+++ b/mysql-test/suite/memcached/t/memc293_ibd2sdi.test
@@ -119,7 +119,7 @@ let MEMCACHED_TABLE_MAPPING = desc_t3;
 
 ## header contains version/platform information
 --replace_result $IBD2SDI IBD2SDI
---replace_regex /; Ver 5.*$//
+--replace_regex /; Ver 8.*$//
 --error 1
 --exec $IBD2SDI 2>&1
 
diff --git a/mysql-test/t/comments.test b/mysql-test/t/comments.test
index caa9c0634ebc..5679bc9617db 100644
--- a/mysql-test/t/comments.test
+++ b/mysql-test/t/comments.test
@@ -9,7 +9,7 @@ multi line comment */;
 --error 1065
  ;
 select 1 /*!32301 +1 */;
-select 1 /*!52301 +1 */;
+select 1 /*!999999 +1 */;
 select 1--1;
 # Note that the following returns 4 while it should return 2
 # This is because the mysqld server doesn't parse -- comments
diff --git a/mysql-test/t/ctype_unicode800.test b/mysql-test/t/ctype_unicode800.test
index 89538c5949be..93119497e284 100644
--- a/mysql-test/t/ctype_unicode800.test
+++ b/mysql-test/t/ctype_unicode800.test
@@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1;
 --enable_warnings
 
 --echo #
---echo # Start of 5.8 tests
+--echo # Start of 8.0 tests
 --echo #
 
 --echo #
@@ -100,5 +100,5 @@ SELECT a = b FROM t1;
 DROP TABLE t1;
 
 --echo #
---echo # End of 5.8 tests
+--echo # End of 8.0 tests
 --echo #
diff --git a/mysql-test/t/mysql_ssl.test b/mysql-test/t/mysql_ssl.test
index 0a69a1ae055e..44e3d9a042ce 100644
--- a/mysql-test/t/mysql_ssl.test
+++ b/mysql-test/t/mysql_ssl.test
@@ -29,7 +29,7 @@
 --error 2
 --exec $MYSQL --ssl-verify-server-cert
 
---echo End of 5.8 tests
+--echo End of 8.0 tests
 
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
diff --git a/packaging/deb-in/CMakeLists.txt b/packaging/deb-in/CMakeLists.txt
index 75cacf6f5d76..9b2ae7b40211 100644
--- a/packaging/deb-in/CMakeLists.txt
+++ b/packaging/deb-in/CMakeLists.txt
@@ -27,7 +27,7 @@ IF (NOT DEFINED DEB_CODENAME)
 ENDIF()
 # Commercial or community
 IF (DEB_PRODUCT STREQUAL "commercial")
-  SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Commercial Server 5.8")
+  SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Commercial Server 8.0")
   SET (DEB_PRODUCTNAME "commercial")
   SET (DEB_PRODUCTNAMEC "Commercial")
   SET (DEB_LICENSENAME "Advanced")
@@ -60,7 +60,7 @@ usr/lib/mysql/plugin/debug/firewall.so
   SET (DEB_REMOVEPATTERN "gpl.in")
 ELSE()
   SET (DEB_PRODUCT "community")
-  SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Server 5.8")
+  SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Server 8.0")
   SET (DEB_PRODUCTNAME "community")
   SET (DEB_PRODUCTNAMEC "Community")
   SET (DEB_LICENSENAME "GPL")
diff --git a/packaging/rpm-fedora/mysql.spec.in b/packaging/rpm-fedora/mysql.spec.in
index 64ba6a64987c..c20a58caaace 100644
--- a/packaging/rpm-fedora/mysql.spec.in
+++ b/packaging/rpm-fedora/mysql.spec.in
@@ -60,7 +60,7 @@
 %global license_type          GPLv2
 %endif
 
-%global min                   5.8.0
+%global min                   8.0.0
 
 Name:           mysql-%{product_suffix}
 Summary:        A very fast and reliable SQL database server
@@ -546,6 +546,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %doc release/Docs/INFO_BIN*
 %doc release/support-files/my-default.cnf
 %attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/ibd2sdi.1*
 %attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
 %attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
 %attr(644, root, root) %{_mandir}/man1/myisamchk.1*
@@ -849,6 +850,11 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+=======
+* Thu Jun 05 2016 Erlend Dahl <erlend.dahl@oracle.com> - 8.0.0-0.1
+- Change the version number to 8.0.0
+- Add manual page for ibd2sdi utility
+
 * Fri Jun 03 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.8.0-0.1
 - Updated compatver to 5.6.31
 - Add example component to test package
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index c954b675f462..fda313e01f27 100644
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -73,7 +73,7 @@
 %global license_type          GPLv2
 %endif
 
-%global min                   5.8.0
+%global min                   8.0.0
 
 Name:           mysql-%{product_suffix}
 Summary:        A very fast and reliable SQL database server
@@ -674,6 +674,7 @@ fi
 %doc release/Docs/INFO_BIN*
 %doc release/support-files/my-default.cnf
 %attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/ibd2sdi.1*
 %attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
 %attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
 %attr(644, root, root) %{_mandir}/man1/myisamchk.1*
@@ -1016,6 +1017,10 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+* Thu Jun 05 2016 Erlend Dahl <erlend.dahl@oracle.com> - 8.0.0-0.1
+- Change the version number to 8.0.0
+- Add manual page for ibd2sdi utility
+
 * Fri Jun 03 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.8.0-0.1
 - Updated compatver to 5.6.31
 - Add example component to test package
diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in
index 8e66c0667195..c3e0d4c40382 100644
--- a/packaging/rpm-sles/mysql.spec.in
+++ b/packaging/rpm-sles/mysql.spec.in
@@ -72,7 +72,7 @@
 %{?sles12:                %global systemd 1}
 %{!?_tmpfilesdir:         %global _tmpfilesdir /usr/lib/tmpfiles.d}
 
-%global min                   5.8.0
+%global min                   8.0.0
 
 Name:           mysql-%{product_suffix}
 Summary:        A very fast and reliable SQL database server
@@ -563,6 +563,7 @@ fi
 %doc release/Docs/INFO_BIN*
 %doc release/support-files/my-default.cnf
 %attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/ibd2sdi.1*
 %attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
 %attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
 %attr(644, root, root) %{_mandir}/man1/myisamchk.1*
@@ -894,6 +895,10 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+* Thu Jun 05 2016 Erlend Dahl <erlend.dahl@oracle.com> - 8.0.0-0.1
+- Change the version number to 8.0.0
+- Add manual page for ibd2sdi utility
+
 * Fri Jun 03 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.8.0-0.1
 - Add example component to test package
 - Add test_udf_services.so plugin
diff --git a/sql/dd/impl/cache/shared_dictionary_cache.h b/sql/dd/impl/cache/shared_dictionary_cache.h
index fa33408d286e..29757fccdfe4 100644
--- a/sql/dd/impl/cache/shared_dictionary_cache.h
+++ b/sql/dd/impl/cache/shared_dictionary_cache.h
@@ -51,7 +51,7 @@ class Shared_dictionary_cache
 private:
   // We have 223 collations, 41 character sets and 4535 spatial
   // reference systems after initializing the server, as of MySQL
-  // 5.8.0.
+  // 8.0.0.
   static const size_t collation_capacity= 256;
   static const size_t charset_capacity= 64;
   static const size_t event_capacity= 256;
diff --git a/sql/field.h b/sql/field.h
index 7215c2e7e958..1afec417a619 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -699,7 +699,7 @@ class Field: public Proto_field, public Sql_alloc
 
     @sa Field::enum_auto_flags for possible options.
 
-    @sa Field::utype and Field::unireg_check in pre-5.8 versions of server
+    @sa Field::utype and Field::unireg_check in pre-8.0 versions of server
         for historical perspective.
   */
   uchar         auto_flags;
diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc
index e1dcf25a0799..6d83244e333c 100644
--- a/sql/gen_lex_token.cc
+++ b/sql/gen_lex_token.cc
@@ -42,7 +42,7 @@
 
   This is done to ensure stability in digest computed values.
 
-  As of now (5.8.0), the mapping looks like this:
+  As of now (8.0.0), the mapping looks like this:
   - [0 .. 255] character terminal tokens.
   - [256 .. 907] non terminal tokens from sql_yacc.yy
   - [908 .. 999] reserved for sql_yacc.yy new tokens
@@ -334,7 +334,7 @@ static void compute_tokens()
   tok_hint_comment_close= max_token_seen++;
   set_token(tok_hint_comment_close, HINT_COMMENT_TERMINATOR);
 
-  /* New in 5.8 */
+  /* New in 8.0 */
 
   tok_in_generic_value_expression= max_token_seen++;
   set_token(tok_in_generic_value_expression, "IN (...)");
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index abb45427ce0d..fda443526926 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -30,7 +30,7 @@
 
   For other sections, only links are provided, as a starting point into the component.
 
-  For the user manual, see http://dev.mysql.com/doc/refman/5.8/en/
+  For the user manual, see http://dev.mysql.com/doc/refman/8.0/en/
 
   For the internals manual, see https://dev.mysql.com/doc/internals/en/index.html
 */
@@ -44,7 +44,7 @@
 
   @section start_source Build from source
 
-  See https://dev.mysql.com/doc/refman/5.8/en/source-installation.html
+  See https://dev.mysql.com/doc/refman/8.0/en/source-installation.html
 
   @section start_debug Debugging
 
@@ -625,15 +625,15 @@ my_thread_handle shutdown_thr_handle;
 uint host_cache_size;
 ulong log_error_verbosity= 3; // have a non-zero value during early start-up
 
-#if MYSQL_VERSION_ID >= 50801
-#error "show_compatibility_56 is to be removed in MySQL 5.8"
+#if MYSQL_VERSION_ID >= 80001
+#error "show_compatibility_56 is to be removed in MySQL 8.0"
 #else
 /*
   Default value TRUE for the EMBEDDED_LIBRARY,
   default value from Sys_show_compatibility_56 otherwise.
 */
 my_bool show_compatibility_56= TRUE;
-#endif /* MYSQL_VERSION_ID >= 50800 */
+#endif /* MYSQL_VERSION_ID >= 80001 */
 
 #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
 ulong slow_start_timeout;
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 423f3ca1b442..c814a09a76fb 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -5269,7 +5269,7 @@ ER_NONUPDATEABLE_COLUMN
         ger "Feld '%-.192s' ist nicht aktualisierbar"
         rus "Столбец '%-.192s' не обновляемый"
         ukr "Стовбець '%-.192s' не може бути зминений"
-# Unused since MySQL 5.8.0
+# Unused since MySQL 8.0.0
 ER_VIEW_SELECT_DERIVED_UNUSED
         eng "View's SELECT contains a subquery in the FROM clause"
         ger "SELECT der View enthält eine Subquery in der FROM-Klausel"
@@ -7598,7 +7598,7 @@ ER_CAPACITY_EXCEEDED
 ER_CAPACITY_EXCEEDED_IN_RANGE_OPTIMIZER
   eng "Range optimization was not done for this query."
 
-# This error code is needed only for 5.7, not used in 5.8+
+# This error code is needed only for 5.7, not used in 8.0+
 ER_TABLE_NEEDS_UPG_PART
   eng "Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `%-.192s`.`%-.192s` UPGRADE PARTITIONING"
 
@@ -7807,5 +7807,5 @@ ER_CANT_SET_GTID_PURGED_DUE_SETS_CONSTRAINTS
   eng "@@GLOBAL.GTID_PURGED cannot be changed: %s"
 
 #
-#  End of 5.8 error messages.
+#  End of 8.0 error messages.
 #
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 9c7fdd20ecfb..ee9b5dea5328 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -434,7 +434,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
    To make DIGESTS stable, it is desirable to avoid changing token values.
 
    In practice, this means adding new tokens at the end of the list,
-   in the current release section (5.8),
+   in the current release section (8.0),
    instead of adding them in the middle of the list.
 
    Failing to comply with instructions below will trigger build failure,
@@ -443,7 +443,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
    3) Instructions to add a new token:
 
    Add the new token at the end of the list,
-   in the MySQL 5.8 section.
+   in the MySQL 8.0 section.
 
    4) Instructions to remove an old token:
 
@@ -1109,7 +1109,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
 %token  ZEROFILL
 
 /*
-   Tokens from MySQL 5.8
+   Tokens from MySQL 8.0
 */
 
 %token  JSON_UNQUOTED_SEPARATOR_SYM   /* MYSQL */
diff --git a/sql/table.h b/sql/table.h
index 13889cd59d81..995f5441c108 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -321,7 +321,7 @@ struct GRANT_INFO
      @brief the set of privileges that the current user needs to fulfil in
      order to carry out the requested operation. Used in debug build to
      ensure individual column privileges are assigned consistently.
-     @todo remove this member in 5.8.
+     @todo remove this member in 8.0.
    */
   ulong want_privilege;
 #endif
diff --git a/storage/perfschema/pfs_variable.cc b/storage/perfschema/pfs_variable.cc
index f036a4bfdbd6..88898dbbf625 100644
--- a/storage/perfschema/pfs_variable.cc
+++ b/storage/perfschema/pfs_variable.cc
@@ -189,7 +189,7 @@ int PFS_system_variable_cache::do_materialize_global(void)
         so that a clean interface is exposed to (upgraded and modified) applications.
 
         The assert below will fail once SQL_LOG_BIN really is defined
-        as SESSION_ONLY (in 5.8), so that this special case can be removed.
+        as SESSION_ONLY (in 8.0), so that this special case can be removed.
       */
       DBUG_ASSERT(value->scope() == sys_var::SESSION);
       continue;