Commit 8818cd9b authored by unknown's avatar unknown
Browse files

results fixed after merge 


mysql-test/t/create_select_tmp.test:
  --disable_warnings
mysql-test/t/rpl_drop.test:
  --disable_warnings
parent eee5f15b

mysql-test/r/create_select_tmp.result

+8 −8
Original line number Diff line number Diff line
@@ -2,18 +2,18 @@ drop table if exists t1, t2; 
CREATE TABLE t1 ( a int );

INSERT INTO t1 VALUES (1),(2),(1);

CREATE TABLE t2 ( PRIMARY KEY (a) ) TYPE=INNODB SELECT a FROM t1;

Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

Table 'test.t2' doesn't exist

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) TYPE=INNODB SELECT a FROM t1;

Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

Table 'test.t2' doesn't exist

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TABLE t2 ( PRIMARY KEY (a) ) TYPE=MYISAM SELECT a FROM t1;

Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

Table 'test.t2' doesn't exist

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) TYPE=MYISAM SELECT a FROM t1;

Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

Table 'test.t2' doesn't exist
 
ERROR 42S02: Table 'test.t2' doesn't exist

mysql-test/r/endspace.result

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ teststring 
teststring

explain select * from t1 order by text1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	key1	32	NULL	4	Using index

1	SIMPLE	t1	index	NULL	key1	32	NULL	3	Using index

alter table t1 modify text1 char(32) binary not null;

select * from t1 order by text1;

text1

mysql-test/r/innodb.result

+12 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,18 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail 
update t3 set  t3.id=7  where t1.id =1 and t2.id = t1.id and t3.id = t2.id;

ERROR 42S02: Unknown table 't1' in where clause

drop table t3,t2,t1;

create table t1(

id int primary key,

pid int,

index(pid),

foreign key(pid) references t1(id) on delete cascade) engine=innodb;

insert into t1 values(0,0),(1,0),(2,1),(3,2),(4,3),(5,4),(6,5),(7,6),

(8,7),(9,8),(10,9),(11,10),(12,11),(13,12),(14,13),(15,14);

delete from t1 where id=0;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails

delete from t1 where id=15;

delete from t1 where id=0;

drop table t1;

CREATE TABLE t1 (col1 int(1))ENGINE=InnoDB;

CREATE TABLE t2 (col1 int(1),stamp TIMESTAMP,INDEX stamp_idx

(stamp))ENGINE=InnoDB;

mysql-test/r/ps_1general.result

+7 −7
Original line number Diff line number Diff line
@@ -302,18 +302,18 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye 
prepare stmt4 from ' show storage engines ';

execute stmt4;

Engine	Support	Comment

MyISAM	YES/NO	Default type from 3.23 with great performance

HEAP	YES/NO	Hash based, stored in memory, useful for temporary tables

MEMORY	YES/NO	Alias for HEAP

MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance

HEAP	YES/NO	Alias for MEMORY

MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables

MERGE	YES/NO	Collection of identical MyISAM tables

MRG_MYISAM	YES/NO	Alias for MERGE

ISAM	YES/NO	Obsolete table type; Is replaced by MyISAM

MRG_ISAM	YES/NO	Obsolete table type; Is replaced by MRG_MYISAM

InnoDB	YES/NO	Supports transactions, row-level locking and foreign keys

ISAM	YES/NO	Obsolete storage engine, now replaced by MyISAM

MRG_ISAM	YES/NO	Obsolete storage engine, now replaced by MERGE

InnoDB	YES/NO	Supports transactions, row-level locking, and foreign keys

INNOBASE	YES/NO	Alias for INNODB

BDB	YES/NO	Supports transactions and page-level locking

BERKELEYDB	YES/NO	Alias for BDB

NDBCLUSTER	YES/NO	Clustered, fault tolerant memory based tables

NDBCLUSTER	YES/NO	Clustered, fault-tolerant, memory-based tables

NDB	YES/NO	Alias for NDBCLUSTER

EXAMPLE	YES/NO	Example storage engine

ARCHIVE	YES/NO	Archive storage engine

mysql-test/r/rpl_drop.result

+3 −3
Original line number Diff line number Diff line 
slave stop;

stop slave;

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

reset master;

reset slave;

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

slave start;

start slave;

drop table if exists t1, t2;

create table t1 (a int);

drop table t1, t2;

Unknown table 't2'
 
ERROR 42S02: Unknown table 't2'