diff options
| author | unknown <brian@zim.(none)> | 2006-09-15 10:48:30 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-15 10:48:30 -0700 |
| commit | eceb03503dd7bb596c55429d6340a8b8d3a802c5 (patch) | |
| tree | 38a741c6830b8df62515decf91468e563103df0c /include | |
| parent | 7d131bcde2b28d49889c83d870feafe8dd18f8d9 (diff) | |
| parent | d79485a9be6b2f638fd268aae9c4d0b4056a85d5 (diff) | |
| download | mariadb-git-eceb03503dd7bb596c55429d6340a8b8d3a802c5.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/plugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 417e949e83f..ae952ccab1e 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -88,8 +88,8 @@ struct st_mysql_plugin const char *name; /* plugin name */ const char *author; /* plugin author (for SHOW PLUGINS) */ const char *descr; /* general descriptive text (for SHOW PLUGINS ) */ - int (*init)(void); /* the function to invoke when plugin is loaded */ - int (*deinit)(void); /* the function to invoke when plugin is unloaded */ + int (*init)(void *); /* the function to invoke when plugin is loaded */ + int (*deinit)(void *);/* the function to invoke when plugin is unloaded */ unsigned int version; /* plugin version (for SHOW PLUGINS) */ struct st_mysql_show_var *status_vars; void * __reserved1; /* placeholder for system variables */ |