diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-05-18 16:40:16 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-05-18 16:40:16 +0300 |
| commit | 960f6600c86d8b94e29825a3a6bf72f92353e17f (patch) | |
| tree | 6f268179143188043af75c49a44d700b4d71ef24 /plugin/handler_socket/handlersocket | |
| parent | d4d3ca204f9d36b01be2c4dad15d0cc5b078c6e6 (diff) | |
| download | mariadb-git-960f6600c86d8b94e29825a3a6bf72f92353e17f.tar.gz | |
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
Diffstat (limited to 'plugin/handler_socket/handlersocket')
| -rw-r--r-- | plugin/handler_socket/handlersocket/handlersocket.cpp | 10 | ||||
| -rw-r--r-- | plugin/handler_socket/handlersocket/mysql_incl.hpp | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/plugin/handler_socket/handlersocket/handlersocket.cpp b/plugin/handler_socket/handlersocket/handlersocket.cpp index 7b60eaa28d3..2595d24a85c 100644 --- a/plugin/handler_socket/handlersocket/handlersocket.cpp +++ b/plugin/handler_socket/handlersocket/handlersocket.cpp @@ -197,20 +197,20 @@ static SHOW_VAR daemon_handlersocket_status_variables[] = { }; -mysql_declare_plugin(handlersocket) +maria_declare_plugin(handlersocket) { MYSQL_DAEMON_PLUGIN, &daemon_handlersocket_plugin, "handlersocket", "higuchi dot akira at dena dot jp", - "", + "Direct access into InnoDB", PLUGIN_LICENSE_BSD, daemon_handlersocket_init, daemon_handlersocket_deinit, 0x0100 /* 1.0 */, daemon_handlersocket_status_variables, daemon_handlersocket_system_variables, - 0 + "1.0", + MariaDB_PLUGIN_MATURITY_BETA } -mysql_declare_plugin_end; - +maria_declare_plugin_end; diff --git a/plugin/handler_socket/handlersocket/mysql_incl.hpp b/plugin/handler_socket/handlersocket/mysql_incl.hpp index ac937e4e74d..0fb4fceb143 100644 --- a/plugin/handler_socket/handlersocket/mysql_incl.hpp +++ b/plugin/handler_socket/handlersocket/mysql_incl.hpp @@ -36,6 +36,9 @@ #include <sql_base.h> // FIXME FIXME FIXME #define safeFree(X) my_free(X) +#undef pthread_cond_timedwait +#undef pthread_mutex_lock +#undef pthread_mutex_unlock #define pthread_cond_timedwait mysql_cond_timedwait #define pthread_mutex_lock mysql_mutex_lock #define pthread_mutex_unlock mysql_mutex_unlock |