diff options
author | unknown <serg@sergbook.mysql.com> | 2003-02-10 14:56:30 +0100 |
---|---|---|
committer | unknown <serg@sergbook.mysql.com> | 2003-02-10 14:56:30 +0100 |
commit | 1846f7320abd08d28552ae0fbcb2b5d86719972b (patch) | |
tree | e05f911353baf9881b79d15c204e8fadcad21c19 /sql/sql_acl.cc | |
parent | 7910884c5cbb59e89041506a12b9a3a567a97067 (diff) | |
parent | 556bb7bb3d98188d2243fd39b09e7cd4cfc7bfd2 (diff) | |
download | mariadb-git-1846f7320abd08d28552ae0fbcb2b5d86719972b.tar.gz |
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
Build-tools/Do-compile:
Auto merged
bdb/dist/configure.in:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 9091784bbf3..ee9d3f1c1ea 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1267,7 +1267,9 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, { if (combo.password.length != HASH_PASSWORD_LENGTH) { - my_error(ER_PASSWORD_NO_MATCH,MYF(0)); + my_printf_error(ER_PASSWORD_NO_MATCH, + "Password hash should be a %d-digit hexadecimal number", + MYF(0),HASH_PASSWORD_LENGTH); DBUG_RETURN(-1); } password=combo.password.str; |