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

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqlbinlog.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/item_func.cc:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
strings/my_vsnprintf.c:
  Manual merge.

1 files changed, 5 insertions, 5 deletions

diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h
index 02bb81749f0..00f7aa237b8 100644
--- a/server-tools/instance-manager/parse.h
+++ b/server-tools/instance-manager/parse.h
@@ -30,7 +30,7 @@ enum Log_type
 
 Command *parse_command(const char *text);
 
-bool parse_option_value(const char *text, uint *text_len, char **value);
+bool parse_option_value(const char *text, size_t *text_len, char **value);
 
 void skip_spaces(const char **text);
 
@@ -138,7 +138,7 @@ inline Named_value Named_value_arr::get_element(int idx) const
   DBUG_ASSERT(0 <= idx && (uint) idx < arr.elements);
 
   Named_value option;
-  get_dynamic((DYNAMIC_ARRAY *) &arr, (gptr) &option, idx);
+  get_dynamic((DYNAMIC_ARRAY *) &arr, (uchar*) &option, idx);
 
   return option;
 }
@@ -156,7 +156,7 @@ inline void Named_value_arr::remove_element(int idx)
 
 inline bool Named_value_arr::add_element(Named_value *option)
 {
-  return insert_dynamic(&arr, (gptr) option);
+  return insert_dynamic(&arr, (uchar*) option);
 }
 
 
@@ -166,7 +166,7 @@ inline bool Named_value_arr::replace_element(int idx, Named_value *option)
 
   get_element(idx).free();
 
-  return set_dynamic(&arr, (gptr) option, idx);
+  return set_dynamic(&arr, (uchar*) option, idx);
 }
 
 /************************************************************************/
@@ -177,7 +177,7 @@ inline bool Named_value_arr::replace_element(int idx, Named_value *option)
   if not found returns pointer to first non-space or to '\0', word_len == 0
 */
 
-inline void get_word(const char **text, uint *word_len,
+inline void get_word(const char **text, size_t *word_len,
                      enum_seek_method seek_method= ALPHANUM)
 {
   const char *word_end;