From: Maitrayi Sabaratnam
Date: April 12 2011 3:02pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (maitrayi.sabaratnam:4164)
List-Archive: http://lists.mysql.com/commits/135274
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2126041912=="

--===============2126041912==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home2/tmp/maitrayi/mysql-repo/repo-7.1/mysql-5.1-telco-7.1-genno/ based on revid:maitrayi.sabaratnam@stripped

 4164 Maitrayi Sabaratnam	2011-04-12
      Bug 12330248: Change mysql_system_tables.sql to handle generation

    modified:
      scripts/mysql_system_tables.sql
=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2011-04-08 13:07:58 +0000
+++ b/scripts/mysql_system_tables.sql	2011-04-12 15:01:48 +0000
@@ -292,7 +292,7 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
-SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndbinfo`.`ndb$nodes` (`node_id` INT UNSIGNED,`uptime` BIGINT UNSIGNED COMMENT "time in seconds that node has been running",`status` INT UNSIGNED COMMENT "starting/started/stopped etc.",`start_phase` INT UNSIGNED COMMENT "start phase if node is starting") COMMENT="node status" ENGINE=NDBINFO','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE TABLE `ndbinfo`.`ndb$nodes` (`node_id` INT UNSIGNED,`uptime` BIGINT UNSIGNED COMMENT "time in seconds that node has been running",`status` INT UNSIGNED COMMENT "starting/started/stopped etc.",`start_phase` INT UNSIGNED COMMENT "start phase if node is starting",`config_generation` INT UNSIGNED COMMENT "configuration generation number") COMMENT="node status" ENGINE=NDBINFO','SET @dummy = 0');
 PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
@@ -361,7 +361,7 @@ EXECUTE stmt;
 DROP PREPARE stmt;
 
 # ndbinfo.nodes
-SET @str=IF(@have_ndbinfo,'CREATE OR REPLACE DEFINER=`root@localhost` SQL SECURITY INVOKER VIEW `ndbinfo`.`nodes` AS SELECT node_id, uptime, CASE status  WHEN 0 THEN "NOTHING"  WHEN 1 THEN "CMVMI"  WHEN 2 THEN "STARTING"  WHEN 3 THEN "STARTED"  WHEN 4 THEN "SINGLEUSER"  WHEN 5 THEN "STOPPING_1"  WHEN 6 THEN "STOPPING_2"  WHEN 7 THEN "STOPPING_3"  WHEN 8 THEN "STOPPING_4"  ELSE "<unknown>"  END AS status, start_phase FROM ndbinfo.ndb$nodes','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE OR REPLACE DEFINER=`root@localhost` SQL SECURITY INVOKER VIEW `ndbinfo`.`nodes` AS SELECT node_id, uptime, CASE status  WHEN 0 THEN "NOTHING"  WHEN 1 THEN "CMVMI"  WHEN 2 THEN "STARTING"  WHEN 3 THEN "STARTED"  WHEN 4 THEN "SINGLEUSER"  WHEN 5 THEN "STOPPING_1"  WHEN 6 THEN "STOPPING_2"  WHEN 7 THEN "STOPPING_3"  WHEN 8 THEN "STOPPING_4"  ELSE "<unknown>"  END AS status, start_phase, config_generation FROM ndbinfo.ndb$nodes','SET @dummy = 0');
 PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;


--===============2126041912==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/maitrayi.sabaratnam@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: maitrayi.sabaratnam@stripped\
#   ltg0s41oagly28rb
# target_branch: file:///export/home2/tmp/maitrayi/mysql-repo/repo-\
#   7.1/mysql-5.1-telco-7.1-genno/
# testament_sha1: 4aca4bf3378548d012eff15d6dbea449262ba4ef
# timestamp: 2011-04-12 17:02:21 +0200
# source_branch: file:///export/home2/tmp/maitrayi/repo/repo-70/mysql-\
#   5.1-telco-7.0-genno/
# base_revision_id: maitrayi.sabaratnam@stripped\
#   zdkm39o3p13s2ikm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRb/WvgAAeZfgAAQVOf//3/v
/6D////wUAVNPW4U2crS4zQc5cJRQyKejTRPQzUNT1T9Ap6mj1PTJPFPE1Mj1NNNDQSiE0yNA01N
CMgT0hoAAAADQAkkaIamVPyapsU2RHqaYmR6g9QAHqaM1AA5pkZDJghowmCNNGjEDTJkYAAgkkQy
EaZNTap+gKeCmTJoxNANMIDENJHTi/j13ly9MRPSvkaBeneofo6oKLh6KBk+KBrDfIzhRmZT5Ds6
g/M659WWDmaEYw5WHnF3N/9MAw8jcsA09F7GX7sQc2cNvFlDLs1/FXRVXXOhLMgWedbvL7+dLn9C
jFTDyy9LcXq1ij5ZkljpaQejcGnlzXPR7uyqqzqkWvUy/8tq/MxtUQ5Jk4gdtOQOsmPRf7zOQ27i
QlV9ZzCLi6E9+vZUJkP1LnhZSnfGdvZgbpGTohb0iD47rtNpquWrUQFxUuIKEROc+gdChLEeb5mU
005xoKwDfpOLbuqEec3mWuQgxuN+CBe/8VaruOCO060rTGIjZWugJPtTI3yLHZYtFEm6VNae42qI
PthBAmnqGNG+XnMxu8S9M5yCwNl2JZspypdKjyuwmmg7c5KzRnBLi83a6udFRksyzDm1TgmTEDlo
JDIqfiS5KDhFaWDrIDyZDr3kZMW0xlJKMn4sDVw5TXfW6z9vkIVETYanyuVtRZqGarS1IhXXgpDH
DKujMzf0bC4dG6QQMD9LLY4TGJzZui+ySQnu16CRCpGXo1hazSVpfM1vLkxsa+Tca3F1a1q0J3iJ
r6LErRoQxLwORdxqfCaxTM/ueKjdsj8YsFk8S6jiHMnxYgddphezDM+3rlseOEEekkQ+kBND5ZLS
6MuAud3CTXRr7BAxuRZvlUwWblc9bKLMhgpQdyBqPHtOSlHd2PrjL3hhUGLPt4Sz2QaWpFTkXZpU
grtihgeyMvih4PQzW0YqEYwsyWBPiC1nKonbk1BoZx9RxFqMsmE0AoDIo0bSwvigug4WSIhF2Sd7
0Flodxp27HAMdX3cdIbgkJZmdvm7DpxtGh6uBN9oNxp2WR817TYPH1Z7VTCD8wdPoiHEnkhIHmFl
1sI+vXoBYIXFmFIqRKKQJ2YmAHhpkHpHQwWDXXMXnVmGGKki0bzxqoRqlD25+VGOk44Vk/rhy2FV
EJ5EQkp6/PVCVUnlCWHPXW/bI22jE6noYE2LQhi9EzohgqROY2o/gtr/4dW0wz3scrGuBGbp6YDt
8eeeVT41qyVqxD6Fd3BadNtnGSMdS7bV1cVSw+a6vywkgs0OBmipCmldoUpVoCnFM6LQijXUJz4c
fZOI7GyGcxFJav7uxvFIOI1cQ7fMrRQK37Ufuhm4dMiUN5wGgIdLaVh4Sved5Qa3QuByRE2b9sRs
mTIwNDFnLzEjkVGIMP2EuVCCwuuq+2BHApbjpClEMzXe3vqJwuWtY9XgGgKQpcDwudCNCQ4kCotz
a6NAqxTVCMyutfIIxBeHecIzs8VVYUk7nTOL6ZiaUkGqM2CMVhc49Y3kxpSIUzBz8+olcSwVAMoI
H4NVZNEqafyGmx8pBFLKF71LusY1N0JjmExpwAZm5DbEFSAzcblMqdiQwUKLlx5SnmWviXBsZk8n
hJqN85KXHXgQMboX3Jd7SGUokueNTKSRJI8ooIt8OJPG/ptVNcscgVsTsZXRx0xm1IEGNC2ieI/M
I4OZ6K3NymFwLYl3T1LI76EsldLOtjVRrwdIOQWhcGJy72XMachR4KiGHhdVqqCmR0IiylXneYDS
oAfFC9MZ0iFU4KMwzt6Nak5sqsp3MejFWN/OlzjsLypa+EFejv3czoUZmsZyZMImUrlRBiFsO190
iYjRLH/xdyRThQkBb/WvgA==


--===============2126041912==--