summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2013-10-18 05:41:43 -0700
committerSergei Golubchik <sergii@pisem.net>2013-10-18 05:41:43 -0700
commit1fe92724794421e68dfc8d058676213c5dfb95bb (patch)
treee56ba981755c0ca792882b0531aff20a593c8324 /sql
parent3fa2cb2126a5df20ae539b72095c7347343e01bc (diff)
downloadmariadb-git-1fe92724794421e68dfc8d058676213c5dfb95bb.tar.gz
Removed no longer used error message.
Diffstat (limited to 'sql')
-rw-r--r--sql/share/errmsg-utf8.txt3
-rw-r--r--sql/sql_acl.cc2
2 files changed, 1 insertions, 4 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 3445af7e78f..a6e3a74df0a 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6569,6 +6569,3 @@ ER_INVALID_ROLE
ER_INVALID_CURRENT_USER
eng "The current user is invalid."
rum "Utilizatorul curent este invalid."
-ER_INVALID_ROLE_COMMAND
- eng "Unable to execute role related command. The user table is in invalid format."
- rum "Comanda asupra rolurilor nu poate fi executate. Tabelul "user" este in format invalid."
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index d3fb0b54d7f..b9479678ab1 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3134,7 +3134,7 @@ static int replace_user_table(THD *thd, TABLE *table, LEX_USER &combo,
DBUG_RETURN(-1);
}
- table->use_all_columns();
+ table->use_all_columns();
table->field[0]->store(combo.host.str,combo.host.length,
system_charset_info);
table->field[1]->store(combo.user.str,combo.user.length,