diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-21 16:22:13 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-21 16:22:13 +0200 |
| commit | 35a1a224014c1c7403ecbfe196ac2df27c8118e3 (patch) | |
| tree | 143a907410b9f62c902c2ffe1b43428c0f782f08 /sql/sql_acl.cc | |
| parent | 892e6fb0dc1af4d5aff79d9cf42f5cc4435874bf (diff) | |
| parent | 5a5dcb0f05f26be1f0892d2c7aa1076a6d521d4f (diff) | |
| download | mariadb-git-35a1a224014c1c7403ecbfe196ac2df27c8118e3.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 9f8510cab03..18758130767 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2402,8 +2402,10 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, { table->field[next_field]->store(combo.plugin.str, combo.plugin.length, system_charset_info); + table->field[next_field]->set_notnull(); table->field[next_field + 1]->store(combo.auth.str, combo.auth.length, system_charset_info); + table->field[next_field + 1]->set_notnull(); } else { |