WL#16737 Library Improvements

* ALTER LIBRARY.
* LIBRARY Comment.
* SHOW LIBRARY STATUS.
* ALTER ROUTINE USING list.
* Bug#37375233 Warning on missing imports.
* Bug#37501823 ALTER LIBRARY in prepared statements.

Change-Id: I14e1b456bfc361d8219198955b28a585d647c8de

Author: ivo-roylev

client/mysqldump.cc

@@ -2731,6 +2731,39 @@ static void print_blob_as_hex(FILE *output_file, const char *str, ulong len) {
   check_io(output_file);
 }
 
+/*
+  has_missing_import
+  -- Checks if all the libraries imported by a routine are present.
+
+  A function/procedure that has one or more of the libraries it imports,
+  deleted, it cannot be re-created.
+  Having such routines in the dump makes it invalid.
+
+  RETURN
+    false All the libraries imported by the routine exists.
+    true  The routine has missing imports.
+*/
+static bool has_missing_import(const char *schema, const char *name) {
+  MYSQL_RES *routine_list_res;
+  std::string query{
+      std::string{
+          "SELECT rl.LIBRARY_SCHEMA, rl.LIBRARY_NAME, rl.ROUTINE_SCHEMA, "
+          "rl.ROUTINE_NAME, rl.ROUTINE_TYPE "
+          "FROM INFORMATION_SCHEMA.ROUTINE_LIBRARIES rl "
+          "LEFT JOIN INFORMATION_SCHEMA.LIBRARIES lib ON "
+          "rl.LIBRARY_CATALOG  = lib.LIBRARY_CATALOG AND "
+          "rl.LIBRARY_SCHEMA = lib.LIBRARY_SCHEMA AND "
+          "rl.LIBRARY_NAME = lib.LIBRARY_NAME "
+          "WHERE lib.LIBRARY_NAME IS NULL AND rl.ROUTINE_SCHEMA = '"} +
+      schema + "' AND rl.ROUTINE_NAME = '" + name + '\''};
+  if (mysql_query_with_error_report(mysql, &routine_list_res, query.c_str()))
+    return true;
+  if (mysql_num_rows(routine_list_res))
+    return true;  // There are imported libraries that do NOT exist.
+  mysql_free_result(routine_list_res);
+  return false;  // All the libraries that this routine imports, are present.
+}
+
 /*
   dump_routines_for_db
   -- retrieves list of routines for a given db, and prints out
@@ -2748,13 +2781,11 @@ static uint dump_routines_for_db(char *db) {
   char query_buff[QUERY_LENGTH];
   const char *routine_type[] = {"FUNCTION", "PROCEDURE"};
   char db_name_buff[NAME_LEN * 2 + 3], name_buff[NAME_LEN * 2 + 3];
-  char escaped_name[NAME_LEN * 2 + 3];
-  char lib_schema_buff[NAME_LEN * 2 + 3], lib_name_buff[NAME_LEN * 2 + 3];
   char *routine_name;
   int i;
   FILE *sql_file = md_result_file;
-  MYSQL_RES *routine_res, *routine_list_res, *import_res, *imported_library_res;
-  MYSQL_ROW row, routine_list_row, import_list_row;
+  MYSQL_RES *routine_res, *routine_list_res;
+  MYSQL_ROW row, routine_list_row;
 
   char db_cl_name[MY_CS_NAME_SIZE];
   int db_cl_altered = false;
@@ -2870,65 +2901,25 @@ static uint dump_routines_for_db(char *db) {
 
     if (mysql_num_rows(routine_list_res)) {
       while ((routine_list_row = mysql_fetch_row(routine_list_res))) {
-        routine_name = quote_name(routine_list_row[1], name_buff, false);
-
-        /**
-         * TODO: this is a temporary fix until Bug#37375233 is properly
-         * resolved. For each SP, check if libraries in "USING" clause actually
-         * exist. If not, exit with error because such dump would not be
-         * restorable. However, with proper fix, simply treat warnings from SHOW
-         * CREATE SP as errors here.
-         */
-        mysql_real_escape_string_quote(mysql, escaped_name, routine_list_row[1],
-                                       (ulong)strlen(routine_list_row[1]),
-                                       '\'');
-
-        // 1st step: get all imports for the SP
-        snprintf(query_buff, sizeof(query_buff),
-                 "SELECT LIBRARY_SCHEMA, LIBRARY_NAME FROM "
-                 "INFORMATION_SCHEMA.ROUTINE_LIBRARIES WHERE "
-                 "ROUTINE_SCHEMA = '%s' AND ROUTINE_NAME = '%s' AND "
-                 "ROUTINE_TYPE = '%s'",
-                 db_name_buff, escaped_name, routine_type[i]);
-        if (mysql_query_with_error_report(mysql, &import_res, query_buff))
+        mysql_real_escape_string_quote(
+            mysql, name_buff, routine_list_row[1],
+            static_cast<ulong>(strlen(routine_list_row[1])), '\'');
+
+        if (has_missing_import(db_name_buff, name_buff)) {
+          // Any of the imported libraries does NOT exist.
+          print_comment(
+              sql_file, true,
+              "\n-- One or more of the libraries used by %s.%s routine, do "
+              "not exist. \n",
+              db_name_buff, name_buff);
+          maybe_die(
+              EX_MYSQLERR,
+              "Routine %s.%s is missing one or more of its imported libraries.",
+              db_name_buff, name_buff);
           return 1;
-
-        // 2nd step: iterate these imports and query I_S.LIBRARIES to check if
-        // they exist and if the current user has access to them
-        if (mysql_num_rows(import_res)) {
-          while ((import_list_row = mysql_fetch_row(import_res))) {
-            mysql_real_escape_string_quote(
-                mysql, lib_schema_buff, import_list_row[0],
-                (ulong)strlen(import_list_row[0]), '\'');
-            mysql_real_escape_string_quote(
-                mysql, lib_name_buff, import_list_row[1],
-                (ulong)strlen(import_list_row[1]), '\'');
-
-            snprintf(query_buff, sizeof(query_buff),
-                     "SELECT * FROM "
-                     "INFORMATION_SCHEMA.LIBRARIES WHERE "
-                     "LIBRARY_SCHEMA = '%s' AND LIBRARY_NAME = '%s'",
-                     lib_schema_buff, lib_name_buff);
-
-            if (mysql_query_with_error_report(mysql, &imported_library_res,
-                                              query_buff))
-              return 1;
-
-            if (mysql_num_rows(imported_library_res) == 0) {
-              // imported library does NOT exist
-              print_comment(
-                  sql_file, true,
-                  "\n-- Library used by %s does not exist: '%s'.'%s'\n",
-                  escaped_name, lib_schema_buff, lib_name_buff);
-              maybe_die(EX_MYSQLERR, "Missing library: %s.%s", lib_schema_buff,
-                        lib_name_buff);
-            }
-            mysql_free_result(imported_library_res);
-          }
         }
-        mysql_free_result(import_res);
-        // End of temp code until Bug#37375233 is done.
 
+        routine_name = quote_name(routine_list_row[1], name_buff, false);
         DBUG_PRINT("info",
                    ("retrieving CREATE %s for %s", routine_type[i], name_buff));
         snprintf(query_buff, sizeof(query_buff), "SHOW CREATE %s %s",

include/my_sqlcommand.h

@@ -207,6 +207,8 @@ enum enum_sql_command {
   SQLCOM_CREATE_LIBRARY,
   SQLCOM_DROP_LIBRARY,
   SQLCOM_SHOW_CREATE_LIBRARY,
+  SQLCOM_ALTER_LIBRARY,
+  SQLCOM_SHOW_STATUS_LIBRARY,
   /* This should be the last !!! */
   SQLCOM_END
 };

include/mysql/plugin_audit.h.pp

@@ -344,6 +344,8 @@
   SQLCOM_CREATE_LIBRARY,
   SQLCOM_DROP_LIBRARY,
   SQLCOM_SHOW_CREATE_LIBRARY,
+  SQLCOM_ALTER_LIBRARY,
+  SQLCOM_SHOW_STATUS_LIBRARY,
   SQLCOM_END
 };
 #include "plugin_audit_message_types.h"

mysql-test/common/rpl/rpl_sp.test

@@ -488,17 +488,42 @@ DROP FUNCTION IF EXISTS f1;
 
 /*!90200 CREATE FUNCTION test_function(n INTEGER) RETURNS INTEGER LANGUAGE JAVASCRIPT USING (test_library) AS $$ return test_library.f(n) $$ */;
 
+/*!90200 CREATE FUNCTION function_with_comment(n INTEGER) RETURNS INTEGER LANGUAGE JAVASCRIPT USING (test_library) AS $$ return test_library.f(n) $$ */;
+
+/*!90300 CREATE LIBRARY library_with_comment COMMENT "library comment" LANGUAGE JAVASCRIPT AS $$ export function f(n) {  return n } $$ */;
+
+/*!90300 ALTER LIBRARY library_with_comment COMMENT 'library comment - updated' */;
+
+/*!90300 ALTER FUNCTION function_with_comment COMMENT "Updated function comment" USING (library_with_comment AS test_library) */;
+
+/*!90200 CREATE LIBRARY deleted_library LANGUAGE JAVASCRIPT AS $$ export function f(n) {  return n } $$ */;
+
+/*!90200 CREATE FUNCTION orphaned_function(n INTEGER) RETURNS INTEGER LANGUAGE JAVASCRIPT USING (deleted_library) AS $$ return deleted_library.f(n) $$ */;
+
+/*!90200 CREATE FUNCTION orphaned_function_modified(n INTEGER) RETURNS INTEGER LANGUAGE JAVASCRIPT USING (library_with_comment) AS $$ return library_with_comment.f(n) $$ */;
+
+/*!90200 DROP LIBRARY deleted_library */;
+
+--error ER_SP_DOES_NOT_EXIST
+/*!90300 ALTER FUNCTION orphaned_function_modified USING (deleted_library AS library_with_comment) */;
+
 --echo
 --echo ---> Checking on master...
 
 SHOW CREATE PROCEDURE p1;
 SHOW CREATE FUNCTION f1;
 SHOW CREATE LIBRARY test_library;
 SHOW CREATE FUNCTION test_function;
+SHOW CREATE LIBRARY library_with_comment;
+SHOW CREATE FUNCTION function_with_comment;
+SHOW CREATE FUNCTION orphaned_function;
+SHOW CREATE FUNCTION orphaned_function_modified;
 SELECT * FROM INFORMATION_SCHEMA.ROUTINE_LIBRARIES
 ORDER BY ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE, LIBRARY_CATALOG, LIBRARY_SCHEMA, LIBRARY_NAME, LIBRARY_VERSION;
 --replace_column 6 <created> 7 <modified>
-SELECT * FROM INFORMATION_SCHEMA.LIBRARIES;
+SELECT * FROM INFORMATION_SCHEMA.LIBRARIES ORDER BY LIBRARY_NAME;
+--replace_column 5 <modified> 6 <created>
+SHOW LIBRARY STATUS like "library_%";
 
 --echo
 --echo ---> Synchronizing slave with master...
@@ -514,10 +539,16 @@ SHOW CREATE PROCEDURE p1;
 SHOW CREATE FUNCTION f1;
 SHOW CREATE LIBRARY test_library;
 SHOW CREATE FUNCTION test_function;
+SHOW CREATE LIBRARY library_with_comment;
+SHOW CREATE FUNCTION function_with_comment;
+SHOW CREATE FUNCTION orphaned_function;
+SHOW CREATE FUNCTION orphaned_function_modified;
 SELECT * FROM INFORMATION_SCHEMA.ROUTINE_LIBRARIES
 ORDER BY ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE, LIBRARY_CATALOG, LIBRARY_SCHEMA, LIBRARY_NAME, LIBRARY_VERSION;
 --replace_column 6 <created> 7 <modified>
-SELECT * FROM INFORMATION_SCHEMA.LIBRARIES;
+SELECT * FROM INFORMATION_SCHEMA.LIBRARIES ORDER BY LIBRARY_NAME;
+--replace_column 5 <modified> 6 <created>
+SHOW LIBRARY STATUS like "library_%";
 
 # Cleanup.
 
@@ -532,6 +563,10 @@ DROP PROCEDURE p1;
 DROP FUNCTION f1;
 DROP FUNCTION test_function;
 DROP LIBRARY test_library;
+DROP FUNCTION function_with_comment;
+DROP LIBRARY library_with_comment;
+DROP FUNCTION orphaned_function;
+DROP FUNCTION orphaned_function_modified;
 SELECT * FROM INFORMATION_SCHEMA.ROUTINE_LIBRARIES
 ORDER BY ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE, LIBRARY_CATALOG, LIBRARY_SCHEMA, LIBRARY_NAME, LIBRARY_VERSION;
 --echo # Ensure that drop statement with 'IF EXISTS' is written to binlog, even though the library does not actually exist

mysql-test/r/implicit_commit.result

@@ -272,6 +272,14 @@ CALL db1.test_if_commit();
 IMPLICIT COMMIT
 NO
 #
+# SQLCOM_SHOW_STATUS_LIBRARY
+#
+INSERT INTO db1.trans (a) VALUES (1);
+show library status where (1) in (select * from t1);
+CALL db1.test_if_commit();
+IMPLICIT COMMIT
+NO
+#
 # SQLCOM_SHOW_STATUS_PROC
 #
 INSERT INTO db1.trans (a) VALUES (1);

mysql-test/r/information_schema_libraries.result

@@ -19,7 +19,7 @@
 USE INFORMATION_SCHEMA;
 SHOW CREATE VIEW INFORMATION_SCHEMA.LIBRARIES;
 View	Create View	character_set_client	collation_connection
-LIBRARIES	CREATE ALGORITHM=UNDEFINED DEFINER=`mysql.infoschema`@`localhost` SQL SECURITY DEFINER VIEW `LIBRARIES` AS select `cat`.`name` AS `LIBRARY_CATALOG`,`sch`.`name` AS `LIBRARY_SCHEMA`,`rtn`.`name` AS `LIBRARY_NAME`,if(can_access_routine(`sch`.`name`,`rtn`.`name`,`rtn`.`type`,`rtn`.`definer`,true),`rtn`.`definition_utf8`,NULL) AS `LIBRARY_DEFINITION`,`rtn`.`external_language` AS `LANGUAGE`,`rtn`.`created` AS `CREATED`,`rtn`.`last_altered` AS `LAST_ALTERED`,`rtn`.`sql_mode` AS `SQL_MODE`,`rtn`.`definer` AS `CREATOR` from ((`mysql`.`routines` `rtn` join `mysql`.`schemata` `sch` on((`rtn`.`schema_id` = `sch`.`id`))) join `mysql`.`catalogs` `cat` on((`cat`.`id` = `sch`.`catalog_id`))) where ((0 <> can_access_routine(`sch`.`name`,`rtn`.`name`,`rtn`.`type`,`rtn`.`definer`,false)) and (`rtn`.`type` = 'LIBRARY'))	utf8mb3	utf8mb3_general_ci
+LIBRARIES	CREATE ALGORITHM=UNDEFINED DEFINER=`mysql.infoschema`@`localhost` SQL SECURITY DEFINER VIEW `LIBRARIES` AS select `cat`.`name` AS `LIBRARY_CATALOG`,`sch`.`name` AS `LIBRARY_SCHEMA`,`rtn`.`name` AS `LIBRARY_NAME`,if(can_access_routine(`sch`.`name`,`rtn`.`name`,`rtn`.`type`,`rtn`.`definer`,true),`rtn`.`definition_utf8`,NULL) AS `LIBRARY_DEFINITION`,`rtn`.`external_language` AS `LANGUAGE`,`rtn`.`created` AS `CREATED`,`rtn`.`last_altered` AS `LAST_ALTERED`,`rtn`.`sql_mode` AS `SQL_MODE`,`rtn`.`comment` AS `LIBRARY_COMMENT`,`rtn`.`definer` AS `CREATOR` from ((`mysql`.`routines` `rtn` join `mysql`.`schemata` `sch` on((`rtn`.`schema_id` = `sch`.`id`))) join `mysql`.`catalogs` `cat` on((`cat`.`id` = `sch`.`catalog_id`))) where ((0 <> can_access_routine(`sch`.`name`,`rtn`.`name`,`rtn`.`type`,`rtn`.`definer`,false)) and (`rtn`.`type` = 'LIBRARY'))	utf8mb3	utf8mb3_general_ci
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
   AND table_name   = 'LIBRARIES'
@@ -33,7 +33,8 @@ def	information_schema	LIBRARIES	LANGUAGE	5	SQL	NO	varchar	64	192	NULL	NULL	NULL
 def	information_schema	LIBRARIES	CREATED	6	NULL	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select			NULL
 def	information_schema	LIBRARIES	LAST_ALTERED	7	NULL	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select			NULL
 def	information_schema	LIBRARIES	SQL_MODE	8	NULL	NO	set	520	1560	NULL	NULL	NULL	utf8mb3	utf8mb3_bin	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','NOT_USED_9','NOT_USED_10','NOT_USED_11','NOT_USED_12','NOT_USED_13','NOT_USED_14','NOT_USED_15','NOT_USED_16','NOT_USED_17','NOT_USED_18','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','ALLOW_INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NOT_USED_29','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','TIME_TRUNCATE_FRACTIONAL')			select			NULL
-def	information_schema	LIBRARIES	CREATOR	9	NULL	NO	varchar	288	864	NULL	NULL	NULL	utf8mb3	utf8mb3_bin	varchar(288)			select			NULL
+def	information_schema	LIBRARIES	LIBRARY_COMMENT	9	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8mb3	utf8mb3_bin	text			select			NULL
+def	information_schema	LIBRARIES	CREATOR	10	NULL	NO	varchar	288	864	NULL	NULL	NULL	utf8mb3	utf8mb3_bin	varchar(288)			select			NULL
 DESCRIBE INFORMATION_SCHEMA.LIBRARIES;
 Field	Type	Null	Key	Default	Extra
 LIBRARY_CATALOG	varchar(64)	NO		NULL	
@@ -44,6 +45,7 @@ LANGUAGE	varchar(64)	NO		SQL
 CREATED	timestamp	NO		NULL	
 LAST_ALTERED	timestamp	NO		NULL	
 SQL_MODE	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','NOT_USED_9','NOT_USED_10','NOT_USED_11','NOT_USED_12','NOT_USED_13','NOT_USED_14','NOT_USED_15','NOT_USED_16','NOT_USED_17','NOT_USED_18','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','ALLOW_INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NOT_USED_29','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH','TIME_TRUNCATE_FRACTIONAL')	NO		NULL	
+LIBRARY_COMMENT	text	NO		NULL	
 CREATOR	varchar(288)	NO		NULL	
 ###############################################################################
 # Testcase libraries.2:  Successful library CREATE will populate
@@ -66,9 +68,9 @@ END;
 # must show only the library, not the procedure nor the function.
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES
 WHERE LIBRARY_SCHEMA = 'i_s_libraries_test';
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 def	i_s_libraries_test	test_2	
-export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost
+export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost
 # must show only the procedures and routines, not the library.
 SELECT ROUTINE_NAME, ROUTINE_TYPE FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA = 'i_s_libraries_test' ORDER BY ROUTINE_TYPE, ROUTINE_NAME;
@@ -88,9 +90,9 @@ END;
 # must show only the library
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES
 WHERE LIBRARY_SCHEMA = 'i_s_libraries_test';
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 def	i_s_libraries_test	test_2	
-export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost
+export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost
 # must show only the procedures and routines.
 SELECT ROUTINE_NAME, ROUTINE_TYPE FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA = 'i_s_libraries_test' ORDER BY ROUTINE_TYPE, ROUTINE_NAME;
@@ -102,9 +104,9 @@ DROP FUNCTION test_2;
 DROP PROCEDURE test_2;
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES
 WHERE LIBRARY_SCHEMA = 'i_s_libraries_test';
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 def	i_s_libraries_test	test_2	
-export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost
+export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost
 # must be empty.
 SELECT ROUTINE_NAME, ROUTINE_TYPE FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA = 'i_s_libraries_test' ORDER BY ROUTINE_TYPE, ROUTINE_NAME;
@@ -130,7 +132,7 @@ return n
 $$' at line 1
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES
 WHERE LIBRARY_SCHEMA = 'i_s_libraries_test';
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 ###############################################################################
 # Testcase libraries.4:  DROP LIBRARY - Verify DROP of a library
 #                                     removes I_S.LIBRARIES data for that
@@ -146,16 +148,16 @@ Warnings:
 Warning	6001	Language component: Not available.
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES
 WHERE LIBRARY_SCHEMA = 'i_s_libraries_test';
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 def	i_s_libraries_test	test_library_4	
-export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost
+export function f(n) {  return n } 	JAVASCRIPT	<created>	<modified>	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost
 DROP LIBRARY test_library_4;
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES
 WHERE LIBRARY_SCHEMA = 'i_s_libraries_test';
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 # final clean up
 DROP DATABASE i_s_libraries_test;
 USE test;
 SELECT * FROM INFORMATION_SCHEMA.LIBRARIES;
-LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	CREATOR
+LIBRARY_CATALOG	LIBRARY_SCHEMA	LIBRARY_NAME	LIBRARY_DEFINITION	LANGUAGE	CREATED	LAST_ALTERED	SQL_MODE	LIBRARY_COMMENT	CREATOR
 # End of INFORMATION_SCHEMA.LIBRARIES tests