List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:January 9 2006 8:40pm
Subject:bk commit into 5.1 tree (jmiller:1.1992)
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.1992 06/01/09 21:40:36 jmiller@stripped +2 -0
  New DD test case

  mysql-test/r/ndb_dd_dupcase.result
    1.1 06/01/09 21:38:08 jmiller@stripped +164 -0
    New results file for ndb_dd_dupcase.test

  mysql-test/r/ndb_dd_dupcase.result
    1.0 06/01/09 21:38:08 jmiller@stripped +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-dd-new/mysql-test/r/ndb_dd_dupcase.result

  mysql-test/t/ndb_dd_dupcase.test
    1.1 06/01/09 21:37:00 jmiller@stripped +259 -0
    New test case for Cluster DD testing duplicates, CaSe, use of equals and not using equals. Test will need to have some work done to it once bug 16158 and 16306 are patched

  mysql-test/t/ndb_dd_dupcase.test
    1.0 06/01/09 21:37:00 jmiller@stripped +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-dd-new/mysql-test/t/ndb_dd_dupcase.test

# 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-dd-new
--- New file ---
+++ mysql-test/r/ndb_dd_dupcase.result	06/01/09 21:38:08
DROP TABLE IF EXISTS t1;
**** Begin Duplicate Statement Testing ****
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;
ERROR HY000: Failed to create LOGFILE GROUP
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE 4M ENGINE NDB;
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE 4M ENGINE=NDB;
ERROR HY000: Failed to alter: CREATE UNDOFILE
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB;
ALTER TABLESPACE ts1
ADD DATAFILE 'datafile2.dat'
INITIAL_SIZE 12M
ENGINE=NDB;
CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;
CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;
ERROR 42S01: Table 't1' already exists
DROP TABLE t1;
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile2.dat' 
ENGINE=NDB;
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile2.dat' 
ENGINE=NDB;
ERROR HY000: Failed to alter:  NO SUCH FILE
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' 
ENGINE=NDB;
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' 
ENGINE=NDB;
ERROR HY000: Failed to alter:  NO SUCH FILE
DROP TABLESPACE ts1 
ENGINE=NDB;
DROP TABLESPACE ts1 
ENGINE=NDB;
ERROR HY000: Failed to drop TABLESPACE
DROP LOGFILE GROUP lg1 
ENGINE=NDB;
DROP LOGFILE GROUP lg1 
ENGINE=NDB;
ERROR HY000: Failed to drop LOGFILE GROUP
**** End Duplicate Statement Testing ****

**** Begin Statment CaSe Testing ****
creaTE LOgfilE GrOuP lg1
adD undoFILE 'undofile.dat'
initiAL_siZE 16M
UnDo_BuFfEr_SiZe = 1M
ENGInE=NDb;
altER LOgFiLE GrOUp lg1
AdD UnDOfILe 'undofile02.dat'
INItIAl_SIzE 4M ENgINE nDB;
CrEAtE TABLEspaCE ts1
ADD DATAfilE 'datafile.dat'
UsE LoGFiLE GRoUP lg1
INITiaL_SizE 12M
ENGiNe NDb;
AlTeR tAbLeSpAcE ts1
AdD DaTaFiLe 'datafile2.dat'
InItIaL_SiZe 12M
EnGiNe=NDB;
CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
TABLEspace ts1 storAGE dISk
ENGine nDb;
DROP TABLE t1;
AlteR TAblespaCE ts1
droP DATAfile 'datafile2.dat' 
ENGINE=NDB;
ALter tablesPACE ts1
dROp dAtAfIlE 'datafile.dat' 
ENGine=Ndb;
DrOp TaBleSpAcE ts1 
engINE=ndB;
DrOp lOgFiLe GrOuP lg1 
EnGiNe=nDb;
**** End Statment CaSe Testing ****

