Commit f1689477 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents a264a79e 05ed81fe

mysql-test/r/ndb_dd_ddl.result

+10 −0
Original line number Diff line number Diff line
@@ -7,6 +7,16 @@ ADD UNDOFILE 'undofile.dat' 
INITIAL_SIZE 16M

UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'undofile2.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE 1M

ENGINE NDB;

ERROR HY000: Failed to create LOGFILE GROUP

SHOW WARNINGS;

Level	Code	Message

Error	1296	Got error 1514 'Currently there is a limit of one logfile group' from NDB

Error	1506	Failed to create LOGFILE GROUP

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

mysql-test/r/ndb_dd_dump.result

+2 −15
Original line number Diff line number Diff line
@@ -8,15 +8,6 @@ ALTER LOGFILE GROUP lg1 
ADD UNDOFILE 'undofile_lg1_02.dat'

INITIAL_SIZE = 4M 

ENGINE NDB;

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'undofile_lg2_01.dat'

UNDO_BUFFER_SIZE = 1M

INITIAL_SIZE 2M

ENGINE NDB;

ALTER LOGFILE GROUP lg2

ADD UNDOFILE 'undofile_lg2_02.dat'

INITIAL_SIZE = 4M 

ENGINE NDB;

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile_ts1_01.dat'

USE LOGFILE GROUP lg1
@@ -34,7 +25,7 @@ INITIAL_SIZE 2M 
ENGINE NDB;

CREATE TABLESPACE ts3

ADD DATAFILE 'datafile_ts3_01.dat'

USE LOGFILE GROUP lg2

USE LOGFILE GROUP lg1

INITIAL_SIZE 4M

ENGINE NDB;

CREATE TABLE t1
@@ -173,7 +164,6 @@ DROP TABLESPACE ts1 ENGINE = NDB; 
DROP TABLESPACE ts2 ENGINE = NDB;

DROP TABLESPACE ts3 ENGINE = NDB;

DROP LOGFILE GROUP lg1 ENGINE = NDB;

DROP LOGFILE GROUP lg2 ENGINE = NDB;

SELECT DISTINCT

LOGFILE_GROUP_NAME,

FILE_NAME,
@@ -184,8 +174,6 @@ FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE="UNDO LOG" ORDER BY FILE_NAME; 
LOGFILE_GROUP_NAME	FILE_NAME	TOTAL_EXTENTS	INITIAL_SIZE	ENGINE

lg1	undofile_lg1_01.dat	1048576	2097152	ndbcluster

lg1	undofile_lg1_02.dat	1048576	4194304	ndbcluster

lg2	undofile_lg2_01.dat	1048576	2097152	ndbcluster

lg2	undofile_lg2_02.dat	1048576	4194304	ndbcluster

SELECT DISTINCT

TABLESPACE_NAME,

LOGFILE_GROUP_NAME,
@@ -198,7 +186,7 @@ TABLESPACE_NAME LOGFILE_GROUP_NAME FILE_NAME EXTENT_SIZE INITIAL_SIZE ENGINE 
ts1	lg1	datafile_ts1_01.dat	1048576	2097152	ndbcluster

ts1	lg1	datafile_ts1_02.dat	1048576	1048576	ndbcluster

ts2	lg1	datafile_ts2_01.dat	1048576	2097152	ndbcluster

ts3	lg2	datafile_ts3_01.dat	1048576	4194304	ndbcluster

ts3	lg1	datafile_ts3_01.dat	1048576	4194304	ndbcluster

SELECT COUNT(*) FROM t1;

COUNT(*)

500
@@ -227,4 +215,3 @@ DROP TABLESPACE ts1 ENGINE = NDB; 
DROP TABLESPACE ts2 ENGINE = NDB;

DROP TABLESPACE ts3 ENGINE = NDB;

DROP LOGFILE GROUP lg1 ENGINE = NDB;
 
DROP LOGFILE GROUP lg2 ENGINE = NDB;

mysql-test/r/ndb_restore.result

+9 −2
Original line number Diff line number Diff line
@@ -455,8 +455,15 @@ from (select * from t9 union 
select * from t9_c) a;

count(*)

3

drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

DELETE FROM test.backup_info;

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

SELECT @the_backup_id:=backup_id FROM test.backup_info;

@the_backup_id:=backup_id

<the_backup_id>

DROP TABLE test.backup_info;

Create table test/def/t2_c failed: Translate frm error

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

drop table if exists t2_c;

520093696,<the_backup_id>

mysql-test/t/ndb_dd_ddl.test

+13 −1
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ 
#       the file name. I know this is not an issue for *nix systems but

#       will be when we expand to Windows and Mac. Better put it in now.

############################################



#

# Jonas 2006-03-10

# Add verification that ndb currently is limited to 1 logfile group

#





-- source include/have_ndb.inc
@@ -41,6 +44,15 @@ INITIAL_SIZE 16M 
UNDO_BUFFER_SIZE = 1M

ENGINE=NDB;



# Verify that one currently can create only 1 logfile group

--error ER_CREATE_FILEGROUP_FAILED

CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'undofile2.dat'

INITIAL_SIZE 16M

UNDO_BUFFER_SIZE 1M

ENGINE NDB;

SHOW WARNINGS;



--error ER_CREATE_FILEGROUP_FAILED

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

mysql-test/t/ndb_dd_dump.test

+1 −14
Original line number Diff line number Diff line
@@ -15,17 +15,6 @@ ADD UNDOFILE 'undofile_lg1_02.dat' 
INITIAL_SIZE = 4M 

ENGINE NDB;



CREATE LOGFILE GROUP lg2

ADD UNDOFILE 'undofile_lg2_01.dat'

UNDO_BUFFER_SIZE = 1M

INITIAL_SIZE 2M

ENGINE NDB;



ALTER LOGFILE GROUP lg2

ADD UNDOFILE 'undofile_lg2_02.dat'

INITIAL_SIZE = 4M 

ENGINE NDB;



CREATE TABLESPACE ts1

ADD DATAFILE 'datafile_ts1_01.dat'

USE LOGFILE GROUP lg1
@@ -46,7 +35,7 @@ ENGINE NDB; 


CREATE TABLESPACE ts3

ADD DATAFILE 'datafile_ts3_01.dat'

USE LOGFILE GROUP lg2

USE LOGFILE GROUP lg1

INITIAL_SIZE 4M

ENGINE NDB;
@@ -204,7 +193,6 @@ DROP TABLESPACE ts2 ENGINE = NDB; 
DROP TABLESPACE ts3 ENGINE = NDB;



DROP LOGFILE GROUP lg1 ENGINE = NDB;

DROP LOGFILE GROUP lg2 ENGINE = NDB;



--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/ndb_dd_dump.sql
@@ -254,6 +242,5 @@ DROP TABLESPACE ts2 ENGINE = NDB; 
DROP TABLESPACE ts3 ENGINE = NDB;



DROP LOGFILE GROUP lg1 ENGINE = NDB;

DROP LOGFILE GROUP lg2 ENGINE = NDB;



#End 5.1 test case