bk commit into 5.1 tree (stewart:1.1798)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1798 05/04/15 14:17:04 stewart@stripped +1 -0
  Fix ndb injector thread related compiler warnings

  sql/ha_ndbcluster.cc
    1.207 05/04/15 14:16:56 stewart@stripped +16 -7
    Fix compiler warnings

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/wl2325

--- 1.206/sql/ha_ndbcluster.cc	2005-04-15 11:47:12 +10:00
+++ 1.207/sql/ha_ndbcluster.cc	2005-04-15 14:16:56 +10:00
@@ -5516,7 +5516,7 @@
 	      table->record[0],
 	      table->record[1]));
 
-  for (unsigned i= 0; i < table->s->fields; i++) 
+  for (unsigned int i= 0; i < table->s->fields; i++) 
   {
     Field * f= table->field[i];
     DBUG_PRINT("info",
@@ -5563,7 +5563,7 @@
   //CHECK_S_VAR(reclength); mismatch
   CHECK_S_VAR(fields);
   CHECK_S_VAR(blob_fields);
-  for (int i= 0; i < old_table->s->fields; i++)
+  for (unsigned int i= 0; i < old_table->s->fields; i++)
   {
     //CHECK_F_VAR(null_bit); mismatch
     CHECK_F_VAR_TYPE(MYSQL_TYPE_BIT, Field_bit, bit_ofs);
@@ -7233,7 +7233,7 @@
     if (!cond->next)
       break;
     Ndb_item *a= cond->next->ndb_item;
-    Ndb_item *b, *field, *value= NULL;
+    Ndb_item *b, *field= NULL, *value= NULL;
     switch(cond->ndb_item->argument_count()) {
     case(1):
       field= 
@@ -7591,13 +7591,19 @@
 TABLE *binlog_index= 0;
 TABLE_LIST tables;
 
+#define NDB_REP_DB    "cluster_replication"
+#define NDB_REP_TABLE "binlog_index"
+
 static int open_binlog_index(THD *thd)
 {
+  static char repdb[]= NDB_REP_DB;
+  static char reptable[]= NDB_REP_TABLE;
+
   bzero((char*)&tables,sizeof(tables));
-  tables.db= "cluster_replication";
-  tables.alias= tables.table_name= "binlog_index";
+  tables.db= repdb;
+  tables.alias= tables.table_name= reptable;
   tables.lock_type= TL_WRITE;
-  thd->proc_info= "Opening cluster_replication.binlog_index table";
+  thd->proc_info= "Opening" NDB_REP_DB "." NDB_REP_TABLE;
   tables.required_type= FRMTYPE_TABLE;
   uint counter;
   TABLE_LIST *ttt= &tables;
@@ -8080,7 +8086,10 @@
   Uint64 waitGCI= latestGCI;
   ndb->setWaitGCI(waitGCI);
   thd->query_id= 0; // to keep valgrind quiet
-  thd->db="";
+  {
+    static char db[]="";
+    thd->db=db;
+  }
   open_binlog_index(thd);
   for (;;)
   {