Bug#21938432 MYSQL_UPGRADE 5.7.9 FAILS WITH ERROR ON MYSQL.SYS USER ON DUMP UPGRADE

* Two problems here:
** Now WITH_PERFSCHEMA_STORAGE_ENGINE is not set we were assuming the installed sys schema version was always 1.0.0, removed this now
** Also FLUSH PRIVILEGES after creating the user, so it is available straight away

Bug#21935210 MYSQL.SYS@LOCALHOST HAS TRIGGER PRIVILEGE ON THE WHOLE INSTANCE
* Removed global TRIGGER, and added only on the sys schema

Bug#21966366 SYS: PROVIDE A WAY TO ALLOW FOR LOCAL CUSTOMISATIONS
* Rather than check for equality of counts, check for at least as many as expected (but allow more or equal)

Sneak in a typo fix (s/procdure/procedure/) in the execute_prepared_stmt comment.

Reviewed-by: Georgi Kodinov <[email protected]>
Reviewed-by: Marc Alff <[email protected]>
RB: 10567
(cherry picked from commit dde827eccabfc5d8954977d0251b7dba3cce8342)

Author: MarkLeith

client/upgrade/program.cc

@@ -250,14 +250,14 @@ class Program : public Base::Abstract_connection_program
 
             while ((row = mysql_fetch_row(result)))
             {
-                ulong sys_version = calc_server_version(row[0]);
-                if (sys_version >= calc_server_version(SYS_SCHEMA_VERSION))
+                stringstream ss;
+                ulong installed_sys_version = calc_server_version(row[0]);
+                ulong expected_sys_version = calc_server_version(SYS_SCHEMA_VERSION);
+                if (installed_sys_version >= expected_sys_version)
                 {
-                  stringstream ss;
                   ss << "The sys schema is already up to date (version " << row[0] << ").";
                   this->print_verbose_message(ss.str());
                 } else {
-                  stringstream ss;
                   ss << "Found outdated sys schema version " << row[0] << ".";
                   this->print_verbose_message(ss.str());
                   if (this->run_sys_schema_upgrade() != 0)
@@ -294,7 +294,7 @@ class Program : public Base::Abstract_connection_program
 
             while ((row = mysql_fetch_row(result)))
             {
-                if (SYS_TABLE_COUNT != atoi(row[0]))
+                if (SYS_TABLE_COUNT > atoi(row[0]))
                 {
                   stringstream ss;
                   ss << "Found "  << row[0] <<  " sys tables, but expected " << SYS_TABLE_COUNT << "."
@@ -324,7 +324,7 @@ class Program : public Base::Abstract_connection_program
 
             while ((row = mysql_fetch_row(result)))
             {
-                if (SYS_VIEW_COUNT != atoi(row[0]))
+                if (SYS_VIEW_COUNT > atoi(row[0]))
                 {
                   stringstream ss;
                   ss << "Found "  << row[0] <<  " sys views, but expected " << SYS_VIEW_COUNT << "."
@@ -354,7 +354,7 @@ class Program : public Base::Abstract_connection_program
 
             while ((row = mysql_fetch_row(result)))
             {
-                if (SYS_TRIGGER_COUNT != atoi(row[0]))
+                if (SYS_TRIGGER_COUNT > atoi(row[0]))
                 {
                   stringstream ss;
                   ss << "Found "  << row[0] <<  " sys triggers, but expected " << SYS_TRIGGER_COUNT << "."
@@ -384,7 +384,7 @@ class Program : public Base::Abstract_connection_program
 
             while ((row = mysql_fetch_row(result)))
             {
-                if (SYS_FUNCTION_COUNT != atoi(row[0]))
+                if (SYS_FUNCTION_COUNT > atoi(row[0]))
                 {
                   stringstream ss;
                   ss << "Found "  << row[0] <<  " sys functions, but expected " << SYS_FUNCTION_COUNT << "."
@@ -414,7 +414,7 @@ class Program : public Base::Abstract_connection_program
 
             while ((row = mysql_fetch_row(result)))
             {
-                if (SYS_PROCEDURE_COUNT != atoi(row[0]))
+                if (SYS_PROCEDURE_COUNT > atoi(row[0]))
                 {
                   stringstream ss;
                   ss << "Found "  << row[0] <<  " sys procedures, but expected " << SYS_PROCEDURE_COUNT << "."

cmake/mysql_version.cmake

@@ -101,13 +101,9 @@ ENDIF()
 # Get the sys schema version from the mysql_sys_schema.sql file
 # however if compiling without performance schema, always use version 1.0.0
 MACRO(GET_SYS_SCHEMA_VERSION)
-  IF(NOT WITH_PERFSCHEMA_STORAGE_ENGINE)
-    SET(SYS_SCHEMA_VERSION "1.0.0")
-  ELSE()
-    FILE (STRINGS ${CMAKE_SOURCE_DIR}/scripts/mysql_sys_schema.sql str REGEX "SELECT \\'([0-9]+\\.[0-9]+\\.[0-9]+)\\' AS")
-    IF(str)
-      STRING(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" SYS_SCHEMA_VERSION "${str}")
-    ENDIF()
+  FILE (STRINGS ${CMAKE_SOURCE_DIR}/scripts/mysql_sys_schema.sql str REGEX "SELECT \\'([0-9]+\\.[0-9]+\\.[0-9]+)\\' AS sys_version")
+  IF(str)
+    STRING(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" SYS_SCHEMA_VERSION "${str}")
   ENDIF()
 ENDMACRO()
 

mysql-test/r/wl6443_deprecation.result

@@ -149,7 +149,7 @@ create view mysql.host as select HOST from mysql.db;
 create user 'wl6443_u1'@'10.10.10.1' identified by 'sql';
 select count(*) from mysql.host;
 count(*)
-2
+3
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.engine_cost                                  OK

mysql-test/suite/funcs_1/r/is_schema_privileges.result

@@ -52,6 +52,7 @@ IS_GRANTABLE	varchar(3)	NO
 SELECT GRANTEE, TABLE_CATALOG, TABLE_SCHEMA, PRIVILEGE_TYPE
 FROM information_schema.schema_privileges WHERE table_catalog IS NOT NULL;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE
+'mysql.sys'@'localhost'	def	sys	TRIGGER
 ''@'%'	def	test	SELECT
 ''@'%'	def	test	INSERT
 ''@'%'	def	test	UPDATE

mysql-test/suite/perfschema/r/privilege_table_io.result

@@ -119,6 +119,7 @@ wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1

scripts/mysql_sys_schema.sql

@@ -18,10 +18,14 @@
 -- PLEASE SUBMIT A PULL REQUEST TO https://github.com/MarkLeith/mysql-sys
 --
 
-REPLACE INTO mysql.user VALUES ('localhost','mysql.sys','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','','','','',0,0,0,0,'mysql_native_password','*THISISNOTAVALIDPASSWORDTHATCANBEUSEDHERE','N',CURRENT_TIMESTAMP,NULL,'Y');
+REPLACE INTO mysql.user VALUES ('localhost','mysql.sys','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'mysql_native_password','*THISISNOTAVALIDPASSWORDTHATCANBEUSEDHERE','N',CURRENT_TIMESTAMP,NULL,'Y');
+
+REPLACE INTO mysql.db VALUES ('localhost','sys','mysql.sys','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y');
 
 REPLACE INTO mysql.tables_priv VALUES ('localhost','sys','mysql.sys','sys_config','root@localhost', CURRENT_TIMESTAMP, 'Select', '');
 
+FLUSH PRIVILEGES;
+
 SET NAMES utf8;
 
 CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8;
@@ -330,7 +334,7 @@ CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE create_synonym_db ( IN in_db_na
 
 DROP PROCEDURE IF EXISTS execute_prepared_stmt;
 
-CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE execute_prepared_stmt ( IN in_query longtext CHARACTER SET UTF8 ) COMMENT '\n Description\n \n Takes the query in the argument and executes it using a prepared statement. The prepared statement is deallocated,\n so the procdure is mainly useful for executing one off dynamically created queries.\n \n The sys_execute_prepared_stmt prepared statement name is used for the query and is required not to exist.\n \n \n Parameters\n \n in_query (longtext CHARACTER SET UTF8):\n The query to execute.\n \n \n Configuration Options\n \n sys.debug\n Whether to provide debugging output.\n Default is ''OFF''. Set to ''ON'' to include.\n \n \n Example\n \n mysql> CALL sys.execute_prepared_stmt(''SELECT * FROM sys.sys_config'');\n +------------------------+-------+---------------------+--------+\n | variable               | value | set_time            | set_by |\n +------------------------+-------+---------------------+--------+\n | statement_truncate_len | 64    | 2015-06-30 13:06:00 | NULL   |\n +------------------------+-------+---------------------+--------+\n 1 row in set (0.00 sec)\n \n Query OK, 0 rows affected (0.00 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC READS SQL DATA BEGIN IF (@sys.debug IS NULL) THEN SET @sys.debug = sys.sys_get_config('debug', 'OFF'); END IF;  IF (in_query IS NULL OR LENGTH(in_query) < 4) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = "The @sys.execute_prepared_stmt.sql must contain a query"; END IF;  SET @sys.execute_prepared_stmt.sql = in_query;  IF (@sys.debug = 'ON') THEN SELECT @sys.execute_prepared_stmt.sql AS 'Debug'; END IF; PREPARE sys_execute_prepared_stmt FROM @sys.execute_prepared_stmt.sql; EXECUTE sys_execute_prepared_stmt; DEALLOCATE PREPARE sys_execute_prepared_stmt;  SET @sys.execute_prepared_stmt.sql = NULL; END;
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE execute_prepared_stmt ( IN in_query longtext CHARACTER SET UTF8 ) COMMENT '\n Description\n \n Takes the query in the argument and executes it using a prepared statement. The prepared statement is deallocated,\n so the procedure is mainly useful for executing one off dynamically created queries.\n \n The sys_execute_prepared_stmt prepared statement name is used for the query and is required not to exist.\n \n \n Parameters\n \n in_query (longtext CHARACTER SET UTF8):\n The query to execute.\n \n \n Configuration Options\n \n sys.debug\n Whether to provide debugging output.\n Default is ''OFF''. Set to ''ON'' to include.\n \n \n Example\n \n mysql> CALL sys.execute_prepared_stmt(''SELECT * FROM sys.sys_config'');\n +------------------------+-------+---------------------+--------+\n | variable               | value | set_time            | set_by |\n +------------------------+-------+---------------------+--------+\n | statement_truncate_len | 64    | 2015-06-30 13:06:00 | NULL   |\n +------------------------+-------+---------------------+--------+\n 1 row in set (0.00 sec)\n \n Query OK, 0 rows affected (0.00 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC READS SQL DATA BEGIN IF (@sys.debug IS NULL) THEN SET @sys.debug = sys.sys_get_config('debug', 'OFF'); END IF;  IF (in_query IS NULL OR LENGTH(in_query) < 4) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = "The @sys.execute_prepared_stmt.sql must contain a query"; END IF;  SET @sys.execute_prepared_stmt.sql = in_query;  IF (@sys.debug = 'ON') THEN SELECT @sys.execute_prepared_stmt.sql AS 'Debug'; END IF; PREPARE sys_execute_prepared_stmt FROM @sys.execute_prepared_stmt.sql; EXECUTE sys_execute_prepared_stmt; DEALLOCATE PREPARE sys_execute_prepared_stmt;  SET @sys.execute_prepared_stmt.sql = NULL; END;
 
 DROP PROCEDURE IF EXISTS diagnostics;