diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-04 13:34:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-04 13:34:25 +0200 |
| commit | c96b82f652b1b3e8dbce7b0f90123beeeefb1b28 (patch) | |
| tree | 0869c0cd3f4f86b4e0b1181e85ac70c2b640199d /libmysqld | |
| parent | 0b6c4bb34f99b8f4023fd0bef25a1b714f96b699 (diff) | |
| download | mariadb-git-c96b82f652b1b3e8dbce7b0f90123beeeefb1b28.tar.gz | |
fix embedded to compile with -DHAVE_EMBEDDED_PRIVILEGE_CONTROL
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index ad2163c788c..2c959200457 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -771,15 +771,15 @@ int check_embedded_connection(MYSQL *mysql, const char *db) if (acl_authenticate(thd, 0, end - buf)) { - x_free(thd->security_ctx->user); + my_free(thd->security_ctx->user); goto err; } return 0; err: - strmake_buf(net->last_error, thd->main_da.message()); + strmake_buf(net->last_error, thd->get_stmt_da()->message()); memcpy(net->sqlstate, - mysql_errno_to_sqlstate(thd->main_da.sql_errno()), + mysql_errno_to_sqlstate(thd->get_stmt_da()->sql_errno()), sizeof(net->sqlstate)-1); return 1; } |