Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge

1 files changed, 10 insertions, 10 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 8e802d449b5..9df2171d85c 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -6511,7 +6511,7 @@ static int ndbcluster_init(void *p)
   }
   {
     char buf[128];
-    my_snprintf(buf, sizeof(buf), "mysqld --server-id=%d", server_id);
+    my_snprintf(buf, sizeof(buf), "mysqld --server-id=%lu", server_id);
     g_ndb_cluster_connection->set_name(buf);
   }
   g_ndb_cluster_connection->set_optimized_node_selection
@@ -7268,7 +7268,7 @@ int handle_trailing_share(NDB_SHARE *share)
       share->key_length= min_key_length;
     }
     share->key_length=
-      my_snprintf(share->key, min_key_length + 1, "#leak%d",
+      my_snprintf(share->key, min_key_length + 1, "#leak%lu",
                   trailing_share_id++);
   }
   /* Keep it for possible the future trailing free */
@@ -9805,12 +9805,12 @@ ndbcluster_show_status(handlerton *hton, THD* thd, stat_print_fn *stat_print,
   update_status_variables(g_ndb_cluster_connection);
   buflen=
     my_snprintf(buf, sizeof(buf),
-                "cluster_node_id=%u, "
+                "cluster_node_id=%ld, "
                 "connected_host=%s, "
-                "connected_port=%u, "
-                "number_of_data_nodes=%u, "
-                "number_of_ready_data_nodes=%u, "
-                "connect_count=%u",
+                "connected_port=%ld, "
+                "number_of_data_nodes=%ld, "
+                "number_of_ready_data_nodes=%ld, "
+                "connect_count=%ld",
                 ndb_cluster_node_id,
                 ndb_connected_host,
                 ndb_connected_port,
@@ -10696,7 +10696,8 @@ static int ndbcluster_fill_files_table(handlerton *hton,
       table->field[IS_FILES_VERSION]->store(uf.getObjectVersion());
 
       char extra[100];
-      int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize());
+      int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",
+                           id, (ulong) lfg.getUndoBufferSize());
       table->field[IS_FILES_EXTRA]->set_notnull();
       table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
       schema_table_store_record(thd, table);
@@ -10713,7 +10714,6 @@ static int ndbcluster_fill_files_table(handlerton *hton,
   for (i= 0; i < lfglist.count; i++)
   {
     NdbDictionary::Dictionary::List::Element& elt= lfglist.elements[i];
-    unsigned id;
 
     NdbDictionary::LogfileGroup lfg= dict->getLogfileGroup(elt.name);
     ndberr= dict->getNdbError();
@@ -10751,7 +10751,7 @@ static int ndbcluster_fill_files_table(handlerton *hton,
     char extra[100];
     int len= my_snprintf(extra,sizeof(extra),
                          "UNDO_BUFFER_SIZE=%lu",
-                         lfg.getUndoBufferSize());
+                         (ulong) lfg.getUndoBufferSize());
     table->field[IS_FILES_EXTRA]->set_notnull();
     table->field[IS_FILES_EXTRA]->store(extra, len, system_charset_info);
     schema_table_store_record(thd, table);