mirror of
https://github.com/MariaDB/server.git
synced 2026-04-21 07:45:32 +02:00
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/t/query_cache.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_delete.cc: Auto merged mysql-test/r/query_cache.result: SCCS merged
This commit is contained in:
commit
98b7766053
188 changed files with 29837 additions and 21547 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue