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 /sql-common | |
| 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 'sql-common')
| -rw-r--r-- | sql-common/client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 96620e919f4..447518c9e5d 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2394,7 +2394,7 @@ static void client_mpvio_info(MYSQL_PLUGIN_VIO *vio, */ int run_plugin_auth(MYSQL *mysql, char *data, uint data_len, - char *data_plugin, const char *db) + const char *data_plugin, const char *db) { const char *auth_plugin_name; auth_plugin_t *auth_plugin; @@ -2540,7 +2540,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, char buff[NAME_LEN+USERNAME_LENGTH+100]; int scramble_data_len, pkt_scramble_len; char *end, *host_info=0, *server_version_end, *pkt_end; - char *scramble_data, *scramble_plugin; + char *scramble_data; + const char *scramble_plugin; my_socket sock; in_addr_t ip_addr; struct sockaddr_in sock_addr; |