bzr commit into mysql-5.1-telco-7.0 branch (jack:2952) Bug#46061

[jack andrews]

#At file:///D:/repo/eight-plus-api/ based on revid:jack@stripped

 2952 jack andrews	2009-07-21 [merge]
      merge Bug #46061

    modified:
      mysql-test/collections/default.push
      storage/ndb/src/common/util/BaseString.cpp
=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	2009-07-14 08:39:49 +0000
+++ b/mysql-test/collections/default.push	2009-07-16 19:10:33 +0000
@@ -1,5 +1,5 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --embedded --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --comment=embedded --embedded --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental

=== modified file 'storage/ndb/src/common/util/BaseString.cpp'
--- a/storage/ndb/src/common/util/BaseString.cpp	2009-07-16 15:48:27 +0000
+++ b/storage/ndb/src/common/util/BaseString.cpp	2009-07-16 16:36:20 +0000
@@ -211,7 +211,7 @@ BaseString::assfmt(const char *fmt, ...)
     }
     va_start(ap, fmt);
     l = basestring_vsnprintf(m_chr, l, fmt, ap);
-    assert(l == strlen(m_chr));
+    assert(l == (int)strlen(m_chr));
     va_end(ap);
     m_len = strlen(m_chr);
     return *this;
@@ -623,7 +623,7 @@ TAPTEST(BaseString)
     //tests for Bug #45733 Cluster with more than 4 storage node 
     for(int i=0;i<20;i++) 
     {
-#define BIG_ASSFMT_OK(X) do{int x=(X);OK(s2.assfmt("%*s",x,"Z").length() == x);}while(0)
+#define BIG_ASSFMT_OK(X) do{u_int x=(X);OK(s2.assfmt("%*s",x,"Z").length() == x);}while(0)
       BIG_ASSFMT_OK(8);
       BIG_ASSFMT_OK(511);
       BIG_ASSFMT_OK(512);


Attachment: [text/bzr-bundle] bzr/[e-mail]