bk commit into 5.1 tree (mskold:1.2308)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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, 2006-09-14 09:29:20+02:00, mskold@stripped +4 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.2300.14.8

  BitKeeper/deleted/.del-ndb_dd_advance.result@stripped, 2006-09-14 09:29:10+02:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.1

  BitKeeper/deleted/.del-ndb_dd_advance.result@stripped, 2006-09-14 09:29:10+02:00,
mskold@stripped +0 -0
    Merge rename: mysql-test/r/ndb_dd_advance.result ->
BitKeeper/deleted/.del-ndb_dd_advance.result

  BitKeeper/deleted/.del-ndb_dd_advance2.result@stripped, 2006-09-14 09:29:10+02:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.1

  BitKeeper/deleted/.del-ndb_dd_advance2.result@stripped, 2006-09-14 09:29:10+02:00,
mskold@stripped +0 -0
    Merge rename: mysql-test/r/ndb_dd_advance2.result ->
BitKeeper/deleted/.del-ndb_dd_advance2.result

  mysql-test/r/ndb_dd_basic.result@stripped, 2006-09-14 09:29:10+02:00, mskold@stripped +0
-0
    Auto merged
    MERGE: 1.10.1.2

  mysql-test/r/ndb_dd_disk2memory.result@stripped, 2006-09-14 09:29:10+02:00, mskold@stripped
+0 -0
    Auto merged
    MERGE: 1.6.1.2

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb/RESYNC

--- 1.7/mysql-test/r/ndb_dd_disk2memory.result	2006-09-14 09:29:29 +02:00
+++ 1.8/mysql-test/r/ndb_dd_disk2memory.result	2006-09-14 09:29:29 +02:00
@@ -299,10 +299,207 @@ usr_id	uniq_id	increment	usr2_id	c_amoun
 
 DROP TABLE test.t1;
 DROP TABLE test.t2;
