Commit d10debf6 authored by unknown's avatar unknown
Browse files

Should not be here, same procedure every time.. 


mysql-test/r/mysqldump.result:
  Will be removed	
mysql-test/t/mysqldump.test:
  Will be removed
parent 19769cbf

mysql-test/r/mysqldump.result

+35 −4
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa;

drop database if exists mysqldump_test_db;

drop database if exists db1;

drop view if exists v1, v2;

drop view if exists v1, v2, v3;

CREATE TABLE t1(a int);

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

<?xml version="1.0"?>
@@ -380,6 +380,11 @@ UNLOCK TABLES; 
/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

DROP TABLE IF EXISTS `v1`;

DROP VIEW IF EXISTS `v1`;

CREATE TABLE `v1` (

  `a` bigint(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `v1`;

DROP VIEW IF EXISTS `v1`;

CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` from `test`.`t1`;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -439,7 +444,7 @@ USE `mysqldump_test_db`; 


drop database mysqldump_test_db;

CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 '');

INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -481,7 +486,7 @@ CREATE TABLE `t1` ( 


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('');

INSERT INTO `t1` VALUES ('Ž™šá');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -502,7 +507,7 @@ CREATE TABLE `t1` ( 


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('');

INSERT INTO `t1` VALUES ('Ž™šá');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -1423,6 +1428,32 @@ UNLOCK TABLES; 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE t1;

create table t1(a int, b int, c varchar(30));

insert into t1 values(1, 2, "one"), (2, 4, "two"), (3, 6, "three");

create view v3 as

select * from t1;

create  view v1 as

select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);

create  view v2 as

select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;

drop view v1, v2, v3;

drop table t1;

show full tables;

Tables_in_test	Table_type

t1	BASE TABLE

v1	VIEW

v2	VIEW

v3	VIEW

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`v3`.`a` AS `a`,`test`.`v3`.`b` AS `b`,`test`.`v3`.`c` AS `c` from `test`.`v3` where (`test`.`v3`.`b` in (1,2,3,4,5,6,7))

select * from v1;

a	b	c

1	2	one

2	4	two

3	6	three

drop view v1, v2, v3;

drop table t1;

create database db1;

use db1;

CREATE TABLE t2 (

mysql-test/t/mysqldump.test

+35 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa;

drop database if exists mysqldump_test_db;

drop database if exists db1;

drop view if exists v1, v2;

drop view if exists v1, v2, v3;

--enable_warnings



# XML output
@@ -161,7 +161,7 @@ drop database mysqldump_test_db; 
# if it is explicitely set.



CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 '');

INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1

#

# Bug#8063: make test mysqldump [ fail ]
@@ -565,6 +565,39 @@ INSERT INTO t1 VALUES (1),(2),(3); 
--exec $MYSQL_DUMP --add-drop-database --skip-comments --databases test

DROP TABLE t1;





#

# Bug #10927 mysqldump: Can't reload dump with view that consist of other view

#



create table t1(a int, b int, c varchar(30));



insert into t1 values(1, 2, "one"), (2, 4, "two"), (3, 6, "three");



create view v3 as

select * from t1;



create  view v1 as

select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);



create  view v2 as

select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;



--exec $MYSQL_DUMP test > var/tmp/bug10927.sql

drop view v1, v2, v3;

drop table t1;

--exec $MYSQL test < var/tmp/bug10927.sql



# Without dropping the original tables in between

--exec $MYSQL_DUMP test > var/tmp/bug10927.sql

--exec $MYSQL test < var/tmp/bug10927.sql

show full tables;

show create view v1;

select * from v1;



drop view v1, v2, v3;

drop table t1;



#

# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)

#