diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_sum.cc | 3 | ||||
| -rw-r--r-- | sql/item_sum.h | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 9af3eef3cd7..9c9f00af78b 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2003 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1013,7 +1013,6 @@ Item_sum_count_distinct::~Item_sum_count_distinct() } } - bool Item_sum_count_distinct::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { diff --git a/sql/item_sum.h b/sql/item_sum.h index dc412fe1750..be92f37f2a7 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -219,6 +219,7 @@ class Item_sum_count_distinct :public Item_sum_int always_null(item.always_null) {} ~Item_sum_count_distinct(); + table_map used_tables() const { return used_table_cache; } enum Sumfunctype sum_func () const { return COUNT_DISTINCT_FUNC; } void reset(); @@ -232,6 +233,7 @@ class Item_sum_count_distinct :public Item_sum_int { return new Item_sum_count_distinct(thd, *this); } + void no_rows_in_result() {} }; diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 689b14caac9..36bf93c8c34 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1338,7 +1338,9 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, if ((combo.password.length != HASH_PASSWORD_LENGTH) && combo.password.length != HASH_OLD_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; |