diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-04-01 12:04:26 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-04-01 12:04:26 +0300 |
| commit | 1aafea91e5e11c355b978c85544059224ec473cf (patch) | |
| tree | a6fe26c7dc5503bdb62ef60d3e7d5f4ca2b816bb /include/sql_common.h | |
| parent | fee40e27738122d5c7d7916a1cfa8cd2b5a20186 (diff) | |
| parent | cebec393cf0a5558a2800fb193ba098bda4eabe1 (diff) | |
| download | mariadb-git-1aafea91e5e11c355b978c85544059224ec473cf.tar.gz | |
Merge with 5.1
Fixed valgrind warnings found from running main.connect under valgrind
sql/sp_head.cc:
Ensure that vcol_info is reset
sql/sql_acl.cc:
Fixed usage of wrong memroot for password
sql/sql_yacc.yy:
Ensure that vcol_info is reset
Diffstat (limited to 'include/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index 8a687baa285..6b66ae2fd81 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -96,7 +96,7 @@ void set_mysql_extended_error(MYSQL *mysql, int errcode, const char *sqlstate, struct st_plugin_vio_info; void mpvio_info(Vio *vio, struct st_plugin_vio_info *info); int run_plugin_auth(MYSQL *mysql, char *data, uint data_len, - char *data_plugin, const char *db); + const char *data_plugin, const char *db); int mysql_client_plugin_init(); void mysql_client_plugin_deinit(); struct st_mysql_client_plugin; |