diff options
| author | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-08-23 09:07:09 +0530 |
|---|---|---|
| committer | Ashish Agarwal <ashish.y.agarwal@oracle.com> | 2013-08-23 09:07:09 +0530 |
| commit | d75c58e11fb864abafb48d74efd9bb1dbdc9f4c4 (patch) | |
| tree | 01a2e2f69168201021668f8d6144a6aa701c61ad /sql/sql_db.cc | |
| parent | f7e0cc8204ab2e9e09e96e77f015dfb369553de0 (diff) | |
| parent | f5b5e6b951eabe6d6add84fa915d305a4a95cddf (diff) | |
| download | mariadb-git-d75c58e11fb864abafb48d74efd9bb1dbdc9f4c4.tar.gz | |
WL#7076: Backporting wl6715 to support both formats
in 5.5, 5.6, 5.7.
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 ef83239bebf..f4ac6fbbef7 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1532,8 +1532,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; |