diff options
| author | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-07-02 11:58:39 +0530 |
|---|---|---|
| committer | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-07-02 11:58:39 +0530 |
| commit | f5b5e6b951eabe6d6add84fa915d305a4a95cddf (patch) | |
| tree | e923a916e758c6cde635765b285649506d0fe00a /sql/sql_db.cc | |
| parent | 3ee4a82fd1b3f886c027f0144bdce260b721c5a1 (diff) | |
| download | mariadb-git-f5b5e6b951eabe6d6add84fa915d305a4a95cddf.tar.gz | |
WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7
Backporting wl6715 to mysql-5.5
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index ee02e811f67..6f5a79ad12f 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1529,8 +1529,8 @@ bool mysql_change_db(THD *thd, const LEX_STRING *new_db_name, bool force_switch) db_access= test_all_bits(sctx->master_access, DB_ACLS) ? DB_ACLS : - acl_get(sctx->host, - sctx->ip, + acl_get(sctx->get_host()->ptr(), + sctx->get_ip()->ptr(), sctx->priv_user, new_db_file_name.str, FALSE) | sctx->master_access; |