WL#9275 DEPRECATE INFORMATION_SCHEMA.INNODB_LOCKS IN 5.7

Deprecated the following tables:
- INFORMATION_SCHEMA.INNODB_LOCKS
- INFORMATION_SCHEMA.INNODB_LOCK_WAITS

Author: marcalff

mysql-test/r/is_deprecation.result

@@ -0,0 +1,10 @@
+select * from INFORMATION_SCHEMA.INNODB_LOCKS
+where lock_table = "none";
+lock_id	lock_trx_id	lock_mode	lock_type	lock_table	lock_index	lock_space	lock_page	lock_rec	lock_data
+Warnings:
+Warning	1681	'INFORMATION_SCHEMA.INNODB_LOCKS' is deprecated and will be removed in a future release.
+select * from INFORMATION_SCHEMA.INNODB_LOCK_WAITS
+where requested_lock_id = "none";
+requesting_trx_id	requested_lock_id	blocking_trx_id	blocking_lock_id
+Warnings:
+Warning	1681	'INFORMATION_SCHEMA.INNODB_LOCK_WAITS' is deprecated and will be removed in a future release.

mysql-test/suite/innodb/r/innodb_i_s_innodb_locks.result

@@ -0,0 +1,8 @@
+
+select * from INFORMATION_SCHEMA.INNODB_LOCKS
+  where lock_table = "none";
+
+select * from INFORMATION_SCHEMA.INNODB_LOCK_WAITS
+  where requested_lock_id = "none";
+
+

mysql-test/t/is_deprecation.test

@@ -8129,6 +8129,34 @@ bool get_schema_tables_result(JOIN *join,
       else
         table_list->table->file->stats.records= 0;
 
+      /* To be removed after 5.7 */
+      if (is_infoschema_db(table_list->db, table_list->db_length))
+      {
+        static LEX_STRING INNODB_LOCKS= {C_STRING_WITH_LEN("INNODB_LOCKS")};
+        static LEX_STRING INNODB_LOCK_WAITS= {C_STRING_WITH_LEN("INNODB_LOCK_WAITS")};
+
+        if (my_strcasecmp(system_charset_info,
+                          table_list->schema_table_name,
+                          INNODB_LOCKS.str) == 0)
+        {
+          /* Deprecated in 5.7 */
+          push_warning_printf(thd, Sql_condition::SL_WARNING,
+                              ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
+                              ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+                              "INFORMATION_SCHEMA.INNODB_LOCKS");
+        }
+        else if (my_strcasecmp(system_charset_info,
+                               table_list->schema_table_name,
+                               INNODB_LOCK_WAITS.str) == 0)
+        {
+          /* Deprecated in 5.7 */
+          push_warning_printf(thd, Sql_condition::SL_WARNING,
+                              ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
+                              ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+                              "INFORMATION_SCHEMA.INNODB_LOCK_WAITS");
+        }
+      }
+
       if (do_fill_table(thd, table_list, tab))
       {
         result= 1;