diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-20 21:27:28 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-20 21:27:28 +0300 |
| commit | aa95f0d447ed43cb20f1ce3221334b8f75e82377 (patch) | |
| tree | cf23bc3ce44cfb64999ab1aa22adb7cb2e200b85 /sql/ha_innodb.cc | |
| parent | 92e2dbb634898b2bc5caed2c490fae4b20c2b92d (diff) | |
| parent | 3fe752f527895bcd6b32f9cf7f1dcd983d4b4313 (diff) | |
| download | mariadb-git-aa95f0d447ed43cb20f1ce3221334b8f75e82377.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
sql/ha_innodb.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/item_func.cc:
merge
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 491aaf5a226..9e10873ad63 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -563,25 +563,29 @@ innobase_mysql_print_thd( use the default max length */ { const THD* thd; + const Security_context *sctx; const char* s; thd = (const THD*) input_thd; + /* We probably want to have original user as part of debug output. */ + sctx = &thd->main_security_ctx; + fprintf(f, "MySQL thread id %lu, query id %lu", thd->thread_id, (ulong) thd->query_id); - if (thd->host) { + if (sctx->host) { putc(' ', f); - fputs(thd->host, f); + fputs(sctx->host, f); } - if (thd->ip) { + if (sctx->ip) { putc(' ', f); - fputs(thd->ip, f); + fputs(sctx->ip, f); } - if (thd->user) { + if (sctx->user) { putc(' ', f); - fputs(thd->user, f); + fputs(sctx->user, f); } if ((s = thd->proc_info)) { |