List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:January 11 2006 5:50pm
Subject:bk commit into 5.1 tree (jmiller:1.2032)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2032 06/01/11 18:50:04 jmiller@stripped +2 -0
  Changes done from Jonas's review of pervious commit

  mysql-test/r/ndb_dd_basic.result
    1.4 06/01/11 18:49:26 jmiller@stripped +93 -93
    Changed test.t1 back to t1 per Jonas's review

  mysql-test/t/ndb_dd_basic.test
    1.4 06/01/11 18:49:11 jmiller@stripped +93 -93
    Changed test.t1 back to t1 per Jonas's review

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.3/mysql-test/r/ndb_dd_basic.result	2006-01-11 16:56:01 +01:00
+++ 1.4/mysql-test/r/ndb_dd_basic.result	2006-01-11 18:49:26 +01:00
@@ -17,15 +17,15 @@
 ADD DATAFILE 'datafile02.dat'
 INITIAL_SIZE = 4M 
 ENGINE=NDB;
-CREATE TABLE test.t1
+CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE DISK
 ENGINE=NDB;
-INSERT INTO test.t1 VALUES (0, 0, 0);
-SELECT * FROM test.t1;
+INSERT INTO t1 VALUES (0, 0, 0);
+SELECT * FROM t1;
 pk1	b	c
 0	0	0
