WL#16567: Deprecate FLUSH PRIVILEGES and FLUSH_PRIVILEGES privilege.

1. add a deprecation warning to the FLUSH PRIVILEGES command
2. mark the FLUSH_PRIVILEGES privilege as deprecated
3. mysqladmin flush-privileges & reload will trigger a deprection warning
4. mysqld keeps flushing privs on sighup and no warning is printed
5. upgrade doesn't grant FLUSH_PRIVILEGES to RELOAD holders
6. GRANT/REVOKE ALL adds FLUSH_PRIVILEGES as it used to
7. tests amended
8. Made the deprecated dynamic privileges code do as follows:
  8.1: no deprecation warning is issued at startup/FLUSH PRIVILEGES
  8.2: the derecated dynamic privileges are granted as part of GRANT ALL
  8.3: the deprecated dynamic privileges are revoked as part of REVOKE ALL
  8.4: no deprecation warning is issued at GRANT REVOKE if ALL is present
clang-tidy reports addressed

Change-Id: I0e6cb757b86eb89166ecf1579bef55fff1143ca0

Author: gkodinov

client/mysqladmin.cc

@@ -741,7 +741,15 @@ static int execute_commands(MYSQL *mysql, int argc, char **argv) {
         break;
       }
       case ADMIN_FLUSH_PRIVILEGES:
+        CLIENT_WARN_DEPRECATED_NO_REPLACEMENT("flush-privileges");
+        if (0 != mysql_query(mysql, "flush privileges")) {
+          my_printf_error(0, "reload failed; error: '%s'", error_flags,
+                          mysql_error(mysql));
+          return -1;
+        }
+        break;
       case ADMIN_RELOAD:
