database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Added handler and temporary table usage to mytop

Browse Source 
Fixed prompt on reconnect in mysql client

client/mysql.cc:
  Free server_version for reconnect.
  This ensures that prompt is correct if reconnecting to a different server.
scripts/mytop.sh:
  Added handler and temporary table usage
This commit is contained in:
Michael Widenius
2011-12-03 23:06:16 +02:00
parent 921004e79d
commit 3e2cb35e11
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@ -2780,6 +2780,8 @@ static int reconnect(void)
} }
if (!connected) if (!connected)
return put_info("Can't connect to the server\n",INFO_ERROR); return put_info("Can't connect to the server\n",INFO_ERROR);
my_free(server_version,MYF(MY_ALLOW_ZERO_PTR));
server_version= 0;
/* purecov: end */ /* purecov: end */
return 0; return 0;
} }

38
scripts/mytop.sh
View File

@ -830,6 +830,11 @@ sub GetData()
%OLD_STATUS = %STATUS; %OLD_STATUS = %STATUS;
# Set some status that may not exist in all versions
$STATUS{Handler_tmp_write}= 0;
$STATUS{Handler_tmp_update}= 0;
$STATUS{Rows_tmp_read}= 0;
foreach my $ref (@recs) foreach my $ref (@recs)
{ {
my $key = $ref->{Variable_name}; my $key = $ref->{Variable_name};
@ -926,7 +931,7 @@ sub GetData()
$lines_left--; $lines_left--;
printf " Queries: %-6s qps: %4.0f Slow: %7s Se/In/Up/De(%%): %02.0f/%02.0f/%02.0f/%02.0f \n", printf " Queries: %-6s qps: %4.0f Slow: %7s Se/In/Up/De(%%): %02.0f/%02.0f/%02.0f/%02.0f\n",
make_short( $STATUS{Questions} ), # q total make_short( $STATUS{Questions} ), # q total
$STATUS{Questions} / $STATUS{Uptime}, # qps, average $STATUS{Questions} / $STATUS{Uptime}, # qps, average
make_short( $STATUS{Slow_queries} ), # slow make_short( $STATUS{Slow_queries} ), # slow
@ -944,7 +949,7 @@ sub GetData()
my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} ); my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} );
# print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions} / $t_delta = $q_diff\n"); # print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions} / $t_delta = $q_diff\n");
printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n", printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f\n",
( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta, ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta,
( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta, ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta,
( # slow now (qps) ( # slow now (qps)
@ -1014,6 +1019,35 @@ sub GetData()
} }
$lines_left--; $lines_left--;
if ($t_delta)
{
printf(" Handler: (R/W/U/D) %5d/%5d/%5d/%5d Tmp: R/W/U: %5d/%5d/%5d\n",
($STATUS{Handler_read_first}+$STATUS{Handler_read_key}+
$STATUS{Handler_read_next}+$STATUS{Handler_read_prev}+
$STATUS{Handler_read_rnd}+$STATUS{Handler_read_rnd_next} -
$OLD_STATUS{Handler_read_first}-$OLD_STATUS{Handler_read_key}-
$OLD_STATUS{Handler_read_next}-$OLD_STATUS{Handler_read_prev}-
$OLD_STATUS{Handler_read_rnd}-
$OLD_STATUS{Handler_read_rnd_next})/$t_delta,
($STATUS{Handler_write} - $OLD_STATUS{Handler_write}) /
$t_delta,
($STATUS{Handler_update} - $OLD_STATUS{Handler_update}) /
$t_delta,
($STATUS{Handler_delete} - $OLD_STATUS{Handler_delete}) /
$t_delta,
($STATUS{Rows_tmp_read} - $OLD_STATUS{Rows_tmp_read}) /
$t_delta,
($STATUS{Handler_tmp_write}
-$OLD_STATUS{Handler_tmp_write})/$t_delta,
($STATUS{Handler_tmp_update} -
$OLD_STATUS{Handler_tmp_update})/$t_delta);
}
else
{
print "\n";
}
$lines_left--;
printf(" MyISAM Key Efficiency: %2.1f%% Bps in/out: %5s/%5s ", printf(" MyISAM Key Efficiency: %2.1f%% Bps in/out: %5s/%5s ",
$cache_hits_percent, $cache_hits_percent,