bzr commit into mysql-5.1-telco-7.0 branch (jonas:3919) WL#5567

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 3919 Jonas Oreland	2010-11-03
      ndb - wl#5567 remove extra view that "It is decided that no extra summary view"

    modified:
      scripts/mysql_system_tables.sql
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2010-11-03 09:36:14 +0000
+++ b/scripts/mysql_system_tables.sql	2010-11-03 09:40:26 +0000
@@ -161,11 +161,6 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
-SET @str=IF(@have_ndbinfo,'DROP VIEW IF EXISTS ndbinfo.diskpagebufferusage','SET @dummy = 0');
-PREPARE stmt FROM @str;
-EXECUTE stmt;
-DROP PREPARE stmt;
-
 # Drop any old lookup tables in ndbinfo
 SET @str=IF(@have_ndbinfo,'DROP TABLE IF EXISTS ndbinfo.blocks','SET @dummy = 0');
 PREPARE stmt FROM @str;
@@ -367,9 +362,3 @@ SET @str=IF(@have_ndbinfo,'CREATE OR REP
 PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
-
-# ndbinfo.diskpagebufferusage
-SET @str=IF(@have_ndbinfo,'CREATE OR REPLACE SQL SECURITY INVOKER VIEW `ndbinfo`.`diskpagebufferusage` AS SELECT node_id,   SUM(pages_written) AS pages_written,   SUM(pages_written_lcp) AS pages_written_LCP,   SUM(pages_read) AS pages_read,   SUM(log_waits) AS log_waits,   (SUM(page_requests_direct_return) +    SUM(page_requests_wait_queue) +    SUM(page_requests_wait_io)   ) AS `page_requests_total =`,   SUM(page_requests_direct_return) AS `(PR_direct_return`,   SUM(page_requests_wait_queue) AS ` + PR_wait_queue`,   SUM(page_requests_wait_io)  AS ` + PR_wait_IO)` FROM ndbinfo.ndb$diskpagebuffer GROUP BY node_id','SET @dummy = 0');
-PREPARE stmt FROM @str;
-EXECUTE stmt;
-DROP PREPARE stmt;

=== modified file 'storage/ndb/tools/ndbinfo_sql.cpp'
--- a/storage/ndb/tools/ndbinfo_sql.cpp	2010-11-03 09:36:14 +0000
+++ b/storage/ndb/tools/ndbinfo_sql.cpp	2010-11-03 09:40:26 +0000
@@ -160,23 +160,7 @@ struct view {
      "pages_written, pages_written_lcp, pages_read, log_waits, "
      "page_requests_direct_return, page_requests_wait_queue, page_requests_wait_io "
      "FROM <NDBINFO_DB>.<TABLE_PREFIX>diskpagebuffer"
-   },
-   { "diskpagebufferusage",
-     "SELECT node_id, "
-     "  SUM(pages_written) AS pages_written, "
-     "  SUM(pages_written_lcp) AS pages_written_LCP, "
-     "  SUM(pages_read) AS pages_read, "
-     "  SUM(log_waits) AS log_waits, "
-     "  (SUM(page_requests_direct_return) + "
-     "   SUM(page_requests_wait_queue) + "
-     "   SUM(page_requests_wait_io) "
-     "  ) AS `page_requests_total =`, "
-     "  SUM(page_requests_direct_return) AS `(PR_direct_return`, "
-     "  SUM(page_requests_wait_queue) AS ` + PR_wait_queue`, "
-     "  SUM(page_requests_wait_io)  AS ` + PR_wait_IO)` "
-     "FROM <NDBINFO_DB>.<TABLE_PREFIX>diskpagebuffer "
-     "GROUP BY node_id"
-  }
+   }
 };
 
 size_t num_views = sizeof(views)/sizeof(views[0]);


Attachment: [text/bzr-bundle] bzr/[e-mail]