+        CLIENT_WARN_DEPRECATED_NO_REPLACEMENT("reload");
         if (mysql_query(mysql, "flush privileges")) {
           my_printf_error(0, "reload failed; error: '%s'", error_flags,
                           mysql_error(mysql));

mysql-test/r/auth_rpl.result

@@ -9,6 +9,8 @@ include/rpl/stop_replica.inc
 CREATE USER 'plug_user' IDENTIFIED WITH 'test_plugin_server' AS 'plug_user';
 GRANT REPLICATION SLAVE ON *.* TO plug_user;
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 [connection slave]
 CHANGE REPLICATION SOURCE TO 
 SOURCE_USER=     'plug_user',

mysql-test/r/connect.result

@@ -240,6 +240,8 @@ last_t1()
 # must not throw an error
 CALL test_t1(last_t1() + 1);
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 # existing connections continue as before even after flush
 # must not throw an error
 SELECT USER();
@@ -278,6 +280,8 @@ N
 UPDATE mysql.user SET password_expired='Y'
   WHERE user='must_change' and host = 'localhost';
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SELECT USER();
 ERROR HY000: You must reset your password using ALTER USER statement before executing this statement.
 SELECT last_t1();

mysql-test/r/disconnect_on_expired_password_off.result

@@ -27,6 +27,7 @@ GRANT ALL ON *.* TO 'bernt' WITH GRANT OPTION;
 ALTER USER 'bernt' PASSWORD EXPIRE;
 # Doing something should connect but fail
 mysqladmin: [Warning] Using a password on the command line interface can be insecure.
+WARNING: reload is deprecated and will be removed in a future version
 mysqladmin: reload failed; error: 'You must reset your password using ALTER USER statement before executing this statement.'
 # Setting password should succeed
 mysqladmin: [Warning] Using a password on the command line interface can be insecure.

mysql-test/r/errors.result

@@ -181,6 +181,8 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE FUNCTION f() RETURNS INT RETURN 1;
 GRANT FILE ON *.* TO 'nopriv_user'@'localhost';
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 connection: con1
 SELECT MAX(key1) FROM t1 WHERE f() < 1 INTO OUTFILE '<outfile>';
 ERROR 42000: execute command denied to user 'nopriv_user'@'localhost' for routine 'test.f'

mysql-test/r/flush_privileges_sql_mode.result

@@ -25,6 +25,8 @@ Grants for u2b35380295@%
 GRANT EXECUTE ON PROCEDURE `db35380295`.`p35380295` TO `u2b35380295`@`%`
 GRANT USAGE ON *.* TO `u2b35380295`@`%`
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 # test: should be the same as the previous SHOW
 SHOW GRANTS FOR u2b35380295;
 Grants for u2b35380295@%

mysql-test/r/grant.result

@@ -14,6 +14,8 @@ Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
 GRANT CREATE TEMPORARY TABLES, LOCK TABLES ON `mysqltest`.* TO `mysqltest_1`@`localhost`
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
@@ -25,6 +27,8 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
 GRANT LOCK TABLES ON `mysqltest`.* TO `mysqltest_1`@`localhost`
 grant ALL PRIVILEGES on mysqltest.* to mysqltest_1@localhost with GRANT OPTION;
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
@@ -37,6 +41,8 @@ GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TE
 revoke all privileges on mysqltest.* from mysqltest_1@localhost;
 drop user  mysqltest_1@localhost;
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 create user mysqltest_1@localhost;
 grant usage on test.* to mysqltest_1@localhost with grant option;
 show grants for mysqltest_1@localhost;
@@ -48,6 +54,8 @@ delete from mysql.db where user='mysqltest_1';
 delete from mysql.tables_priv where user='mysqltest_1';
 delete from mysql.columns_priv where user='mysqltest_1';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_1@localhost;
 ERROR 42000: There is no such grant defined for user 'mysqltest_1' on host 'localhost'
 create user mysqltest_1@localhost;
@@ -101,6 +109,8 @@ delete from mysql.db where user='mysqltest_1' or user="mysqltest_2" or user="mys
 delete from mysql.tables_priv where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
 delete from mysql.columns_priv where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 drop table t1;
 create user mysqltest_1@localhost;
 create table t1 (abcdefghijklmnopqrstuvwxyz int);
@@ -130,6 +140,8 @@ alter table mysql.db order by db asc;
 Warnings:
 Warning	1105	ORDER BY ignored as there is a user-defined clustered index in the table 'db'
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for test11@localhost;
 Grants for test11@localhost
 GRANT USAGE ON *.* TO `test11`@`localhost`
@@ -139,6 +151,8 @@ alter table mysql.db order by db desc;
 Warnings:
 Warning	1105	ORDER BY ignored as there is a user-defined clustered index in the table 'db'
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for test11@localhost;
 Grants for test11@localhost
 GRANT USAGE ON *.* TO `test11`@`localhost`
@@ -154,6 +168,8 @@ host	db	user	select_priv	insert_priv
 delete from mysql.user where user='test6123';
 drop database mysqltest1;
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 create user drop_user@localhost, drop_user2@localhost;
 create table t1 (a int);
 grant ALL PRIVILEGES on *.* to drop_user2@localhost with GRANT OPTION;
@@ -408,6 +424,8 @@ grant all on mysqltest_2.* to mysqltest_3@localhost;
 grant select on *.* to mysqltest_3@localhost;
 grant select on mysqltest_2.t1 to mysqltest_3@localhost;
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 use mysqltest_1;
 update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
 update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
@@ -431,6 +449,8 @@ delete from mysql.tables_priv where user="mysqltest_3";
 delete from mysql.columns_priv where user="mysqltest_3";
 delete from mysql.global_grants where user="mysqltest_3";
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 drop database mysqltest_1;
 drop database mysqltest_2;
 SHOW PRIVILEGES;
@@ -537,6 +557,8 @@ TABLE_SCHEMA	TABLE_NAME	PRIVILEGES
 mysqltest	dummytable	ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, TRIGGER, UPDATE
 mysqltest	dummyview	ALTER, CREATE, CREATE VIEW, DELETE, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, TRIGGER, UPDATE
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR dummy@localhost;
 Grants for dummy@localhost
 GRANT ALL PRIVILEGES ON `mysqltest`.`dummytable` TO `dummy`@`localhost`
@@ -581,6 +603,8 @@ TABLE_SCHEMA	TABLE_NAME	PRIVILEGES
 mysqltest	dummytable	CREATE VIEW
 mysqltest	dummyview	CREATE VIEW
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR dummy@localhost;
 Grants for dummy@localhost
 GRANT CREATE VIEW ON `mysqltest`.`dummytable` TO `dummy`@`localhost`
@@ -615,6 +639,8 @@ TABLE_SCHEMA	TABLE_NAME	PRIVILEGES
 mysqltest	dummytable	SHOW VIEW
 mysqltest	dummyview	SHOW VIEW
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR dummy@localhost;
 Grants for dummy@localhost
 GRANT SHOW VIEW ON `mysqltest`.`dummytable` TO `dummy`@`localhost`
@@ -633,8 +659,12 @@ DROP DATABASE mysqltest;
 use mysql;
 insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 delete from tables_priv where host = '' and user = 'mysqltest_1';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 use test;
 set @user123="non-existent";
 select * from mysql.db where user=@user123;
@@ -652,6 +682,8 @@ GRANT <ALL_DYNAMIC_PRIVILEGES> ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT SELECT ON `бд`.* TO `root`@`localhost`
 GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT <ALL_STATIC_PRIVILEGES> ON *.* TO `root`@`localhost` WITH GRANT OPTION
@@ -692,6 +724,8 @@ delete from mysql.user where user='mysqltest1';
 delete from mysql.db where user='mysqltest1';
 delete from mysql.tables_priv where user='mysqltest1';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 drop database mysqltest;
 create database db27515;
 use db27515;
@@ -710,6 +744,8 @@ create table t1 (a int);
 create table t2 as select * from mysql.user where user='';
 delete from mysql.user where user='';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 create user mysqltest_8@'';
 create user mysqltest_8;
 create user mysqltest_8@host8;
@@ -759,6 +795,8 @@ select * from  information_schema.schema_privileges
 where grantee like "'mysqltest_8'%";
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_8@'';
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
@@ -767,12 +805,16 @@ Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
 grant select on mysqltest.* to mysqltest_8@'';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_8@;
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
 GRANT SELECT ON `mysqltest`.* TO `mysqltest_8`@``
 revoke select on mysqltest.* from mysqltest_8@'';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 Column privileges
 grant update (a) on t1 to mysqltest_8@'';
 grant update (a) on t1 to mysqltest_8;
@@ -785,6 +827,8 @@ Grants for mysqltest_8@%
 GRANT USAGE ON *.* TO `mysqltest_8`@`%`
 GRANT UPDATE (`a`) ON `test`.`t1` TO `mysqltest_8`@`%`
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_8@'';
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
@@ -810,6 +854,8 @@ GRANT USAGE ON *.* TO `mysqltest_8`@`%`
 select * from  information_schema.column_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_8@'';
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
@@ -828,6 +874,8 @@ Grants for mysqltest_8@%
 GRANT USAGE ON *.* TO `mysqltest_8`@`%`
 GRANT UPDATE ON `test`.`t1` TO `mysqltest_8`@`%`
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_8@'';
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
@@ -853,6 +901,8 @@ GRANT USAGE ON *.* TO `mysqltest_8`@`%`
 select * from  information_schema.table_privileges where table_schema NOT IN ('sys','mysql');
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 show grants for mysqltest_8@'';
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
@@ -883,6 +933,8 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from t1;
 a
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR mysqltest_8@'';
 Grants for mysqltest_8@
 GRANT USAGE ON *.* TO `mysqltest_8`@``
@@ -914,6 +966,8 @@ show grants for mysqltest_8@host8;
 ERROR 42000: There is no such grant defined for user 'mysqltest_8' on host 'host8'
 insert into mysql.user select * from t2;
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 drop table t2;
 drop table t1;
 CREATE DATABASE mysqltest3;
@@ -1256,6 +1310,8 @@ DROP TABLE t1;
 #
 CREATE TEMPORARY TABLE mysql.user (id INT);
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 DROP TABLE mysql.user;
 drop table if exists test;
 Warnings:
@@ -1579,6 +1635,8 @@ grant         insert on mysqltest.t4 to mysqltest@localhost;
 grant create, insert on mysqltest.t5 to mysqltest@localhost;
 grant create, insert on mysqltest.t6 to mysqltest@localhost;
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 insert into t2 values (1);
 create table if not exists t1 select * from t2;
 ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
@@ -1624,6 +1682,8 @@ CALL mysqltest1.test();
 DROP DATABASE mysqltest1;
 RENAME TABLE mysql.procs_gone TO mysql.procs_priv;
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 CREATE DATABASE dbbug33464;
 CREATE USER 'userbug33464'@'localhost';
 GRANT CREATE ROUTINE ON dbbug33464.* TO 'userbug33464'@'localhost';
@@ -1669,6 +1729,8 @@ GRANT CREATE ROUTINE ON db1.* TO 'user1'@'localhost';
 GRANT CREATE ON db1.* TO 'user2'@'%';
 GRANT CREATE ROUTINE ON db1.* TO 'user2'@'%';
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 SHOW GRANTS FOR 'user1'@'localhost';
 Grants for user1@localhost
 GRANT USAGE ON *.* TO `user1`@`localhost`
@@ -1772,6 +1834,8 @@ localhost	myuser
 revoke select on Foo.* from myuser@localhost;
 delete from mysql.user where User='myuser';
 flush privileges;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 #########################################################################
 #
 # Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE.
@@ -1786,6 +1850,8 @@ DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%';
 DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%';
 DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%';
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 CREATE DATABASE mysqltest_db1;
 CREATE TABLE mysqltest_db1.t1(a INT);
 
@@ -2499,6 +2565,8 @@ SELECT (SELECT now()-(SELECT password_last_changed from mysql.user where user='w
 1
 UPDATE mysql.user SET password_last_changed = (now() - INTERVAL 3 DAY) where user='wl7131';
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 # Attempt to execute query should fail
 mysql: [Warning] Using a password on the command line interface can be insecure.
 Please use --connect-expired-password option or invoke mysql in interactive mode.
@@ -2526,6 +2594,8 @@ password_lifetime
 0
 UPDATE mysql.user SET password_last_changed = (now() - INTERVAL 5 DAY) where user='wl7131';
 FLUSH PRIVILEGES;
+Warnings:
+Warning	1681	'FLUSH PRIVILEGES' is deprecated and will be removed in a future release.
 # This should pass as password is never expired.
 mysql: [Warning] Using a password on the command line interface can be insecure.
 ALTER USER 'wl7131' PASSWORD EXPIRE DEFAULT;