diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
| commit | 6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f (patch) | |
| tree | c02d7fe89f0e9d9cbd05e83dd77ceeed812eb293 /sql/sql_acl.cc | |
| parent | 8d407c5f704c523205d52eabd89ca7fd366cf6eb (diff) | |
| parent | c96b249fc3912f7a86f885cc62da1a3eeed537c6 (diff) | |
| download | mariadb-git-6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 074f1047d67..7e004c05f8e 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5831,7 +5831,6 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list) { int result; String wrong_users; - ulong sql_mode; LEX_USER *user_name, *tmp_user_name; List_iterator <LEX_USER> user_list(list); TABLE_LIST tables[GRANT_TABLES]; @@ -5880,7 +5879,6 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list) } some_users_created= TRUE; - sql_mode= thd->variables.sql_mode; if (replace_user_table(thd, tables[0].table, *user_name, 0, 0, 1, 0)) { append_user(&wrong_users, user_name); |