Merge MySQL 5.1.35 into MySQL 5.4

2 files changed, 12 insertions, 12 deletions

diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index e46379c25c9..e22e342c65e 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -506,7 +506,7 @@ int federated_done(void *p)
         in sql_show.cc except that quoting always occurs.
 */
 
-static bool append_ident(String *string, const char *name, uint length,
+static bool append_ident(String *string, const char *name, size_t length,
                          const char quote_char)
 {
   bool result;
@@ -516,7 +516,7 @@ static bool append_ident(String *string, const char *name, uint length,
 
   if (quote_char)
   {
-    string->reserve(length * 2 + 2);
+    string->reserve((uint) length * 2 + 2);
     if ((result= string->append(&quote_char, 1, system_charset_info)))
       goto err;
 
@@ -534,7 +534,7 @@ static bool append_ident(String *string, const char *name, uint length,
     result= string->append(&quote_char, 1, system_charset_info);
   }
   else
-    result= string->append(name, length, system_charset_info);
+    result= string->append(name, (uint) length, system_charset_info);
 
 err:
   DBUG_RETURN(result);
@@ -544,7 +544,7 @@ err:
 static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num)
 {
   char buf[FEDERATED_QUERY_BUFFER_SIZE];
-  int buf_len;
+  size_t buf_len;
   DBUG_ENTER("ha_federated parse_url_error");
 
   buf_len= min(table->s->connect_string.length,
@@ -722,7 +722,7 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
     {
       share->connection_string[share->table_name - share->connection_string]= '\0';
       share->table_name++;
-      share->table_name_length= strlen(share->table_name);
+      share->table_name_length= (uint) strlen(share->table_name);
 
       DBUG_PRINT("info", 
                  ("internal format, parsed table_name share->connection_string \
@@ -1490,7 +1490,7 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
   pthread_mutex_lock(&federated_mutex);
 
   tmp_share.share_key= table_name;
-  tmp_share.share_key_length= strlen(table_name);
+  tmp_share.share_key_length= (uint) strlen(table_name);
   if (parse_url(&mem_root, &tmp_share, table, 0))
     goto error;
 
@@ -2162,7 +2162,7 @@ int ha_federated::update_row(const uchar *old_data, uchar *new_data)
   {
     if (bitmap_is_set(table->write_set, (*field)->field_index))
     {
-      uint field_name_length= strlen((*field)->field_name);
+      size_t field_name_length= strlen((*field)->field_name);
       append_ident(&update_string, (*field)->field_name, field_name_length,
                    ident_quote_char);
       update_string.append(STRING_WITH_LEN(" = "));
@@ -2188,7 +2188,7 @@ int ha_federated::update_row(const uchar *old_data, uchar *new_data)
 
     if (bitmap_is_set(table->read_set, (*field)->field_index))
     {
-      uint field_name_length= strlen((*field)->field_name);
+      size_t field_name_length= strlen((*field)->field_name);
       append_ident(&where_string, (*field)->field_name, field_name_length,
                    ident_quote_char);
       if (field_in_record_is_null(table, *field, (char*) old_data))
@@ -3186,7 +3186,7 @@ int ha_federated::real_connect()
 }
 
 
-int ha_federated::real_query(const char *query, uint length)
+int ha_federated::real_query(const char *query, size_t length)
 {
   int rc= 0;
   DBUG_ENTER("ha_federated::real_query");
@@ -3197,7 +3197,7 @@ int ha_federated::real_query(const char *query, uint length)
   if (!query || !length)
     goto end;
 
-  rc= mysql_real_query(mysql, query, length);
+  rc= mysql_real_query(mysql, query, (uint) length);
   
 end:
   DBUG_RETURN(rc);
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index 552676b6ae8..ea0a3d2f591 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.h
@@ -70,7 +70,7 @@ typedef struct st_federated_share {
   int share_key_length;
   ushort port;
 
-  uint table_name_length, server_name_length, connect_string_length, use_count;
+  size_t table_name_length, server_name_length, connect_string_length, use_count;
   pthread_mutex_t mutex;
   THR_LOCK lock;
 } FEDERATED_SHARE;
@@ -113,7 +113,7 @@ private:
                                      uint key_len,
                                      ha_rkey_function find_flag,
                                      MYSQL_RES **result);
-  int real_query(const char *query, uint length);
+  int real_query(const char *query, size_t length);
   int real_connect();
 public:
   ha_federated(handlerton *hton, TABLE_SHARE *table_arg);