diff options
| author | unknown <antony@pcg5ppc.xiphis.org> | 2008-03-07 13:46:29 -0800 |
|---|---|---|
| committer | unknown <antony@pcg5ppc.xiphis.org> | 2008-03-07 13:46:29 -0800 |
| commit | 7b5da0aa77b070d997f40cdc73d1bf8ccd503ed7 (patch) | |
| tree | 5eca346659ddf3033d7dcf7b2af9b45a8f391a92 /include | |
| parent | 6c2420ed3c0e074fc3b7f47ce00e7ce220906e2c (diff) | |
| parent | e0075179c3b69770ad7d8a5a9d1373ff1657e79f (diff) | |
| download | mariadb-git-7b5da0aa77b070d997f40cdc73d1bf8ccd503ed7.tar.gz | |
Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines
into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
configure.in:
Auto merged
include/mysql/plugin.h:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/partition_innodb.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/partition_innodb.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/plugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 7f96d3f33b7..a978d44b918 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -187,7 +187,7 @@ typedef int (*mysql_var_check_func)(MYSQL_THD thd, */ typedef void (*mysql_var_update_func)(MYSQL_THD thd, struct st_mysql_sys_var *var, - void *var_ptr, void *save); + void *var_ptr, const void *save); /* the following declarations are for internal use only */ |