ha_innobase.cc: (6e87dc11) · Commits · Software / OSDI20 Artifacts / mariadb

sql/ha_innobase.cc

+36 −2

Original line number	Diff line number	Diff line
		@@ -267,6 +267,39 @@ innobase_mysql_print_thd(

		thd = (THD*) input_thd;

		buf += sprintf(buf, "MySQL thread id %lu, query id %lu",
		thd->thread_id, thd->query_id);
		if (thd->host) {
		buf += sprintf(buf, " %.30s", thd->host);
		}

		if (thd->ip) {
		buf += sprintf(buf, " %.20s", thd->ip);
		}

		if (thd->user) {
		buf += sprintf(buf, " %.20s", thd->user);
		}

		if (thd->proc_info) {
		buf += sprintf(buf, " %.50s", thd->proc_info);
		}

		if (thd->query) {
		buf += sprintf(buf, "\n%.150s", thd->query);
		}

		buf += sprintf(buf, "\n");

		#ifdef notdefined
		/* August 8, 2002
		Revert these changes because they seem to make control
		characters sometimes appear in the output and scramble it;
		on platforms (what are those?) where sprintf does not work
		we should define sprintf as 'my_emulated_sprintf'; InnoDB code
		contains lots of sprintfs, it does not help to remove them from
		just a single file */

		/* We can't use value of sprintf() as this is not portable */
		buf+= my_sprintf(buf,
		(buf, "MySQL thread id %lu",
		@@ -301,6 +334,7 @@ innobase_mysql_print_thd(
		buf=strnmov(buf, thd->query, 150);
		}
		*buf='\n';
		#endif
		}
		}