MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:konstantin Date:July 7 2006 12:14pm
Subject:bk commit into 5.1 tree (konstantin:1.2240)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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@stripped, 2006-07-07 16:14:07+04:00, konstantin@stripped +4 -0
  Fixes for Windows compilation failures.

  server-tools/instance-manager/parse.h@stripped, 2006-07-07 16:14:03+04:00, konstantin@stripped +1 -1
    Post-merge fixes: fix Windows build.

  sql/log_event.cc@stripped, 2006-07-07 16:14:04+04:00, konstantin@stripped +1 -1
    uint32 -> uint

  sql/rpl_filter.cc@stripped, 2006-07-07 16:14:04+04:00, konstantin@stripped +1 -1
    uint32 -> uint

  sql/rpl_filter.h@stripped, 2006-07-07 16:14:04+04:00, konstantin@stripped +1 -1
    uint32 -> uint

# 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:	konstantin
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime-merge-with-5.0

--- 1.232/sql/log_event.cc	2006-07-07 16:14:12 +04:00
+++ 1.233/sql/log_event.cc	2006-07-07 16:14:12 +04:00
@@ -5839,7 +5839,7 @@
   if (memory == NULL)
     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 
-  uint32 dummy_len;
+  uint dummy_len;
   bzero(table_list, sizeof(*table_list));
   table_list->db = db_mem;
   table_list->alias= table_list->table_name = tname_mem;

--- 1.5/sql/rpl_filter.cc	2006-07-07 16:14:12 +04:00
+++ 1.6/sql/rpl_filter.cc	2006-07-07 16:14:12 +04:00
@@ -513,7 +513,7 @@
 
 
 const char*
-Rpl_filter::get_rewrite_db(const char* db, uint32 *new_len)
+Rpl_filter::get_rewrite_db(const char* db, uint *new_len)
 {
   if (rewrite_db.is_empty() || !db)
     return db;

--- 1.7/sql/rpl_filter.h	2006-07-07 16:14:12 +04:00
+++ 1.8/sql/rpl_filter.h	2006-07-07 16:14:12 +04:00
@@ -70,7 +70,7 @@
   void get_wild_do_table(String* str);
   void get_wild_ignore_table(String* str);
 
-  const char* get_rewrite_db(const char* db, uint32 *new_len);
+  const char* get_rewrite_db(const char* db, uint *new_len);
 
   I_List<i_string>* get_do_db();
   I_List<i_string>* get_ignore_db();

--- 1.7/server-tools/instance-manager/parse.h	2006-07-07 16:14:12 +04:00
+++ 1.8/server-tools/instance-manager/parse.h	2006-07-07 16:14:12 +04:00
@@ -69,7 +69,7 @@
 
 inline char *Named_value::alloc_str(const LEX_STRING *str)
 {
-  return my_strndup((const byte *) str->str, str->length, MYF(0));
+  return my_strndup(str->str, str->length, MYF(0));
 }
 
 inline char *Named_value::alloc_str(const char *str)
Thread
bk commit into 5.1 tree (konstantin:1.2240)konstantin7 Jul