From: magnus.blaudd
Date: May 23 2011 12:10pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4401)
List-Archive: http://lists.mysql.com/commits/137863
Message-Id: <20110523121023.46DFB13406E@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0803356928100240434=="

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

#At file:///home/msvensson/mysql/bug11885602/7.0/ based on revid:magnus.blaudd@stripped

 4401 magnus.blaudd@stripped	2011-05-23
      ndbinfo
       - rename all option variables in ndbinfo to have "opt_ndbinfo_" as prefix 

    modified:
      sql/ha_ndbinfo.cc
=== modified file 'sql/ha_ndbinfo.cc'
--- a/sql/ha_ndbinfo.cc	2011-05-23 11:57:55 +0000
+++ b/sql/ha_ndbinfo.cc	2011-05-23 12:09:04 +0000
@@ -56,10 +56,10 @@ static MYSQL_THDVAR_BOOL(
   FALSE                              /* default */
 );
 
-static char* ndbinfo_dbname = (char*)"ndbinfo";
+static char* opt_ndbinfo_dbname = (char*)"ndbinfo";
 static MYSQL_SYSVAR_STR(
   database,                         /* name */
-  ndbinfo_dbname,                   /* var */
+  opt_ndbinfo_dbname,               /* var */
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Name of the database used by ndbinfo",
   NULL,                             /* check func. */
@@ -67,10 +67,10 @@ static MYSQL_SYSVAR_STR(
   NULL                              /* default */
 );
 
-static char* table_prefix = (char*)"ndb$";
+static char* opt_ndbinfo_table_prefix = (char*)"ndb$";
 static MYSQL_SYSVAR_STR(
   table_prefix,                     /* name */
-  table_prefix,                     /* var */
+  opt_ndbinfo_table_prefix,         /* var */
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Prefix to use for all virtual tables loaded from NDB",
   NULL,                             /* check func. */
@@ -78,10 +78,10 @@ static MYSQL_SYSVAR_STR(
   NULL                              /* default */
 );
 
-static Uint32 version = NDB_VERSION_D;
+static Uint32 opt_ndbinfo_version = NDB_VERSION_D;
 static MYSQL_SYSVAR_UINT(
   version,                          /* name */
-  version,                          /* var */
+  opt_ndbinfo_version,              /* var */
   PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
   "Compile version for ndbinfo",
   NULL,                             /* check func. */
@@ -255,7 +255,7 @@ static void
 generate_sql(const NdbInfo::Table* ndb_tab, BaseString& sql)
 {
   sql.appfmt("'CREATE TABLE `%s`.`%s%s` (",
-             ndbinfo_dbname, table_prefix, ndb_tab->getName());
+             opt_ndbinfo_dbname, opt_ndbinfo_table_prefix, ndb_tab->getName());
 
   const char* separator = "";
   for (unsigned i = 0; i < ndb_tab->columns(); i++)
@@ -309,7 +309,7 @@ warn_incompatible(const NdbInfo::Table*
 
   msg.assfmt("Table '%s%s' is defined differently in NDB, %s. The "
              "SQL to regenerate is: ",
-             table_prefix, ndb_tab->getName(), explanation);
+             opt_ndbinfo_table_prefix, ndb_tab->getName(), explanation);
   generate_sql(ndb_tab, msg);
 
   const MYSQL_ERROR::enum_warning_level level =
@@ -670,7 +670,7 @@ ndbinfo_find_files(handlerton *hton, THD
     List_iterator<LEX_STRING> it(*files);
     while ((dir_name=it++))
     {
-      if (strcmp(dir_name->str, ndbinfo_dbname))
+      if (strcmp(dir_name->str, opt_ndbinfo_dbname))
         continue;
 
       DBUG_PRINT("info", ("Hiding own databse '%s'", dir_name->str));
@@ -681,7 +681,7 @@ ndbinfo_find_files(handlerton *hton, THD
   }
 
   DBUG_ASSERT(db);
-  if (strcmp(db, ndbinfo_dbname))
+  if (strcmp(db, opt_ndbinfo_dbname))
     DBUG_RETURN(0); // Only hide files in "our" db
 
   /* Hide all files that start with "our" prefix */
@@ -689,7 +689,7 @@ ndbinfo_find_files(handlerton *hton, THD
   List_iterator<LEX_STRING> it(*files);
   while ((file_name=it++))
   {
-    if (is_prefix(file_name->str, table_prefix))
+    if (is_prefix(file_name->str, opt_ndbinfo_table_prefix))
     {
       DBUG_PRINT("info", ("Hiding '%s'", file_name->str));
       it.remove();
@@ -721,11 +721,11 @@ int ndbinfo_init(void *plugin)
 
   char prefix[FN_REFLEN];
   build_table_filename(prefix, sizeof(prefix) - 1,
-                       ndbinfo_dbname, table_prefix, "", 0);
+                       opt_ndbinfo_dbname, opt_ndbinfo_table_prefix, "", 0);
   DBUG_PRINT("info", ("prefix: '%s'", prefix));
   assert(g_ndb_cluster_connection);
   g_ndbinfo = new NdbInfo(g_ndb_cluster_connection, prefix,
-                          ndbinfo_dbname, table_prefix);
+                          opt_ndbinfo_dbname, opt_ndbinfo_table_prefix);
   if (!g_ndbinfo)
   {
     sql_print_error("Failed to create NdbInfo");


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   25vipsdesx79yl92
# target_branch: file:///home/msvensson/mysql/bug11885602/7.0/
# testament_sha1: 4cafcd06533b1a46924f1ec96b24c8b18981ec9b
# timestamp: 2011-05-23 14:10:23 +0200
# base_revision_id: magnus.blaudd@stripped\
#   3l1esbdcl4reaj9m
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRpCqJIAAil/gFI4CQBUd///
ViGbAL///3BQBIz2Z3VVnOQqaNQkojSYjBMJppPIyaKD1MhpoA0PRNBKKMjR5QSeggaABoAAAAAk
UGqeiKfppRvUnpNPUYRp6g0DJoGmAQ5hMAmAEwmE0wAACZNNAwkkQwgRiEwpmp6gZpGQ0BoZB6SF
Gzhgqp015g8xn5tLb2JD0TS+K+cEOvd2XkLG6VhaNDvupO5XoO9oRQ2MYxPm4yOddaj1c+ppsFd/
v2ku2t+WrcpR7lMpujoTqycSInKU5zIHRw6ujUNjhXhc+9xe/88tenv/solfU4qc4cxi7x1wj1uC
uSnw77Ne6ya6fVYpOkDwYkDf1tHjqbmhAsKiAd3Dq537TkmEaedC2iFpBIxy0YFZ1EcBXBfEQkmX
9gMsudWnJI2LOka18+X3ZevVhb3+yFpYDaUmPMhPBkjjFjMRC20qKpChbpfw2Ir9stvnwBZmi2mT
lWfD+ObOC2DaMC4QsCEZkCeD31U2nwjnE0LAcux4b2lQNkbBwrwLE0S1zUOWRqYQxSKug0iNVJe+
ZEUdVRAlKIV46Go5px3mCVBPWCiiKxi3JUwI78IEj+KmzI1G2hhmrE/PJa2K3ZzIvpJz2nrLh8P9
zBe+0Li6Ag9kf23MGwwajpUFVJXMMW5ViiU20kRaTO7SyMtEC0e40DGaOKGKHLZCpSrcjdiODH1P
yKCYac5caBL70yGauodVmyuMqitLBcTSdx0rYTBSaoxq44JYljK+hiaB+AQKW7oN52xw1uGh2kSi
acOZYIzP4noGf3kNa4t7Q9XIy7l4gmkVLmMv6e/9u8/KbrOdYvJ0fPTvalqpjaHazinkA35MEzwe
OZCgeCAwLzZeeov55ESbx7pUHT4UpFNLQ+aQ8DtthaMglxj5LVmC1D5WKKlJIhs0kztv45dfZAyC
hySOxIkA5KXSAaVFSKys901u99ZhPQfUvfSDkjEuI0ijEm4T01645GzpyZ3j6mSIH52IFySxOQVp
FtpZMLgRvknLHE4MEMBbGq+zYembuGhnFsUAMA44huVfLfvlkYeEKDCiXFjdDRyqTFJRTc4upnC3
SRCrNIZ6k6BWy3m60u2b5njfGa/PdPvlQZdgCfMzJHgWuSMMDcHd3M8JSuSWtXbBya7u9iajxl+9
5gFI+cw1XJI9LdtDq4hiMxatDQykQOzuDY8MdUDuvmDaFQQCmg7xMdGSRvgkMnAWGHppJYHtEaA3
m8ZxvUwXFM1VFpo00ZWkYEo1MyWbBhaTzRIDTMucqgi1QFwbc+ejBtTSJLA9LRi0BF4KkDqeWWhy
5cniZl5JFgVrc5Z7lzwyZk8o6PCPPTDUBHEUhB08xZPWBca1GKS2UHEIILYos87x87pq7tronUqg
aGdIuhfSiArVmnsIg7gSXDdCM1qMOhzGvinpGNGzIC0lQUA2Wsn7Y62KqQ0vhMLEwNUyymaNEUi0
2yikcKwqes52ixC1BCJoSrkLMigHf8XckU4UJAaQqiSA


--===============0803356928100240434==--