diff options
| author | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 18:06:46 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 18:06:46 +0500 |
| commit | 6d77ba47e5a7dfc54b02635a3133c5b617aaec72 (patch) | |
| tree | e96377e9f3f5a868efad3b6ac8a49591257dc883 /sql/sql_acl.cc | |
| parent | 3436f0acc1206c2614ee280b79e295c8deace91f (diff) | |
| parent | abd883f4d02e6d32c4ac0446345bd27c2455db55 (diff) | |
| download | mariadb-git-6d77ba47e5a7dfc54b02635a3133c5b617aaec72.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/5.0
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/table.cc:
Auto merged
include/mysql_com.h:
manual merge
mysql-test/r/ctype_utf8.result:
manual merge
mysql-test/t/ctype_utf8.test:
manual merge
sql/sql_acl.cc:
manual merge
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 010a5c33b96..1786ad5972d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3232,10 +3232,11 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, result= TRUE; continue; } - if (replace_user_table(thd, tables[0].table, *Str, - (!db ? rights : 0), revoke_grant, create_new_users, - test(thd->variables.sql_mode & - MODE_NO_AUTO_CREATE_USER))) + if ((replace_user_table(thd, + tables[0].table, + *Str, + (!db ? rights : 0), revoke_grant, + create_new_users))) result= -1; else if (db) { |