bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3375)

[Ole John Aske]

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3375 Ole John Aske	2010-11-19 [merge]
      SPJ-scan-scan: Merge from telco-7.0 due to warning on Windows.

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-11-17 11:59:32 +0000
+++ b/sql/ha_ndbcluster.cc	2010-11-19 11:25:46 +0000
@@ -14741,11 +14741,9 @@ pthread_handler_t ndb_util_thread_func(v
 #ifndef NDB_THD_HAS_NO_VERSION
   thd->version=refresh_version;
 #endif
-  thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities = 0;
+  thd->security_ctx->skip_grants();
   my_net_init(&thd->net, 0);
-  thd->main_security_ctx.master_access= ~0;
-  thd->main_security_ctx.priv_user = 0;
 
   CHARSET_INFO *charset_connection;
   charset_connection= get_charset_by_csname("utf8",

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-11-15 09:18:27 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-11-16 14:05:31 +0000
@@ -641,11 +641,9 @@ setup_thd(char * stackptr)
 #ifndef NDB_THD_HAS_NO_VERSION
   thd->version= refresh_version;
 #endif
-  thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities= 0;
-  thd->main_security_ctx.master_access= ~0;
-  thd->main_security_ctx.priv_user= 0;
   thd->lex->start_transaction_opt= 0;
+  thd->security_ctx->skip_grants();
 
   CHARSET_INFO *charset_connection= get_charset_by_csname("utf8",
                                                           MY_CS_PRIMARY,
@@ -5988,11 +5986,9 @@ pthread_handler_t ndb_binlog_thread_func
 #ifndef NDB_THD_HAS_NO_VERSION
   thd->version= refresh_version;
 #endif
-  thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities= 0;
+  thd->security_ctx->skip_grants();
   my_net_init(&thd->net, 0);
-  thd->main_security_ctx.master_access= ~0;
-  thd->main_security_ctx.priv_user= 0;
 
   /*
     Set up ndb binlog

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2010-11-15 11:08:25 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2010-11-19 11:25:46 +0000
@@ -1494,7 +1494,7 @@ int ha_ndbcluster_cond::generate_scan_fi
             sprintf(buf+strlen(buf), " %02x", ptr[k]);
           }
           ptr+=key_part->store_length;
-          if (ptr - key->key >= key->length)
+          if (ptr - key->key >= (ptrdiff_t)key->length)
           {
             /*
               key_range has no count of parts so must test byte length.
@@ -1593,7 +1593,7 @@ int ha_ndbcluster_cond::generate_scan_fi
             DBUG_RETURN(1);
         }
         ptr+=key_part->store_length;
-        if (ptr - start_key->key >= start_key->length)
+        if (ptr - start_key->key >= (ptrdiff_t)start_key->length)
         {
           break;
         }

No bundle (reason: revision is a merge).