diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | 506c7fd47dd28e5726852e47d117bfbb37677005 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /sql/sql_connect.cc | |
| parent | 4557f4ee9e9975966be6fa7c4fa553b30992ca6d (diff) | |
| parent | fbb96b339ae5fcce19446fd27a2fb75e49b960f8 (diff) | |
| download | mariadb-git-506c7fd47dd28e5726852e47d117bfbb37677005.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 02c8297d019..06528a27da5 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -55,7 +55,7 @@ static int get_or_create_user_conn(THD *thd, const char *user, USER_RESOURCES *mqh) { int return_val= 0; - uint temp_len, user_len; + size_t temp_len, user_len; char temp_user[USER_HOST_BUFF_SIZE]; struct user_conn *uc; |