diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-19 20:31:01 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-19 20:31:01 +0100 |
| commit | 2080df125eeb4aabe7ae05ef87cefb85626c3487 (patch) | |
| tree | 237d2064467ce080de8ebe2c7355f8065a01ec05 /mysql-test/t/mysqldump.test | |
| parent | eb3fd8cebdd793e2c48dca574ae5d0f5867b719d (diff) | |
| parent | 6fa33adf1750527d2e9ba43c6c856cd0bd075e3e (diff) | |
| download | mariadb-git-2080df125eeb4aabe7ae05ef87cefb85626c3487.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/t/mysqldump.test:
Auto merged
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index efaafbced9f..d9372ad35c1 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1260,7 +1260,7 @@ create database mysqldump_views; use mysqldump_views; create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable; ---exec $MYSQL_DUMP --skip-comments --compact --databases mysqldump_tables mysqldump_views; +--exec $MYSQL_DUMP --skip-comments --compact --databases mysqldump_tables mysqldump_views drop view nasishnasifu; drop database mysqldump_views; @@ -1283,7 +1283,7 @@ create table t1 (f1 int, f2 int); insert into t1 values (2,2); create view v1 as select f1, f2 from t1; ---exec $MYSQL_DUMP --skip-comments --add-drop-database --databases mysqldump_dba mysqldump_dbb > $MYSQLTEST_VARDIR/tmp/bug20221_backup; +--exec $MYSQL_DUMP --skip-comments --add-drop-database --databases mysqldump_dba mysqldump_dbb > $MYSQLTEST_VARDIR/tmp/bug20221_backup drop view v1; drop table t1; @@ -1293,7 +1293,7 @@ drop view v1; drop table t1; drop database mysqldump_dba; ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20221_backup; +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20221_backup select * from mysqldump_dba.v1; select * from mysqldump_dbb.v1; @@ -1395,7 +1395,7 @@ flush privileges; --echo # Restore. Flush Privileges test ends. --echo # ---exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21527.sql; +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21527.sql # Do as a user connection user1; |