List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:August 22 2009 7:55pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:2962 to 2963)
View as plain text  
 2963 Jonas Oreland	2009-08-22 [merge]
      merge 63 to 70

    modified:
      mysql-test/suite/ndb/r/ndb_column_properties.result
      mysql-test/suite/ndb/t/ndb_column_properties.test
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
 2962 Jonas Oreland	2009-08-21 [merge]
      merge 63 to 70

    modified:
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'mysql-test/suite/ndb/r/ndb_column_properties.result'
--- a/mysql-test/suite/ndb/r/ndb_column_properties.result	2009-07-13 13:22:46 +0000
+++ b/mysql-test/suite/ndb/r/ndb_column_properties.result	2009-08-22 19:53:23 +0000
@@ -295,3 +295,51 @@ drop tablespace ts1
 engine ndb;
 drop logfile group lg1
 engine ndb;
+CREATE TABLE t1 (
+pk1 INT NOT NULL auto_increment,
+c00 int not null column_format dynamic,
+c01 int not null column_format dynamic,
+c02 int not null column_format dynamic,
+c03 int not null column_format dynamic,
+c04 int not null column_format dynamic,
+c05 int not null column_format dynamic,
+c06 int not null column_format dynamic,
+c07 int not null column_format dynamic,
+c08 int not null column_format dynamic,
+c09 int not null column_format dynamic,
+c10 int not null column_format dynamic,
+c11 int not null column_format dynamic,
+c12 int not null column_format dynamic,
+c13 int not null column_format dynamic,
+c14 int not null column_format dynamic,
+c15 int not null column_format dynamic,
+c16 int not null column_format dynamic,
+c17 int not null column_format dynamic,
+c18 int not null column_format dynamic,
+c19 int not null column_format dynamic,
+primary key(pk1)
+) ENGINE=ndbcluster;
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+select * from t1 order by 1;
+pk1	c00	c01	c02	c03	c04	c05	c06	c07	c08	c09	c10	c11	c12	c13	c14	c15	c16	c17	c18	c19
+1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+2	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+3	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+4	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+5	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+6	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+7	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+8	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+9	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+10	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21
+delete from t1;
+drop table t1;

=== modified file 'mysql-test/suite/ndb/t/ndb_column_properties.test'
--- a/mysql-test/suite/ndb/t/ndb_column_properties.test	2009-07-13 13:22:46 +0000
+++ b/mysql-test/suite/ndb/t/ndb_column_properties.test	2009-08-22 19:53:23 +0000
@@ -83,3 +83,43 @@ engine ndb;
 
 drop logfile group lg1
 engine ndb;
+
+CREATE TABLE t1 (
+  pk1 INT NOT NULL auto_increment,
+  c00 int not null column_format dynamic,
+  c01 int not null column_format dynamic,
+  c02 int not null column_format dynamic,
+  c03 int not null column_format dynamic,
+  c04 int not null column_format dynamic,
+  c05 int not null column_format dynamic,
+  c06 int not null column_format dynamic,
+  c07 int not null column_format dynamic,
+  c08 int not null column_format dynamic,
+  c09 int not null column_format dynamic,
+  c10 int not null column_format dynamic,
+  c11 int not null column_format dynamic,
+  c12 int not null column_format dynamic,
+  c13 int not null column_format dynamic,
+  c14 int not null column_format dynamic,
+  c15 int not null column_format dynamic,
+  c16 int not null column_format dynamic,
+  c17 int not null column_format dynamic,
+  c18 int not null column_format dynamic,
+  c19 int not null column_format dynamic,
+  primary key(pk1)
+) ENGINE=ndbcluster;
+
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+insert into t1 values(null,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+select * from t1 order by 1;
+delete from t1;
+
+drop table t1;

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2009-08-17 07:36:12 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2009-08-22 19:53:23 +0000
@@ -3201,7 +3201,7 @@ Dbtup::shrink_tuple(KeyReqStruct* req_st
          * clear bm-len bits, so they won't incorrect indicate
          *   a non-zero map
          */
-        * dyn_src_ptr &= ~Uint32(DYN_BM_LEN_MASK);
+        * ((Uint32 *)dyn_src_ptr) &= ~Uint32(DYN_BM_LEN_MASK);
 
         Uint32 *bm_ptr= (Uint32 *)dyn_src_ptr + bm_len - 1;
         while(*bm_ptr == 0)


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20090822195323-f2sj9lkbzo4x80ed.bundle
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:2962 to 2963)Jonas Oreland22 Aug