Below is the list of changes that have just been committed into a local
6.0-falcon repository of bar. When bar 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-06-05 19:46:29+05:00, bar@stripped +8 -0
After merge fix
include/m_ctype.h@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +8 -8
After merge fix
mysql-test/mysql-test-run.pl@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +1 -1
After merge fix
sql/sql_select.cc@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +1 -1
After merge fix
storage/falcon/ha_falcon.cpp@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +22 -22
After merge fix
storage/falcon/ha_falcon.h@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +11 -11
After merge fix
strings/ctype-big5.c@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +1 -1
After merge fix
strings/ctype-czech.c@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +2 -2
After merge fix
strings/ctype-mb.c@stripped, 2007-06-05 19:46:27+05:00, bar@stripped +8 -8
After merge fix
# 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: bar
# Host: bar.myoffice.izhnet.ru
# Root: /home/bar/mysql-work/mysql-5.1-falcon.merge
--- 1.137/include/m_ctype.h 2007-06-05 13:32:46 +05:00
+++ 1.138/include/m_ctype.h 2007-06-05 19:46:27 +05:00
@@ -166,7 +166,7 @@
const uchar *, size_t, const uchar *, size_t,
my_bool diff_if_only_endspace_difference);
size_t (*strnxfrm)(struct charset_info_st *,
- uchar *dst, size_t dstlen, site_t nweight,
+ uchar *dst, size_t dstlen, size_t nweight,
const uchar *src, size_t srclen, int flags);
size_t (*strnxfrmlen)(struct charset_info_st *, size_t);
my_bool (*like_range)(struct charset_info_st *,
@@ -479,13 +479,13 @@
my_match_t *match, uint nmatch);
int my_strnncoll_mb_bin(CHARSET_INFO * cs,
- const uchar *s, uint slen,
- const uchar *t, uint tlen,
+ const uchar *s, size_t slen,
+ const uchar *t, size_t tlen,
my_bool t_is_prefix);
int my_strnncollsp_mb_bin(CHARSET_INFO *cs,
- const uchar *a, uint a_length,
- const uchar *b, uint b_length,
+ const uchar *a, size_t a_length,
+ const uchar *b, size_t b_length,
my_bool diff_if_only_endspace_difference);
int my_wildcmp_mb_bin(CHARSET_INFO *cs,
@@ -499,9 +499,9 @@
void my_hash_sort_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
const uchar *key, uint len,ulong *nr1, ulong *nr2);
-int my_strnxfrm_mb(CHARSET_INFO *,
- uchar *dst, uint dstlen, uint nweights,
- const uchar *src, uint srclen, uint flags);
+size_t my_strnxfrm_mb(CHARSET_INFO *,
+ uchar *dst, size_t dstlen, size_t nweights,
+ const uchar *src, size_t srclen, int flags);
int my_wildcmp_unicode(CHARSET_INFO *cs,
const char *str, const char *str_end,
--- 1.532/sql/sql_select.cc 2007-06-04 15:14:20 +05:00
+++ 1.533/sql/sql_select.cc 2007-06-05 19:46:27 +05:00
@@ -15588,7 +15588,7 @@
}
}
if (i > 0 && tab[-1].next_select == sub_select_cache)
- extra.append(STRING_WITH_LEN("; Using join buffer"));
+ extra.append(STRING_WITH_LEN("; Using join cache"));
/* Skip initial "; "*/
const char *str= extra.ptr();
--- 1.93/strings/ctype-big5.c 2007-06-05 13:32:46 +05:00
+++ 1.94/strings/ctype-big5.c 2007-06-05 19:46:27 +05:00
@@ -301,7 +301,7 @@
}
-static int
+static size_t
my_strnxfrm_big5(CHARSET_INFO *cs,
uchar *dst, size_t dstlen, size_t nweights,
const uchar *src, size_t srclen, int flags)
--- 1.66/strings/ctype-czech.c 2007-06-05 13:32:47 +05:00
+++ 1.67/strings/ctype-czech.c 2007-06-05 19:46:27 +05:00
@@ -376,8 +376,8 @@
static int
my_strnncollsp_czech(CHARSET_INFO * cs __attribute__((unused)),
- const uchar *s, uint size_t,
- const uchar *t, uint size_t,
+ const uchar *s, size_t slen,
+ const uchar *t, size_t tlen,
my_bool diff_if_only_endspace_difference
__attribute__((unused)))
{
--- 1.58/strings/ctype-mb.c 2007-06-05 13:32:47 +05:00
+++ 1.59/strings/ctype-mb.c 2007-06-05 19:46:27 +05:00
@@ -363,10 +363,10 @@
/* BINARY collations handlers for MB charsets */
-size_t my_strnncoll_mb_bin(CHARSET_INFO * cs __attribute__((unused)),
- const uchar *s, size_t slen,
- const uchar *t, size_t tlen,
- my_bool t_is_prefix)
+int my_strnncoll_mb_bin(CHARSET_INFO * cs __attribute__((unused)),
+ const uchar *s, size_t slen,
+ const uchar *t, size_t tlen,
+ my_bool t_is_prefix)
{
size_t len=min(slen,tlen);
int cmp= memcmp(s,t,len);
@@ -399,10 +399,10 @@
0 if strings are equal
*/
-size_t my_strnncollsp_mb_bin(CHARSET_INFO * cs __attribute__((unused)),
- const uchar *a, size_t a_length,
- const uchar *b, size_t b_length,
- my_bool diff_if_only_endspace_difference)
+int my_strnncollsp_mb_bin(CHARSET_INFO * cs __attribute__((unused)),
+ const uchar *a, size_t a_length,
+ const uchar *b, size_t b_length,
+ my_bool diff_if_only_endspace_difference)
{
const uchar *end;
size_t length;
--- 1.180/storage/falcon/ha_falcon.cpp 2007-06-02 11:02:10 +05:00
+++ 1.181/storage/falcon/ha_falcon.cpp 2007-06-05 19:46:27 +05:00
@@ -468,7 +468,7 @@
DBUG_RETURN(0);
}
-int StorageInterface::rnd_next(byte *buf)
+int StorageInterface::rnd_next(uchar *buf)
{
DBUG_ENTER("StorageInterface::rnd_next");
ha_statistic_increment(&SSV::ha_read_rnd_next_count);
@@ -504,7 +504,7 @@
storageTable->unlockRow();
}
-int StorageInterface::rnd_pos(byte *buf, byte *pos)
+int StorageInterface::rnd_pos(uchar *buf, uchar *pos)
{
int recordNumber;
DBUG_ENTER("StorageInterface::rnd_pos");
@@ -530,7 +530,7 @@
DBUG_RETURN(0);
}
-void StorageInterface::position(const byte *record)
+void StorageInterface::position(const uchar *record)
{
DBUG_ENTER("StorageInterface::position");
memcpy(ref, &lastRecord, sizeof(lastRecord));
@@ -865,7 +865,7 @@
}
-int StorageInterface::write_row(byte *buff)
+int StorageInterface::write_row(uchar *buff)
{
DBUG_ENTER("StorageInterface::write_row");
ha_statistic_increment(&SSV::ha_write_count);
@@ -910,7 +910,7 @@
}
-int StorageInterface::update_row(const byte* oldData, byte* newData)
+int StorageInterface::update_row(const uchar* oldData, uchar* newData)
{
DBUG_ENTER("StorageInterface::update_row");
DBUG_ASSERT (lastRecord >= 0);
@@ -949,7 +949,7 @@
}
-int StorageInterface::delete_row(const byte* buf)
+int StorageInterface::delete_row(const uchar* buf)
{
DBUG_ENTER("StorageInterface::delete_row");
DBUG_ASSERT (lastRecord >= 0);
@@ -1077,7 +1077,7 @@
}
-int StorageInterface::index_read(byte *buf, const byte *keyBytes, uint key_len,
+int StorageInterface::index_read(uchar *buf, const uchar *keyBytes, uint key_len,
enum ha_rkey_function find_flag)
{
DBUG_ENTER("StorageInterface::index_read");
@@ -1349,7 +1349,7 @@
}
-int StorageInterface::index_next(byte *buf)
+int StorageInterface::index_next(uchar *buf)
{
DBUG_ENTER("StorageInterface::index_next");
ha_statistic_increment(&SSV::ha_read_next_count);
@@ -1405,7 +1405,7 @@
}
-int StorageInterface::index_next_same(byte *buf, const byte *key, uint key_len)
+int StorageInterface::index_next_same(uchar *buf, const uchar *key, uint key_len)
{
DBUG_ENTER("StorageInterface::index_next_same");
ha_statistic_increment(&SSV::ha_read_next_count);
@@ -2011,7 +2011,7 @@
}
-void StorageInterface::encodeRecord(byte *buf, bool updateFlag)
+void StorageInterface::encodeRecord(uchar *buf, bool updateFlag)
{
storageTable->preInsert();
my_ptrdiff_t ptrDiff = buf - table->record[0];
@@ -2054,7 +2054,7 @@
if (precision < 19)
{
- int64 value = ScaledBinary::getInt64FromBinaryDecimal(field->ptr,
+ int64 value = ScaledBinary::getInt64FromBinaryDecimal((const char *) field->ptr,
precision,
scale);
storageTable->dataStream.encodeInt64(value, scale);
@@ -2062,7 +2062,7 @@
else
{
BigInt bigInt;
- ScaledBinary::getBigIntFromBinaryDecimal(field->ptr, precision, scale, &bigInt);
+ ScaledBinary::getBigIntFromBinaryDecimal((const char*) field->ptr, precision, scale, &bigInt);
if (bigInt.fitsInInt64())
{
@@ -2120,9 +2120,9 @@
{
Field_blob *blob = (Field_blob*) field;
uint length = blob->get_length();
- char *ptr;
+ uchar *ptr;
blob->get_ptr(&ptr);
- storageTable->dataStream.encodeOpaque(length, ptr);
+ storageTable->dataStream.encodeOpaque(length, (const char*) ptr);
}
break;
@@ -2133,7 +2133,7 @@
{
Field_blob *blob = (Field_blob*) field;
uint length = blob->get_length();
- char *ptr;
+ uchar *ptr;
blob->get_ptr(&ptr);
StorageBlob *storageBlob;
uint32 blobId;
@@ -2151,7 +2151,7 @@
storageBlob.length = length;
storageBlob.data = (unsigned char *)ptr;
blobId = storageTable->storeBlob(&storageBlob);
- blob->set_ptr(storageBlob.length, (char *)storageBlob.data);
+ blob->set_ptr(storageBlob.length, storageBlob.data);
}
storageTable->dataStream.encodeBinaryBlob(blobId);
@@ -2159,7 +2159,7 @@
break;
default:
- storageTable->dataStream.encodeOpaque(field->field_length, field->ptr);
+ storageTable->dataStream.encodeOpaque(field->field_length, (const char*) field->ptr);
}
if (ptrDiff)
@@ -2169,7 +2169,7 @@
dbug_tmp_restore_column_map(table->read_set, old_map);
}
-void StorageInterface::decodeRecord(byte *buf)
+void StorageInterface::decodeRecord(uchar *buf)
{
EncodedDataStream *dataStream = &storageTable->dataStream;
my_ptrdiff_t ptrDiff = buf - table->record[0];
@@ -2215,11 +2215,11 @@
int scale = ((Field_new_decimal*) field)->dec;
if (dataStream->type == edsTypeBigInt)
- ScaledBinary::putBigInt(&dataStream->bigInt, field->ptr, precision, scale);
+ ScaledBinary::putBigInt(&dataStream->bigInt, (char*) field->ptr, precision, scale);
else
{
int64 value = dataStream->getInt64(scale);
- ScaledBinary::putBinaryDecimal(value, field->ptr, precision, scale);
+ ScaledBinary::putBinaryDecimal(value, (char*) field->ptr, precision, scale);
}
}
break;
@@ -2264,7 +2264,7 @@
{
Field_blob *blob = (Field_blob*) field;
blob->set_ptr(dataStream->value.string.length,
- (char *)dataStream->value.string.data);
+ (uchar*) dataStream->value.string.data);
}
break;
@@ -2285,7 +2285,7 @@
activeBlobs = storageBlob;
storageBlob->blobId = dataStream->value.blobId;
storageTable->getBlob(storageBlob->blobId, storageBlob);
- blob->set_ptr(storageBlob->length, (char*) storageBlob->data);
+ blob->set_ptr(storageBlob->length, (uchar*) storageBlob->data);
}
break;
--- 1.41/storage/falcon/ha_falcon.h 2007-06-01 10:11:55 +05:00
+++ 1.42/storage/falcon/ha_falcon.h 2007-06-05 19:46:27 +05:00
@@ -45,25 +45,25 @@
virtual uint max_supported_key_part_length(void) const;
virtual int rnd_init(bool scan);
- virtual int rnd_next(byte *buf);
- virtual int rnd_pos(byte *buf, byte *pos);
- virtual void position(const byte *record);
+ virtual int rnd_next(uchar *buf);
+ virtual int rnd_pos(uchar *buf, uchar *pos);
+ virtual void position(const uchar *record);
virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info);
virtual THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);
virtual int delete_table(const char *name);
- virtual int write_row(byte *buff);
- virtual int update_row(const byte *oldData, byte *newData);
- virtual int delete_row(const byte *buf);
+ virtual int write_row(uchar *buff);
+ virtual int update_row(const uchar *oldData, uchar *newData);
+ virtual int delete_row(const uchar *buf);
virtual void unlock_row(void);
- virtual int index_read(byte *buf, const byte *key, uint keyLen,
+ virtual int index_read(uchar *buf, const uchar *key, uint keyLen,
enum ha_rkey_function find_flag);
virtual int index_init(uint idx, bool sorted);
virtual int index_end(void);
- virtual int index_next(byte *buf);
- virtual int index_next_same(byte *buf, const byte *key, uint key_len);
+ virtual int index_next(uchar *buf);
+ virtual int index_next_same(uchar *buf, const uchar *key, uint key_len);
virtual ha_rows records_in_range(uint index,
key_range *lower, key_range *upper);
@@ -102,8 +102,8 @@
int setIndexes(void);
int genType(Field *field, CmdGen *gen);
void genKeyFields(KEY *key, CmdGen *gen);
- void encodeRecord(byte *buf, bool updateFlag);
- void decodeRecord(byte *buf);
+ void encodeRecord(uchar *buf, bool updateFlag);
+ void decodeRecord(uchar *buf);
void unlockTable(void);
static int falcon_init(void *p);
--- 1.310/mysql-test/mysql-test-run.pl 2007-06-04 17:57:53 +05:00
+++ 1.311/mysql-test/mysql-test-run.pl 2007-06-05 19:46:27 +05:00
@@ -3874,7 +3874,7 @@
}
else
{
- if ($mysql_version_id < 50200)
+ #if ($mysql_version_id < 50200)
{
mtr_add_arg($args, "%s--master-user=root", $prefix);
mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
| Thread |
|---|
| • bk commit into 6.0-falcon tree (bar:1.2547) | bar | 5 Jun |