-INSERT INTO test.t1 VALUES 
+INSERT INTO t1 VALUES 
 (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
 (6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),
 (11,11,11),(12,12,12),(13,13,13),(14,14,14),(15,15,15),
@@ -126,7 +126,7 @@
 (486,486,486),(487,487,487),(488,488,488),(489,489,489),(490,490,490),
 (491,491,491),(492,492,492),(493,493,493),(494,494,494),(495,495,495),
 (496,496,496),(497,497,497),(498,498,498),(499,499,499),(500, 500, 500);
-SELECT COUNT(*) FROM test.t1;
+SELECT COUNT(*) FROM t1;
 COUNT(*)
 501
 CREATE LOGFILE GROUP lg2
@@ -156,198 +156,198 @@
 INITIAL_SIZE 1000000000000K
 ENGINE = NDB;
 ERROR HY000: The size number was correct but we don't allow the digit part to be more than 2 billion
-DROP TABLE test.t1;
-CREATE TABLE test.t1 (a INT PRIMARY KEY, b CHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE = NDB;
-INSERT INTO test.t1 VALUES (1,'1','1'), (2,'2','2'), (3,'3','3');
+DROP TABLE t1;
+CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE = NDB;
+INSERT INTO t1 VALUES (1,'1','1'), (2,'2','2'), (3,'3','3');
 BEGIN;
-UPDATE test.t1 SET b = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 2
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	2	1
-UPDATE test.t1 SET c = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 2
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	2	2
-UPDATE test.t1 SET b = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 3
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	3	2
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	3	2
 2	2	2
 3	3	3
 BEGIN;
-UPDATE test.t1 SET c = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 3
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	3	3
-UPDATE test.t1 SET b = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 4
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	4	3
-UPDATE test.t1 SET c = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 4
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	4	4
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	4	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET b = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET b = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	5	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET b = '6' WHERE b = '5';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET b = '6' WHERE b = '5';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	6	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET b = '7'WHERE c = '4';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET b = '7'WHERE c = '4';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET c = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET c = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	5
 2	2	2
 3	3	3
-UPDATE test.t1 SET c = '6' WHERE b = '7';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET c = '6' WHERE b = '7';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	6
 2	2	2
 3	3	3
-UPDATE test.t1 SET c = '7' WHERE c = '6';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET c = '7' WHERE c = '6';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	7
 2	2	2
 3	3	3
-DROP TABLE test.t1;
-CREATE TABLE test.t1 (a INT PRIMARY KEY, b VARCHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE NDB;
-INSERT INTO test.t1 VALUE (1,'1','1'), (2,'2','2'), (3,'3','3');
+DROP TABLE t1;
+CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE NDB;
+INSERT INTO t1 VALUE (1,'1','1'), (2,'2','2'), (3,'3','3');
 BEGIN;
-UPDATE test.t1 SET b = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 2
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	2	1
-UPDATE test.t1 SET c = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 2
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	2	2
-UPDATE test.t1 SET b = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 3
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	3	2
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	3	2
 2	2	2
 3	3	3
 BEGIN;
-UPDATE test.t1 SET c = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 3
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	3	3
-UPDATE test.t1 SET b = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 4
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	4	3
-UPDATE test.t1 SET c = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
 b
 4
-SELECT * FROM test.t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 a	b	c
 1	4	4
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	4	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET b = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET b = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	5	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET b = '6' WHERE b = '5';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET b = '6' WHERE b = '5';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	6	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET b = '7' WHERE c = '4';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET b = '7' WHERE c = '4';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	4
 2	2	2
 3	3	3
-UPDATE test.t1 SET c = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET c = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	5
 2	2	2
 3	3	3
-UPDATE test.t1 SET c = '6' WHERE b = '7';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET c = '6' WHERE b = '7';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	6
 2	2	2
 3	3	3
-UPDATE test.t1 SET c = '7' WHERE c = '6';
-SELECT * FROM test.t1 ORDER BY 1;
+UPDATE t1 SET c = '7' WHERE c = '6';
+SELECT * FROM t1 ORDER BY 1;
 a	b	c
 1	7	7
 2	2	2
 3	3	3
-DROP TABLE test.t1;
-CREATE TABLE test.t1 (
+DROP TABLE t1;
+CREATE TABLE t1 (
 a INT NOT NULL PRIMARY KEY,
 b TEXT NOT NULL
 ) TABLESPACE ts1 STORAGE DISK ENGINE=NDBCLUSTER;
@@ -363,36 +363,36 @@
 set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);
 set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);
 set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);
-INSERT INTO test.t1 VALUES(1,@b1);
-INSERT INTO test.t1 VALUES(2,@b2);
-SELECT a,length(b),substr(b,1+2*900,2) FROM test.t1 WHERE a=1;
+INSERT INTO t1 VALUES(1,@b1);
+INSERT INTO t1 VALUES(2,@b2);
+SELECT a,length(b),substr(b,1+2*900,2) FROM t1 WHERE a=1;
 a	length(b)	substr(b,1+2*900,2)
 1	2256	b1
-SELECT a,length(b),substr(b,1+2*9000,2) FROM test.t1 WHERE a=2;
+SELECT a,length(b),substr(b,1+2*9000,2) FROM t1 WHERE a=2;
 a	length(b)	substr(b,1+2*9000,2)
 2	20000	b2
-UPDATE test.t1 SET b=@b2 WHERE a=1;
-UPDATE test.t1 SET b=@b1 WHERE a=2;
-SELECT a,length(b),substr(b,1+2*9000,2) FROM test.t1 WHERE a=1;
+UPDATE t1 SET b=@b2 WHERE a=1;
+UPDATE t1 SET b=@b1 WHERE a=2;
+SELECT a,length(b),substr(b,1+2*9000,2) FROM t1 WHERE a=1;
 a	length(b)	substr(b,1+2*9000,2)
 1	20000	b2
-SELECT a,length(b),substr(b,1+2*900,2) FROM test.t1 WHERE a=2;
+SELECT a,length(b),substr(b,1+2*900,2) FROM t1 WHERE a=2;
 a	length(b)	substr(b,1+2*900,2)
 2	2256	b1
-UPDATE test.t1 SET b=concat(b,b) WHERE a=1;
-UPDATE test.t1 SET b=concat(b,b) WHERE a=2;
-SELECT a,length(b),substr(b,1+4*9000,2) FROM test.t1 WHERE a=1;
+UPDATE t1 SET b=concat(b,b) WHERE a=1;
+UPDATE t1 SET b=concat(b,b) WHERE a=2;
+SELECT a,length(b),substr(b,1+4*9000,2) FROM t1 WHERE a=1;
 a	length(b)	substr(b,1+4*9000,2)
 1	40000	b2
-SELECT a,length(b),substr(b,1+4*900,2) FROM test.t1 WHERE a=2;
+SELECT a,length(b),substr(b,1+4*900,2) FROM t1 WHERE a=2;
 a	length(b)	substr(b,1+4*900,2)
 2	4512	b1
-DELETE FROM test.t1 WHERE a=1;
-DELETE FROM test.t1 WHERE a=2;
-SELECT COUNT(*) FROM test.t1;
+DELETE FROM t1 WHERE a=1;
+DELETE FROM t1 WHERE a=2;
+SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
-DROP TABLE test.t1;
+DROP TABLE t1;
 ALTER TABLESPACE ts1 
 DROP DATAFILE 'datafile.dat' 
 ENGINE = NDB;

--- 1.3/mysql-test/t/ndb_dd_basic.test	2006-01-11 16:55:35 +01:00
+++ 1.4/mysql-test/t/ndb_dd_basic.test	2006-01-11 18:49:11 +01:00
@@ -49,15 +49,15 @@
 # Create a table using this tablespace
 ########################################
 
-CREATE TABLE test.t1
+CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE DISK
 ENGINE=NDB;
 
-INSERT INTO test.t1 VALUES (0, 0, 0);
-SELECT * FROM test.t1;
+INSERT INTO t1 VALUES (0, 0, 0);
+SELECT * FROM t1;
 
-INSERT INTO test.t1 VALUES 
+INSERT INTO t1 VALUES 
 (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
 (6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),
 (11,11,11),(12,12,12),(13,13,13),(14,14,14),(15,15,15),
@@ -159,7 +159,7 @@
 (491,491,491),(492,492,492),(493,493,493),(494,494,494),(495,495,495),
 (496,496,496),(497,497,497),(498,498,498),(499,499,499),(500, 500, 500);
 
-SELECT COUNT(*) FROM test.t1;
+SELECT COUNT(*) FROM t1;
 
 ####################################
 # Test error cases with size numbers
@@ -194,99 +194,99 @@
 INITIAL_SIZE 1000000000000K
 ENGINE = NDB;
 
-DROP TABLE test.t1;
+DROP TABLE t1;
 
 ############################
 # Test update of mm/dd part
 ############################
 
-CREATE TABLE test.t1 (a INT PRIMARY KEY, b CHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE = NDB;
-INSERT INTO test.t1 VALUES (1,'1','1'), (2,'2','2'), (3,'3','3');
+CREATE TABLE t1 (a INT PRIMARY KEY, b CHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE = NDB;
+INSERT INTO t1 VALUES (1,'1','1'), (2,'2','2'), (3,'3','3');
 BEGIN;
-UPDATE test.t1 SET b = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET c = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET b = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET c = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET b = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
+SELECT * FROM t1 ORDER BY 1;
 BEGIN;
-UPDATE test.t1 SET c = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET b = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET c = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET b = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET c = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET b = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET b = '6' WHERE b = '5';
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET b = '7'WHERE c = '4';
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET c = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET c = '6' WHERE b = '7';
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET c = '7' WHERE c = '6';
-SELECT * FROM test.t1 ORDER BY 1;
-DROP TABLE test.t1;
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET b = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET b = '6' WHERE b = '5';
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET b = '7'WHERE c = '4';
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET c = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET c = '6' WHERE b = '7';
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET c = '7' WHERE c = '6';
+SELECT * FROM t1 ORDER BY 1;
+DROP TABLE t1;
 
 #####
 
-CREATE TABLE test.t1 (a INT PRIMARY KEY, b VARCHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE NDB;
-INSERT INTO test.t1 VALUE (1,'1','1'), (2,'2','2'), (3,'3','3');
+CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(4) NOT NULL, c CHAR(4) NOT NULL, KEY(b)) TABLESPACE ts1 STORAGE DISK ENGINE NDB;
+INSERT INTO t1 VALUE (1,'1','1'), (2,'2','2'), (3,'3','3');
 BEGIN;
-UPDATE test.t1 SET b = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET c = '2' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET b = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
+UPDATE t1 SET b = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET c = '2' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET b = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
+SELECT * FROM t1 ORDER BY 1;
 BEGIN;
-UPDATE test.t1 SET c = '3' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET b = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
-UPDATE test.t1 SET c = '4' WHERE a = 1;
-SELECT b FROM test.t1 WHERE a = 1;
-SELECT * FROM test.t1 WHERE a = 1;
+UPDATE t1 SET c = '3' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET b = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
+UPDATE t1 SET c = '4' WHERE a = 1;
+SELECT b FROM t1 WHERE a = 1;
+SELECT * FROM t1 WHERE a = 1;
 COMMIT;
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET b = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET b = '6' WHERE b = '5';
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET b = '7' WHERE c = '4';
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET c = '5' WHERE a = 1;
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET c = '6' WHERE b = '7';
-SELECT * FROM test.t1 ORDER BY 1;
-UPDATE test.t1 SET c = '7' WHERE c = '6';
-SELECT * FROM test.t1 ORDER BY 1;
-DROP TABLE test.t1;
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET b = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET b = '6' WHERE b = '5';
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET b = '7' WHERE c = '4';
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET c = '5' WHERE a = 1;
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET c = '6' WHERE b = '7';
+SELECT * FROM t1 ORDER BY 1;
+UPDATE t1 SET c = '7' WHERE c = '6';
+SELECT * FROM t1 ORDER BY 1;
+DROP TABLE t1;
 
 ########################
 # Test for blobs...
 ########################
 
-CREATE TABLE test.t1 (
+CREATE TABLE t1 (
   a INT NOT NULL PRIMARY KEY,
   b TEXT NOT NULL
 ) TABLESPACE ts1 STORAGE DISK ENGINE=NDBCLUSTER;
@@ -308,22 +308,22 @@
 set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);
 set @b2 = concat(@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2,@b2);
 
-INSERT INTO test.t1 VALUES(1,@b1);
-INSERT INTO test.t1 VALUES(2,@b2);
-SELECT a,length(b),substr(b,1+2*900,2) FROM test.t1 WHERE a=1;
-SELECT a,length(b),substr(b,1+2*9000,2) FROM test.t1 WHERE a=2;
-UPDATE test.t1 SET b=@b2 WHERE a=1;
-UPDATE test.t1 SET b=@b1 WHERE a=2;
-SELECT a,length(b),substr(b,1+2*9000,2) FROM test.t1 WHERE a=1;
-SELECT a,length(b),substr(b,1+2*900,2) FROM test.t1 WHERE a=2;
-UPDATE test.t1 SET b=concat(b,b) WHERE a=1;
-UPDATE test.t1 SET b=concat(b,b) WHERE a=2;
-SELECT a,length(b),substr(b,1+4*9000,2) FROM test.t1 WHERE a=1;
-SELECT a,length(b),substr(b,1+4*900,2) FROM test.t1 WHERE a=2;
-DELETE FROM test.t1 WHERE a=1;
-DELETE FROM test.t1 WHERE a=2;
-SELECT COUNT(*) FROM test.t1;
-DROP TABLE test.t1;
+INSERT INTO t1 VALUES(1,@b1);
+INSERT INTO t1 VALUES(2,@b2);
+SELECT a,length(b),substr(b,1+2*900,2) FROM t1 WHERE a=1;
+SELECT a,length(b),substr(b,1+2*9000,2) FROM t1 WHERE a=2;
+UPDATE t1 SET b=@b2 WHERE a=1;
+UPDATE t1 SET b=@b1 WHERE a=2;
+SELECT a,length(b),substr(b,1+2*9000,2) FROM t1 WHERE a=1;
+SELECT a,length(b),substr(b,1+2*900,2) FROM t1 WHERE a=2;
+UPDATE t1 SET b=concat(b,b) WHERE a=1;
+UPDATE t1 SET b=concat(b,b) WHERE a=2;
+SELECT a,length(b),substr(b,1+4*9000,2) FROM t1 WHERE a=1;
+SELECT a,length(b),substr(b,1+4*900,2) FROM t1 WHERE a=2;
+DELETE FROM t1 WHERE a=1;
+DELETE FROM t1 WHERE a=2;
+SELECT COUNT(*) FROM t1;
+DROP TABLE t1;
 
 ###################
 # Test Cleanup
Thread
bk commit into 5.1 tree (jmiller:1.2032)Jonathan Miller11 Jan