Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell 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, 2007-07-28 11:44:14-04:00, cbell@mysql_cab_desk. +5 -0
WL#3915 : (NDB) master's cols > slave
Patch includes changes to code as a result of pull from
mysql-5.1-new-ndb into mysql-5.1-new-rpl.
sql/field.cc@stripped, 2007-07-28 11:44:06-04:00, cbell@mysql_cab_desk. +16 -14
WL#3915 : (NDB) master's cols > slave
Patch includes changes char -> uchar from merge with new-ndb.
sql/field.h@stripped, 2007-07-28 11:44:07-04:00, cbell@mysql_cab_desk. +8 -8
WL#3915 : (NDB) master's cols > slave
Patch includes changes char -> uchar from merge with new-ndb.
sql/log_event.cc@stripped, 2007-07-28 11:44:07-04:00, cbell@mysql_cab_desk. +4 -4
WL#3915 : (NDB) master's cols > slave
Patch includes changes to calls to my_multi from merge with new-ndb.
sql/log_event.h@stripped, 2007-07-28 11:44:08-04:00, cbell@mysql_cab_desk. +1 -1
WL#3915 : (NDB) master's cols > slave
Patch includes changes gptr -> uchar * from merge with new-ndb.
sql/rpl_utility.h@stripped, 2007-07-28 11:44:08-04:00, cbell@mysql_cab_desk. +2 -3
WL#3915 : (NDB) master's cols > slave
Patch includes changes to calls to my_multi from merge with new-ndb.
diff -Nrup a/sql/field.cc b/sql/field.cc
--- a/sql/field.cc 2007-07-27 16:19:33 -04:00
+++ b/sql/field.cc 2007-07-28 11:44:06 -04:00
@@ -1372,7 +1372,9 @@ bool Field::send_binary(Protocol *protoc
@return New pointer into memory based on from + length of the data
*/
-const uchar *Field::unpack(char* to, const char *from, uint param_data)
+const uchar *Field::unpack(uchar* to,
+ const uchar *from,
+ uint param_data)
{
uint length=pack_length();
int from_type= 0;
@@ -2711,8 +2713,8 @@ uint Field_new_decimal::is_equal(Create_
@return New pointer into memory based on from + length of the data
*/
-const uchar *Field_new_decimal::unpack(char* to,
- const char *from,
+const uchar *Field_new_decimal::unpack(uchar* to,
+ const uchar *from,
uint param_data)
{
uint from_precision= (param_data & 0xff00) >> 8U;
@@ -2737,7 +2739,7 @@ const uchar *Field_new_decimal::unpack(c
just the first step the resizing operation. The second step does the
resizing using the precision and decimals from the slave.
*/
- bin2decimal((char *)from, &dec, from_precision, from_decimal);
+ bin2decimal((uchar *)from, &dec, from_precision, from_decimal);
decimal2bin(&dec, to, precision, decimals());
}
else
@@ -6410,8 +6412,8 @@ uchar *Field_string::pack(uchar *to, con
@return New pointer into memory based on from + length of the data
*/
-const uchar *Field_string::unpack(char *to,
- const char *from,
+const uchar *Field_string::unpack(uchar *to,
+ const uchar *from,
uint param_data)
{
uint from_len= param_data & 0x00ff; // length.
@@ -6420,7 +6422,7 @@ const uchar *Field_string::unpack(char *
DBUG_ASSERT(f_length <= 255);
length= (uint) *from++;
bitmap_set_bit(table->write_set,field_index);
- store(from, length, system_charset_info);
+ store((const char *)from, length, system_charset_info);
return from+length;
}
@@ -6928,8 +6930,8 @@ uchar *Field_varstring::pack_key_from_ke
@return New pointer into memory based on from + length of the data
*/
-const uchar *Field_varstring::unpack(char *to,
- const char *from,
+const uchar *Field_varstring::unpack(uchar *to,
+ const uchar *from,
uint param_data)
{
uint length;
@@ -7665,8 +7667,8 @@ uchar *Field_blob::pack(uchar *to, const
@return New pointer into memory based on from + length of the data
*/
-const uchar *Field_blob::unpack(char *to,
- const char *from,
+const uchar *Field_blob::unpack(uchar *to,
+ const uchar *from,
uint param_data)
{
return unpack(to, from);
@@ -8732,9 +8734,9 @@ uchar *Field_bit::pack(uchar *to, const
@return New pointer into memory based on from + length of the data
*/
-const char *Field_bit::unpack(char *to,
- const char *from,
- uint param_data)
+const uchar *Field_bit::unpack(uchar *to,
+ const uchar *from,
+ uint param_data)
{
uint const from_len= (param_data >> 8U) & 0x00ff;
uint const from_bit_len= param_data & 0x00ff;
diff -Nrup a/sql/field.h b/sql/field.h
--- a/sql/field.h 2007-07-27 16:25:09 -04:00
+++ b/sql/field.h 2007-07-28 11:44:07 -04:00
@@ -345,7 +345,7 @@ public:
memcpy(to,from,length);
return to+length;
}
- virtual const uchar *unpack(char* to, const char *from, uint param_data);
+ virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
virtual const uchar *unpack(uchar* to, const uchar *from)
{
uint length=pack_length();
@@ -628,7 +628,7 @@ public:
uint32 max_display_length() { return field_length; }
uint size_of() const { return sizeof(*this); }
uint32 pack_length() const { return (uint32) bin_size; }
- virtual const uchar *unpack(char* to, const char *from, uint param_data);
+ virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
uint is_equal(Create_field *new_field);
};
@@ -1166,7 +1166,7 @@ public:
void sort_string(uchar *buff,uint length);
void sql_type(String &str) const;
uchar *pack(uchar *to, const uchar *from, uint max_length=~(uint) 0);
- virtual const uchar *unpack(char* to, const char *from, uint param_data);
+ virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
const uchar *unpack(uchar* to, const uchar *from);
int pack_cmp(const uchar *a,const uchar *b,uint key_length,
my_bool insert_or_update);
@@ -1243,7 +1243,7 @@ public:
uchar *pack_key(uchar *to, const uchar *from, uint max_length);
uchar *pack_key_from_key_image(uchar* to, const uchar *from,
uint max_length);
- virtual const uchar *unpack(char* to, const char *from, uint param_data);
+ virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
const uchar *unpack(uchar* to, const uchar *from);
const uchar *unpack_key(uchar* to, const uchar *from, uint max_length);
int pack_cmp(const uchar *a, const uchar *b, uint key_length,
@@ -1300,7 +1300,7 @@ public:
}
}
Field_blob(uint32 packlength_arg)
- :Field_longstr((char*) 0, 0, (uchar*) "", 0, NONE, "temp", system_charset_info),
+ :Field_longstr((uchar*) 0, 0, (uchar*) "", 0, NONE, "temp", system_charset_info),
packlength(packlength_arg) {}
enum_field_types type() const { return MYSQL_TYPE_BLOB;}
enum ha_base_keytype key_type() const
@@ -1342,7 +1342,7 @@ public:
int reset(void) { bzero(ptr, packlength+sizeof(uchar*)); return 0; }
void reset_fields() { bzero((uchar*) &value,sizeof(value)); }
#ifndef WORDS_BIGENDIAN
- } static
+ static
#endif
void store_length(uchar *i_ptr, uint i_packlength, uint32 i_number);
inline void store_length(uint32 number)
@@ -1408,7 +1408,7 @@ public:
uchar *pack_key(uchar *to, const uchar *from, uint max_length);
uchar *pack_key_from_key_image(uchar* to, const uchar *from,
uint max_length);
- virtual const uchar *unpack(char *to, const char *from, uint param_data);
+ virtual const uchar *unpack(uchar *to, const uchar *from, uint param_data);
const uchar *unpack(uchar *to, const uchar *from);
const uchar *unpack_key(uchar* to, const uchar *from, uint max_length);
int pack_cmp(const uchar *a, const uchar *b, uint key_length,
@@ -1584,7 +1584,7 @@ public:
uint32 pack_length_in_rec() const { return bytes_in_rec; }
void sql_type(String &str) const;
uchar *pack(uchar *to, const uchar *from, uint max_length=~(uint) 0);
- virtual const uchar *unpack(char *to, const char *from, uint param_data);
+ virtual const uchar *unpack(uchar *to, const uchar *from, uint param_data);
const uchar *unpack(uchar* to, const uchar *from);
virtual void set_default();
diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc 2007-07-27 16:27:22 -04:00
+++ b/sql/log_event.cc 2007-07-28 11:44:07 -04:00
@@ -6600,7 +6600,7 @@ Table_map_log_event::Table_map_log_event
*/
uint num_null_bytes= (m_table->s->fields + 7) / 8;
m_data_size+= num_null_bytes;
- m_meta_memory= my_multi_malloc(MYF(MY_WME),
+ m_meta_memory= (uchar *)my_multi_malloc(MYF(MY_WME),
&m_null_bits, num_null_bytes,
&m_field_metadata, m_field_metadata_size,
NULL);
@@ -6710,7 +6710,7 @@ Table_map_log_event::Table_map_log_event
{
m_field_metadata_size= net_field_length(&ptr_after_colcnt);
uint num_null_bytes= (m_colcnt + 7) / 8;
- m_meta_memory= my_multi_malloc(MYF(MY_WME),
+ m_meta_memory= (uchar *)my_multi_malloc(MYF(MY_WME),
&m_null_bits, num_null_bytes,
&m_field_metadata, m_field_metadata_size,
NULL);
@@ -6930,8 +6930,8 @@ bool Table_map_log_event::write_data_bod
/*
Store the size of the field metadata.
*/
- char mbuf[sizeof(m_field_metadata_size)];
- char *const mbuf_end= net_store_length(mbuf, (size_t) m_field_metadata_size);
+ uchar mbuf[sizeof(m_field_metadata_size)];
+ uchar *const mbuf_end= net_store_length(mbuf, (size_t) m_field_metadata_size);
return (my_b_safe_write(file, dbuf, sizeof(dbuf)) ||
my_b_safe_write(file, (const uchar*)m_dbnam, m_dblen+1) ||
diff -Nrup a/sql/log_event.h b/sql/log_event.h
--- a/sql/log_event.h 2007-07-27 16:28:03 -04:00
+++ b/sql/log_event.h 2007-07-28 11:44:08 -04:00
@@ -2094,7 +2094,7 @@ private:
*/
ulong m_field_metadata_size;
uchar *m_null_bits;
- gptr m_meta_memory;
+ uchar *m_meta_memory;
};
diff -Nrup a/sql/rpl_utility.h b/sql/rpl_utility.h
--- a/sql/rpl_utility.h 2007-07-27 16:30:43 -04:00
+++ b/sql/rpl_utility.h 2007-07-28 11:44:08 -04:00
@@ -26,7 +26,6 @@
struct st_relay_log_info;
typedef st_relay_log_info RELAY_LOG_INFO;
-field_length_from_packed(enum_field_types field_type, uchar const *data);
/**
A table definition from the master.
@@ -65,7 +64,7 @@ public:
: m_size(size), m_type(0),
m_field_metadata(0), m_null_bits(0), m_memory(NULL)
{
- m_memory= my_multi_malloc(MYF(MY_WME),
+ m_memory= (uchar *)my_multi_malloc(MYF(MY_WME),
&m_type, size,
&m_field_metadata, size * sizeof(short),
&m_null_bits, (m_size + 7) / 8,
@@ -234,7 +233,7 @@ private:
field_type *m_type; // Array of type descriptors
short int *m_field_metadata;
uchar *m_null_bits;
- gptr m_memory;
+ uchar *m_memory;
};
/**
| Thread |
|---|
| • bk commit into 5.1 tree (cbell:1.2542) | cbell | 28 Jul |
