From 960f6600c86d8b94e29825a3a6bf72f92353e17f Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Fri, 18 May 2012 16:40:16 +0300 Subject: Fixed compile warnings Fixed some mtr test problems dbug/tests.c: Fixed compiler warnings mysql-test/r/handlersocket.result: Fixed that plugin_license is written mysql-test/suite/innodb/t/innodb_bug60196.test: Force sorted results as it was sometimes different on windows mysql-test/suite/rpl/t/rpl_heartbeat_basic.test: Prolong test as this failed on windows mysql-test/t/handlersocket.test: Fixed that plugin_license is written plugin/handler_socket/handlersocket/handlersocket.cpp: Use maria_declare_plugin plugin/handler_socket/handlersocket/mysql_incl.hpp: Fixed compiler warning plugin/handler_socket/libhsclient/auto_addrinfo.hpp: Fixed compiler warning sql/handler.h: Fixed typo sql/sql_plugin.cc: Fixed bug that caused plugin library name twice in error message storage/maria/ma_checkpoint.c: Fixed compiler warning storage/maria/ma_loghandler.c: Fixed compiler warning unittest/mysys/base64-t.c: Fixed compiler warning unittest/mysys/bitmap-t.c: Fixed compiler warning unittest/mysys/my_malloc-t.c: Fixed compiler warning --- mysql-test/r/handlersocket.result | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mysql-test/r') diff --git a/mysql-test/r/handlersocket.result b/mysql-test/r/handlersocket.result index dcea3c186b6..a415b12f92d 100644 --- a/mysql-test/r/handlersocket.result +++ b/mysql-test/r/handlersocket.result @@ -1,13 +1,14 @@ install plugin handlersocket soname 'handlersocket.so'; -select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'; +select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description, plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'; plugin_name handlersocket plugin_version 1.0 plugin_status ACTIVE plugin_type DAEMON plugin_library handlersocket.so -plugin_library_version 0.0 +plugin_library_version 1.3 plugin_author higuchi dot akira at dena dot jp -plugin_license -plugin_maturity Unknown -plugin_auth_version Unknown +plugin_description Direct access into InnoDB +plugin_license BSD +plugin_maturity Beta +plugin_auth_version 1.0 uninstall plugin handlersocket; -- cgit v1.2.1