**** Begin = And No = Testing ****
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE=16M
UNDO_BUFFER_SIZE=1M
ENGINE=NDB;
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE=4M 
ENGINE=NDB;
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE=12M
ENGINE=NDB;
ALTER TABLESPACE ts1
ADD DATAFILE 'datafile2.dat'
INITIAL_SIZE=12M
ENGINE=NDB;
CREATE TABLE t1
(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
TABLESPACE ts1 STORAGE DISK
ENGINE=NDB;
DROP TABLE t1;
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile2.dat'
ENGINE=NDB;
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat'
ENGINE=NDB;
DROP TABLESPACE ts1
ENGINE=NDB;
DROP LOGFILE GROUP lg1
ENGINE=NDB;

**** End of = ****

CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE 1M
ENGINE NDB;
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE 4M
ENGINE NDB;
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB;
CREATE TABLE t1
(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
TABLESPACE ts1 STORAGE DISK
ENGINE NDB;
DROP TABLE t1;
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat'
ENGINE NDB;
DROP TABLESPACE ts1
ENGINE NDB;
DROP LOGFILE GROUP lg1
ENGINE NDB;
**** End = And No =  ****

--- New file ---
+++ mysql-test/t/ndb_dd_dupcase.test	06/01/09 21:37:00
#########################################
# Author: JBM
# Date: 2006-01-03
# Purpose: Test the NDB engine reaction to duplicate
#          Table spaces and log groups. Also to test 
#          Statement mixed case.
############################################
-- source include/have_ndb.inc

--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

############## Duplcate Statement Testing #########

--echo **** Begin Duplicate Statement Testing ****

CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;

--error 1502
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;

ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE 4M ENGINE NDB;

--error 1507
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE 4M ENGINE=NDB;

CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB;

#--error 1502 # Bug 16158
#CREATE TABLESPACE ts1
#ADD DATAFILE 'datafile.dat'
#USE LOGFILE GROUP lg1
#INITIAL_SIZE 12M
#ENGINE NDB;

# Currently a bug, bug#16158
ALTER TABLESPACE ts1
ADD DATAFILE 'datafile2.dat'
INITIAL_SIZE 12M
ENGINE=NDB;

#--error 1507 # Currently a bug, bug#16158
#ALTER TABLESPACE ts1
#DROP DATAFILE 'datafile2.dat'
#INITIAL_SIZE 12M
#ENGINE=NDB;

CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;

--error 1050
CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;

DROP TABLE t1;

ALTER TABLESPACE ts1
DROP DATAFILE 'datafile2.dat' 
ENGINE=NDB;

--error 1507
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile2.dat' 
ENGINE=NDB;

ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' 
ENGINE=NDB;

--error 1507
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' 
ENGINE=NDB;

DROP TABLESPACE ts1 
ENGINE=NDB;

--error 1503
DROP TABLESPACE ts1 
ENGINE=NDB;

DROP LOGFILE GROUP lg1 
ENGINE=NDB;

--error 1503
DROP LOGFILE GROUP lg1 
ENGINE=NDB;
--echo **** End Duplicate Statement Testing ****
############# End Duplicate Statments ############
--echo
############ Begin CaSe Testing ##################
--echo **** Begin Statment CaSe Testing ****

creaTE LOgfilE GrOuP lg1
adD undoFILE 'undofile.dat'
initiAL_siZE 16M
UnDo_BuFfEr_SiZe = 1M
ENGInE=NDb;

altER LOgFiLE GrOUp lg1
AdD UnDOfILe 'undofile02.dat'
INItIAl_SIzE 4M ENgINE nDB;

CrEAtE TABLEspaCE ts1
ADD DATAfilE 'datafile.dat'
UsE LoGFiLE GRoUP lg1
INITiaL_SizE 12M
ENGiNe NDb;

AlTeR tAbLeSpAcE ts1
AdD DaTaFiLe 'datafile2.dat'
InItIaL_SiZe 12M
EnGiNe=NDB;

CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
TABLEspace ts1 storAGE dISk
ENGine nDb;

DROP TABLE t1;

AlteR TAblespaCE ts1
droP DATAfile 'datafile2.dat' 
ENGINE=NDB;

ALter tablesPACE ts1
dROp dAtAfIlE 'datafile.dat' 
ENGine=Ndb;

DrOp TaBleSpAcE ts1 
engINE=ndB;

DrOp lOgFiLe GrOuP lg1 
EnGiNe=nDb;

--echo **** End Statment CaSe Testing ****
############ End CaSe Testing ##################
--echo
############ Begin = and no = Testing ##########
--echo **** Begin = And No = Testing ****

CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE=16M
UNDO_BUFFER_SIZE=1M
ENGINE=NDB;

ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE=4M 
ENGINE=NDB;

CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE=12M
ENGINE=NDB;

ALTER TABLESPACE ts1
ADD DATAFILE 'datafile2.dat'
INITIAL_SIZE=12M
ENGINE=NDB;

CREATE TABLE t1
(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
TABLESPACE ts1 STORAGE DISK
ENGINE=NDB;

DROP TABLE t1;

ALTER TABLESPACE ts1
DROP DATAFILE 'datafile2.dat'
ENGINE=NDB;

ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat'
ENGINE=NDB;

DROP TABLESPACE ts1
ENGINE=NDB;

DROP LOGFILE GROUP lg1
ENGINE=NDB;

--echo
--echo **** End of = ****
--echo

CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE 1M
ENGINE NDB;

ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE 4M
ENGINE NDB;

CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB;

# Bug# 16306
#ALTER TABLESPACE ts1
#ADD DATAFILE 'datafile2.dat'
#INITIAL_SIZE 12M
#ENGINE NDB;

CREATE TABLE t1
(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
TABLESPACE ts1 STORAGE DISK
ENGINE NDB;

DROP TABLE t1;

# Bug# 16306
#ALTER TABLESPACE ts1
#DROP DATAFILE 'datafile2.dat'
#ENGINE NDB;

ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat'
ENGINE NDB;

DROP TABLESPACE ts1
ENGINE NDB;

DROP LOGFILE GROUP lg1
ENGINE NDB;

--echo **** End = And No =  ****
############ End = And No = ##################

# End 5.1 test


Thread
bk commit into 5.1 tree (jmiller:1.1992)Jonathan Miller9 Jan