bzr commit into mysql-falcon branch (hakan:227)

[Hakan Kuecuekyilmaz]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/

  227 Hakan Kuecuekyilmaz	2008-07-10
      Suppress opendir() warnings.
modified:
  dbt2/include/sample_cpu_data.php
  dbt2/include/sample_dbt2_data.php
  dbt2/weekly_dbt2_overview.php
  dbt2/weekly_dbt2_overview.sh

per-file messages:
  dbt2/include/sample_cpu_data.php
    Suppress opendir() warnings.
  dbt2/include/sample_dbt2_data.php
    Suppress opendir() warnings.
  dbt2/weekly_dbt2_overview.php
    Suppress opendir() warnings.
  dbt2/weekly_dbt2_overview.sh
    bzr is not always located in  /usr/bin. Get more output from bzr log.
=== modified file 'dbt2/include/sample_cpu_data.php'
--- a/dbt2/include/sample_cpu_data.php	2008-05-27 20:44:22 +0000
+++ b/dbt2/include/sample_cpu_data.php	2008-07-10 10:29:27 +0000
@@ -36,7 +36,7 @@ function sample_cpu_data($directory)
     $cpu['system'] = array();
     $cpu['io'] = array();
 
-    if ($dir = opendir($directory)) {
+    if ($dir = @opendir($directory)) {
         while (($file_name = readdir($dir)) !== false) {
             if ($file_name != '.' && $file_name != '..'
                 && strpos($file_name, 'stats.out')) {

=== modified file 'dbt2/include/sample_dbt2_data.php'
--- a/dbt2/include/sample_dbt2_data.php	2008-04-02 09:32:34 +0000
+++ b/dbt2/include/sample_dbt2_data.php	2008-07-10 10:29:27 +0000
@@ -24,7 +24,7 @@ function sample_dbt2_data($directory)
     $pattern = "/(^FALCON|^INNODB)_[0-9]{4}-[0-9]{2}-[0-9]{2}_([0-9]{1,3}).log/";
     /*           $matches[1]                                  $matches[2]      */
 
-    if ($dir = opendir($directory)) {
+    if ($dir = @opendir($directory)) {
         while (($file_name = readdir($dir)) !== false) {
             if ($file_name != '.' && $file_name != '..'
                 && strpos($file_name, '.log')) {

=== modified file 'dbt2/weekly_dbt2_overview.php'
--- a/dbt2/weekly_dbt2_overview.php	2008-06-17 07:49:19 +0000
+++ b/dbt2/weekly_dbt2_overview.php	2008-07-10 10:29:27 +0000
@@ -23,7 +23,7 @@ require_once './include/dbt2_config.php'
 define('DBT2_LOG_DIR', '.');
 define('STACKTRACE', 'This could be because you hit a bug');
 
-define('BK_VERSION', './bzr_version.txt');
+define('BZR_VERSION', './bzr_version.txt');
 define('DBT2_CONFIG', './dbt2_config.txt');
 define('MACHINE_INFO', './machine_info.txt');
 
@@ -53,7 +53,7 @@ $pattern = "/(^FALCON|^INNODB)_[0-9]{4}-
 foreach ($directories as $data) {
     $graphs[$data] = array();
 
-    if ($dir = opendir(DBT2_LOG_DIR . "/$data")) {
+    if ($dir = @opendir(DBT2_LOG_DIR . "/$data")) {
         while (($file_name = readdir($dir)) !== false) {
             if ($file_name != '.' && $file_name != '..'
                 && strpos($file_name, '.png')) {
@@ -84,7 +84,7 @@ foreach ($directories as $data) {
     $error_files[$data] = array();
     $directory = DBT2_LOG_DIR . '/' . $data . '/err';
 
-    if ($dir = opendir($directory)) {
+    if ($dir = @opendir($directory)) {
         while (($file_name = readdir($dir)) !== false) {
             if ($file_name != '.' && $file_name != '..'
                 && strpos($file_name, '.err')) {
@@ -435,9 +435,10 @@ foreach ($directories as $data) {
 
 <div class="dbt2">
 <?php
-if (file_exists(BK_VERSION)) {
+if (file_exists(BZR_VERSION)) {
+    echo '<h2>Change set and machine information</h2>' . "\n";
     echo '<pre>' . "\n";
-    echo trim(file_get_contents(BK_VERSION));
+    echo trim(file_get_contents(BZR_VERSION));
     echo '</pre>' . "\n";
 }
 

=== modified file 'dbt2/weekly_dbt2_overview.sh'
--- a/dbt2/weekly_dbt2_overview.sh	2008-06-30 08:51:27 +0000
+++ b/dbt2/weekly_dbt2_overview.sh	2008-07-10 10:29:27 +0000
@@ -45,6 +45,11 @@ else
 fi
 
 #
+# PATH.
+#
+export PATH="/usr/local/bin:$PATH"
+
+#
 # Timestamps.
 #
 TIMESTAMP=$(date +%Y-%m-%d_%H:%M:%S)
@@ -427,7 +432,7 @@ for ENGINE in FALCON INNODB
 done
 
 # Get bzr revision-id for reference.
-bzr log --limit=1 --show-ids $FALCON | head -n3 > $DBT2_RUNS/bzr_version.txt
+bzr log --limit=1 --show-ids $FALCON | head -n7 > $DBT2_RUNS/bzr_version.txt
 
 TIMESTAMP=$(date +%Y-%m-%d_%H:%M:%S)