Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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
1.1937 05/06/07 01:31:38 stewart@stripped +9 -0
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug10893
into mysql.com:/home/stewart/Documents/MySQL/5.1/wl2325
strings/ctype-ucs2.c
1.50 05/06/07 01:31:34 stewart@stripped +0 -0
Auto merged
strings/ctype-big5.c
1.81 05/06/07 01:31:34 stewart@stripped +0 -0
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp
1.55 05/06/07 01:31:34 stewart@stripped +0 -0
Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp
1.21 05/06/07 01:31:34 stewart@stripped +0 -0
Auto merged
storage/myisam/mi_test1.c
1.27 05/06/07 01:31:34 stewart@stripped +0 -0
Auto merged
sql/mysql_priv.h
1.304 05/06/07 01:31:34 stewart@stripped +0 -0
Auto merged
sql/ha_federated.cc
1.27 05/06/07 01:31:33 stewart@stripped +0 -0
Auto merged
sql/field.cc
1.264 05/06/07 01:31:33 stewart@stripped +0 -0
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp
1.52.2.2 05/06/07 01:31:32 stewart@stripped +0 -0
Merge rename: ndb/src/common/transporter/TransporterRegistry.cpp -> storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/include/transporter/TransporterRegistry.hpp
1.18.2.2 05/06/07 01:31:32 stewart@stripped +0 -0
Merge rename: ndb/include/transporter/TransporterRegistry.hpp -> storage/ndb/include/transporter/TransporterRegistry.hpp
storage/myisam/mi_test1.c
1.25.1.2 05/06/07 01:31:32 stewart@stripped +0 -0
Merge rename: myisam/mi_test1.c -> storage/myisam/mi_test1.c
mysql-test/Makefile.am
1.53 05/06/07 01:31:32 stewart@stripped +0 -0
Auto merged
# 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: stewart
# Host: kennedy.(none)
# Root: /home/stewart/Documents/MySQL/5.1/wl2325/RESYNC
--- 1.263/sql/field.cc 2005-06-06 17:26:56 +10:00
+++ 1.264/sql/field.cc 2005-06-07 01:31:33 +10:00
@@ -7836,7 +7836,7 @@
int Field_bit::store(double nr)
{
- return (Field_bit::store((longlong) nr));
+ return store((longlong) nr);
}
@@ -8019,7 +8019,8 @@
(delta == 0 && bits && (uint) (uchar) *from >= (uint) (1 << bits)))
{
memset(ptr, 0xff, field_length);
- *ptr&= ((1 << bits) - 1); /* set first byte */
+ if (bits)
+ *ptr&= ((1 << bits) - 1); /* set first byte */
set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
return 1;
}
--- 1.303/sql/mysql_priv.h 2005-06-02 09:39:26 +10:00
+++ 1.304/sql/mysql_priv.h 2005-06-07 01:31:34 +10:00
@@ -1364,7 +1364,8 @@
inline void table_case_convert(char * name, uint length)
{
if (lower_case_table_names)
- my_casedn(files_charset_info, name, length);
+ files_charset_info->cset->casedn(files_charset_info,
+ name, length, name, length);
}
inline const char *table_case_name(HA_CREATE_INFO *info, const char *name)
--- 1.80/strings/ctype-big5.c 2005-06-01 16:05:57 +10:00
+++ 1.81/strings/ctype-big5.c 2005-06-07 01:31:34 +10:00
@@ -6384,9 +6384,12 @@
NULL, /* sort_order_big*/
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
+ my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
1, /* strxfrm_multiply */
+ 1, /* caseup_multiply */
+ 1, /* casedn_multiply */
1, /* mbminlen */
2, /* mbmaxlen */
0, /* min_sort_char */
@@ -6412,9 +6415,12 @@
NULL, /* sort_order_big*/
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
+ my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
1, /* strxfrm_multiply */
+ 1, /* caseup_multiply */
+ 1, /* casedn_multiply */
1, /* mbminlen */
2, /* mbmaxlen */
0, /* min_sort_char */
--- 1.49/strings/ctype-ucs2.c 2005-06-01 16:05:57 +10:00
+++ 1.50/strings/ctype-ucs2.c 2005-06-07 01:31:34 +10:00
@@ -30,7 +30,6 @@
#define EILSEQ ENOENT
#endif
-extern MY_UNICASE_INFO *uni_plane[256];
static uchar ctype_ucs2[] = {
0,
@@ -113,20 +112,26 @@
}
-static void my_caseup_ucs2(CHARSET_INFO *cs, char *s, uint slen)
+static uint my_caseup_ucs2(CHARSET_INFO *cs, char *src, uint srclen,
+ char *dst __attribute__((unused)),
+ uint dstlen __attribute__((unused)))
{
my_wc_t wc;
int res;
- char *e=s+slen;
-
- while ((s < e) && (res=my_ucs2_uni(cs,&wc, (uchar *)s, (uchar*)e))>0 )
- {
- int plane = (wc>>8) & 0xFF;
- wc = uni_plane[plane] ? uni_plane[plane][wc & 0xFF].toupper : wc;
- if (res != my_uni_ucs2(cs,wc,(uchar*)s,(uchar*)e))
+ char *srcend= src + srclen;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
+ DBUG_ASSERT(src == dst && srclen == dstlen);
+
+ while ((src < srcend) &&
+ (res= my_ucs2_uni(cs, &wc, (uchar *)src, (uchar*) srcend)) > 0)
+ {
+ int plane= (wc>>8) & 0xFF;
+ wc= uni_plane[plane] ? uni_plane[plane][wc & 0xFF].toupper : wc;
+ if (res != my_uni_ucs2(cs, wc, (uchar*) src, (uchar*) srcend))
break;
- s+=res;
+ src+= res;
}
+ return srclen;
}
@@ -136,6 +141,7 @@
my_wc_t wc;
int res;
const uchar *e=s+slen;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
while (e > s+1 && e[-1] == ' ' && e[-2] == '\0')
e-= 2;
@@ -160,22 +166,26 @@
-static void my_casedn_ucs2(CHARSET_INFO *cs, char *s, uint slen)
+static uint my_casedn_ucs2(CHARSET_INFO *cs, char *src, uint srclen,
+ char *dst __attribute__((unused)),
+ uint dstlen __attribute__((unused)))
{
my_wc_t wc;
int res;
- char *e=s+slen;
-
- while ((s < e) && (res=my_ucs2_uni(cs, &wc, (uchar*)s, (uchar*)e))>0)
- {
- int plane = (wc>>8) & 0xFF;
- wc = uni_plane[plane] ? uni_plane[plane][wc & 0xFF].tolower : wc;
- if (res != my_uni_ucs2(cs, wc, (uchar*)s, (uchar*)e))
- {
+ char *srcend= src + srclen;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
+ DBUG_ASSERT(src == dst && srclen == dstlen);
+
+ while ((src < srcend) &&
+ (res= my_ucs2_uni(cs, &wc, (uchar*) src, (uchar*) srcend)) > 0)
+ {
+ int plane= (wc>>8) & 0xFF;
+ wc= uni_plane[plane] ? uni_plane[plane][wc & 0xFF].tolower : wc;
+ if (res != my_uni_ucs2(cs, wc, (uchar*) src, (uchar*) srcend))
break;
- }
- s+=res;
+ src+= res;
}
+ return srclen;
}
static void my_casedn_str_ucs2(CHARSET_INFO *cs __attribute__((unused)),
@@ -193,6 +203,7 @@
my_wc_t s_wc,t_wc;
const uchar *se=s+slen;
const uchar *te=t+tlen;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
while ( s < se && t < te )
{
@@ -256,6 +267,7 @@
{
const uchar *se, *te;
uint minlen;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
/* extra safety to make sure the lengths are even numbers */
slen&= ~1;
@@ -305,6 +317,7 @@
my_wc_t s_wc,t_wc;
const char *se=s+len;
const char *te=t+len;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
while ( s < se && t < te )
{
@@ -352,6 +365,7 @@
int plane;
uchar *de = dst + dstlen;
const uchar *se = src + srclen;
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
while( src < se && dst < de )
{
@@ -1310,6 +1324,7 @@
const char *wildstr,const char *wildend,
int escape, int w_one, int w_many)
{
+ MY_UNICASE_INFO **uni_plane= cs->caseinfo;
return my_wildcmp_unicode(cs,str,str_end,wildstr,wildend,
escape,w_one,w_many,uni_plane);
}
@@ -1596,9 +1611,12 @@
NULL, /* sort_order_big*/
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
+ my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
1, /* strxfrm_multiply */
+ 1, /* caseup_multiply */
+ 1, /* casedn_multiply */
2, /* mbminlen */
2, /* mbmaxlen */
0, /* min_sort_char */
@@ -1623,9 +1641,12 @@
NULL, /* sort_order_big*/
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
+ my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
1, /* strxfrm_multiply */
+ 1, /* caseup_multiply */
+ 1, /* casedn_multiply */
2, /* mbminlen */
2, /* mbmaxlen */
0, /* min_sort_char */
--- 1.18.2.1/ndb/include/transporter/TransporterRegistry.hpp 2005-06-07 01:29:52 +10:00
+++ 1.21/storage/ndb/include/transporter/TransporterRegistry.hpp 2005-06-07 01:31:34 +10:00
@@ -203,6 +203,13 @@
bool createSCITransporter(struct TransporterConfiguration * config);
bool createSHMTransporter(struct TransporterConfiguration * config);
bool createOSETransporter(struct TransporterConfiguration * config);
+
+ /**
+ * Get free buffer space
+ *
+ * Get #free bytes in send buffer for <em>node</node>
+ */
+ Uint32 get_free_buffer(Uint32 node) const ;
/**
* prepareSend
--- 1.52.2.1/ndb/src/common/transporter/TransporterRegistry.cpp 2005-06-07 01:29:52 +10:00
+++ 1.55/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2005-06-07 01:31:34 +10:00
@@ -562,6 +562,18 @@
theTransporters[nodeId] = NULL;
}
+Uint32
+TransporterRegistry::get_free_buffer(Uint32 node) const
+{
+ Transporter *t;
+ if(likely((t = theTransporters[node]) != 0))
+ {
+ return t->get_free_buffer();
+ }
+ return 0;
+}
+
+
SendStatus
TransporterRegistry::prepareSend(const SignalHeader * const signalHeader,
Uint8 prio,
--- 1.26/sql/ha_federated.cc 2005-05-31 22:34:24 +10:00
+++ 1.27/sql/ha_federated.cc 2005-06-07 01:31:33 +10:00
@@ -345,11 +345,10 @@
*/
-#ifdef __GNUC__
+#include "mysql_priv.h"
+#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
-
-#include "mysql_priv.h"
#ifdef HAVE_FEDERATED_DB
#include "ha_federated.h"
--- 1.52/mysql-test/Makefile.am 2005-05-13 23:01:26 +10:00
+++ 1.53/mysql-test/Makefile.am 2005-06-07 01:31:32 +10:00
@@ -48,6 +48,7 @@
mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
$(distdir)/std_data $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
+ $(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t
-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t
$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
| Thread |
|---|
| • bk commit into 5.1 tree (stewart:1.1937) | Stewart Smith | 6 Jun |