-ALTER TABLESPACE table_space1
-DROP DATAFILE './table_space1/datafile.dat'
-ENGINE = NDB;
-DROP TABLESPACE table_space1
-ENGINE = NDB;
-DROP LOGFILE GROUP log_group1
-ENGINE =NDB;
+CREATE TABLE test.t1 (
+a1 smallint NOT NULL,
+a2 int NOT NULL,
+a3 bigint NOT NULL,
+a4 char(10),
+a5 decimal(5,1),
+a6 time,
+a7 date,
+a8 datetime,
+a9 VARCHAR(255),
+a10 blob,
+PRIMARY KEY(a1)
+) TABLESPACE table_space1 STORAGE DISK ENGINE=NDB;
+CREATE TABLE test.t2 (
+b1 smallint NOT NULL,
+b2 int NOT NULL,
+b3 bigint NOT NULL,
+b4 char(10),
+b5 decimal(5,1),
+b6 time,
+b7 date,
+b8 datetime,
+b9 VARCHAR(255),
+b10 blob,
+PRIMARY KEY(b1)
+) ENGINE=NDB;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a1` smallint(6) NOT NULL,
+  `a2` int(11) NOT NULL,
+  `a3` bigint(20) NOT NULL,
+  `a4` char(10) DEFAULT NULL,
+  `a5` decimal(5,1) DEFAULT NULL,
+  `a6` time DEFAULT NULL,
+  `a7` date DEFAULT NULL,
+  `a8` datetime DEFAULT NULL,
+  `a9` varchar(255) DEFAULT NULL,
+  `a10` blob,
+  PRIMARY KEY (`a1`),
+  KEY `a2` (`a2`),
+  KEY `a3` (`a3`),
+  KEY `a8` (`a8`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `b1` smallint(6) NOT NULL,
+  `b2` int(11) NOT NULL,
+  `b3` bigint(20) NOT NULL,
+  `b4` char(10) DEFAULT NULL,
+  `b5` decimal(5,1) DEFAULT NULL,
+  `b6` time DEFAULT NULL,
+  `b7` date DEFAULT NULL,
+  `b8` datetime DEFAULT NULL,
+  `b9` varchar(255) DEFAULT NULL,
+  `b10` blob,
+  PRIMARY KEY (`b1`),
+  KEY `b2` (`b2`),
+  KEY `b3` (`b3`),
+  KEY `b8` (`b8`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
[phone]	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary
data
[phone]	aaa2	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb2	binary
data
[phone]	aaa3	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb3	binary
data
[phone]	aaa4	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb4	binary
data
[phone]	aaa5	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb5	binary
data
[phone]	aaa6	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb6	binary
data
[phone]	aaa7	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb7	binary
data
[phone]	aaa8	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb8	binary
data
[phone]	aaa9	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb9	binary
data
[phone]	aaa10	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb10	binary data
[phone]	aaa11	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb11	binary data
[phone]	aaa12	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb12	binary data
[phone]	aaa13	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb13	binary data
[phone]	aaa14	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb14	binary data
[phone]	aaa15	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb15	binary data
[phone]	aaa16	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb16	binary data
[phone]	aaa17	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb17	binary data
[phone]	aaa18	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb18	binary data
[phone]	aaa19	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb19	binary data
[phone]	aaa20	34.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb20	binary data
+b1	b2	b3	b4	b5	b6	b7	b8	b9	b10
[phone]	aaa1	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary
data
[phone]	aaa2	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb2	binary
data
[phone]	aaa3	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb3	binary
data
[phone]	aaa4	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb4	binary
data
[phone]	aaa5	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb5	binary
data
[phone]	aaa6	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb6	binary
data
[phone]	aaa7	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb7	binary
data
[phone]	aaa8	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb8	binary
data
[phone]	aaa9	35.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb9	binary
data
[phone]	aaa10	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb10	binary data
[phone]	aaa11	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb11	binary data
[phone]	aaa12	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb12	binary data
[phone]	aaa13	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb13	binary data
[phone]	aaa14	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb14	binary data
[phone]	aaa15	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb15	binary data
[phone]	aaa16	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb16	binary data
[phone]	aaa17	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb17	binary data
[phone]	aaa18	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb18	binary data
[phone]	aaa19	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb19	binary data
[phone]	aaa20	35.2	04:03:02	2006-01-01	1971-05-28
16:55:03	bbbbbbbbbbbbb20	binary data
+COUNT(a1)	a1	COUNT(a1)*a1
+1	1	1
+1	2	2
+1	3	3
+1	4	4
+1	5	5
+1	6	6
+1	7	7
+1	8	8
+1	9	9
+1	10	10
+1	11	11
+1	12	12
+1	13	13
+1	14	14
+1	15	15
+1	16	16
+1	17	17
+1	18	18
+1	19	19
+1	20	20
+COUNT(a2)	(a2+1)	COUNT(a2)*(a2+0)
+1	3	2
+1	4	3
+1	5	4
+1	6	5
+1	7	6
+1	8	7
+1	9	8
+1	10	9
+1	11	10
+1	12	11
+1	13	12
+1	14	13
+1	15	14
+1	16	15
+1	17	16
+1	18	17
+1	19	18
+1	20	19
+1	21	20
+1	22	21
+a
+8
+7
+6
+5
+a	c
+8	Clavin
+7	Serge
+6	Jeb
+5	Stewart
+4	Martin
+3	Pekka
+a
+2
+3
+4
+5
+6
+7
+8
+a	c
+4	Martin
+5	Stewart
+6	Jeb
+7	Serge
+8	Clavin
+a
+1
+1
+1
+2
+2
+3
+3
+a
+3
+2
+1
+a
+3
+2
+1
+a
+1
+2
+3
+email	shipcode
+test1@stripped	Z001
+test2@stripped	R002
+test2@stripped	Z001
+test3@stripped	Z001
+email
+test1@stripped
+test2@stripped
+test3@stripped
+email	shipcode
+test1@stripped	Z001
+test2@stripped	Z001
+test2@stripped	R002
+test3@stripped	Z001

--- 1.11/mysql-test/r/ndb_dd_basic.result	2006-09-14 09:29:29 +02:00
+++ 1.12/mysql-test/r/ndb_dd_basic.result	2006-09-14 09:29:29 +02:00
@@ -422,6 +422,47 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
 DROP TABLE t1;
+CREATE TABLE t1 (
+a int NOT NULL,
+b varchar(4000),  -- must use 2 pages undo
+PRIMARY KEY using hash (a)
+)
+TABLESPACE ts1 STORAGE DISK ENGINE=NDBCLUSTER;
+set autocommit = 0;
+insert into t1 values(0,'x');
+insert into t1 values(1,'x');
+insert into t1 values(2,'x');
+insert into t1 values(3,'x');
+insert into t1 values(4,'x');
+insert into t1 values(5,'x');
+insert into t1 values(6,'x');
+insert into t1 values(7,'x');
+insert into t1 values(8,'x');
+delete from t1 where a = 0;
+commit;
+set autocommit = 1;
+drop table t1;
+create table test.t1 (f1 varchar(50) primary key, f2 text,f3 int) 
+TABLESPACE ts1 STORAGE DISK engine=NDB;
+insert into test.t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);
+insert into test.t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);
+select * from test.t1 order by f1;
+f1	f2	f3
+111111	aaaaaa	1
+222222	bbbbbb	2
+select f1,f2 from test.t1 order by f2;
+f1	f2
+111111	aaaaaa
+222222	bbbbbb
+select f2 from test.t1 order by f2;
+f2
+aaaaaa
+bbbbbb
+select f1,f2 from test.t1 order by f1;
+f1	f2
+111111	aaaaaa
+222222	bbbbbb
+drop table test.t1;
 ALTER TABLESPACE ts1 
 DROP DATAFILE 'datafile.dat' 
 ENGINE = NDB;