Merge changes from MySQL AB, and remove two compilation warnings.

ha_innodb.cc: innodb_mutex_show_status(): Add (ulong) casts to
ulonglong expressions being passed to fprintf %lu.  The warnings
were apparently introduced by MySQL AB developers.

mysql_declare_plugin(innobase): Add PLUGIN_LICENSE_GPL.

have_innodb.inc: Merge changes from MySQL AB.

handler/ha_innodb.cc

@@ -6630,7 +6630,7 @@ innodb_mutex_show_status(
 					mutex->count_spin_rounds,
 					mutex->count_os_wait,
 					mutex->count_os_yield,
-					mutex->lspent_time/1000);
+					(ulong) mutex->lspent_time/1000);
 
 				if (stat_print(thd, innobase_hton_name,
 						hton_name_len, buf1, buf1len,
@@ -6660,7 +6660,7 @@ innodb_mutex_show_status(
 		rw_lock_count, rw_lock_count_spin_loop,
 		rw_lock_count_spin_rounds,
 		rw_lock_count_os_wait, rw_lock_count_os_yield,
-		rw_lock_wait_time/1000);
+		(ulong) rw_lock_wait_time/1000);
 
 	if (stat_print(thd, innobase_hton_name, hton_name_len,
 			STRING_WITH_LEN("rw_lock_mutexes"), buf2, buf2len)) {
@@ -7640,6 +7640,7 @@ mysql_declare_plugin(innobase)
   innobase_hton_name,
   "Innobase OY",
   "Supports transactions, row-level locking, and foreign keys",
+  PLUGIN_LICENSE_GPL,
   innobase_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,

mysql-test/have_innodb.inc

--- require r/have_innodb.require
 disable_query_log;
-show variables like "have_innodb";
+--require r/true.require
+select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb';
 enable_query_log;