diff options
| author | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
| commit | ceadd59644981c103831d9c20b1f06bbab337989 (patch) | |
| tree | d53c392b402d00eeeb5b401ac93da40017f87801 /plugin | |
| parent | 7bb3501ff901d62fe249373e848a81c3c0e973b8 (diff) | |
| parent | 6c7a278c836c086d59a84589988536d654fd0a57 (diff) | |
| download | mariadb-git-ceadd59644981c103831d9c20b1f06bbab337989.tar.gz | |
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-maria1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/mf_tempfile.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
BUILD/compile-dist:
SCCS merged
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/daemon_example/daemon_example.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc index af585bb4302..e683bf7ab7a 100644 --- a/plugin/daemon_example/daemon_example.cc +++ b/plugin/daemon_example/daemon_example.cc @@ -81,7 +81,7 @@ pthread_handler_t mysql_heartbeat(void *p) 1 failure (cannot happen) */ -static int daemon_example_plugin_init(void *p) +static int daemon_example_plugin_init(void *p __attribute__ ((unused))) { DBUG_ENTER("daemon_example_plugin_init"); @@ -147,7 +147,7 @@ static int daemon_example_plugin_init(void *p) */ -static int daemon_example_plugin_deinit(void *p) +static int daemon_example_plugin_deinit(void *p __attribute__ ((unused))) { DBUG_ENTER("daemon_example_plugin_deinit"); char buffer[HEART_STRING_BUFFER]; |