mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse source 
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
This commit is contained in:
unknown 2005-09-20 21:27:28 +03:00
commit aa95f0d447
27 changed files with 486 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sql/ha_innodb.cc
View file

@ -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)) {