database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
This commit is contained in:
unknown
2005-01-24 15:50:13 +01:00
parent 343e9bbd34 8bdb500105
commit ba3b78d968
34 changed files with 170 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/set_var.cc
View File

@ -2912,8 +2912,8 @@ int set_var_password::check(THD *thd)
if (!user->host.str)
user->host.str= (char*) thd->host_or_ip;
/* Returns 1 as the function sends error to client */
return check_change_password(thd, user->host.str, user->user.str, password) ?
1 : 0;
return check_change_password(thd, user->host.str, user->user.str,
password, strlen(password)) ? 1 : 0;
#else
return 0;
#endif